Dev/15442

Ghost User requested to merge dev/15442 into WIP

Merge request reports