Fixed reports cleaning
Merge branch 'APPNG-92' into APPNG-75