Merge pull request #24031 from yashodha/reports_improvements