Merge pull request #9366 from JMAConsulting/reports-bugs