Backport fixes to 5.2

Merged Julien Wadel requested to merge fix/backport_52 into release/5.2

Fixes

Merge request reports