reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]
[SVN r49510]