Fix/from master to 6

Merged Sylvain Berfini requested to merge fix/from_master_to_6 into release/6.0

Merge request reports