Dev/15524

Laurent requested to merge dev/15524 into WIP

Merge request reports