Dev/15524

Ghost User requested to merge dev/15524 into WIP

Merge request reports