[PPP-3252]

DEV: Merge the code from the ENGOPS404 branches in Reporting