Merge pull request #18840 from yashodha/activity_report