CAAERS-7043 - fix for requires-reporting flag overriding problem.
CAAERS-7043, reverse initial set of changes.
CAAERS-7043, reapply Biju's fix
Merge branch 'feature/CAAERS-7043-quickfix' into develop