Merge pull request #24155 from yashodha/reports_improvements