Merge/release/5.2

Merged Simon Morlat requested to merge merge/release/5.2 into master

Merge request reports