Ft/Rf12808

Ghost User requested to merge ft/RF12808 into WIP

Merge request reports