Temp/backport

Merged Sylvain Berfini requested to merge temp/backport into master

Merge request reports