Merge pull request #18827 from yashodha/activity_report