Merge pull request #7956 from jitendrapurohit/activity-report