Merge pull request #15313 from yashodha/report_cleanup