Merge pull request #15248 from MegaphoneJon/reporting-19