Fix/from 5.2

Merged Sylvain Berfini requested to merge fix/from_5.2 into master

Merge request reports