Merge pull request #12967 from eileenmcnaughton/report57