Merge pull request #13761 from yashodha/reports