Merge branch 'master' into wip_leon_T7456_New_Customer_Portal_100_Report