Merge branch 'master' into wip_edward_T5642_Report_designer_hebe