Merge pull request #12490 from eileenmcnaughton/report