Improve reporting.

Jason Goserequested to merge
issue/link_magician-3601173:3601173-improve-reporting into 1.0.x

Closes #3601173

Merge request reports