Merge pull request #22611 from yashodha/report_cleanup