Simons updates

Merged Chris Hines requested to merge simons_updates into master

Merge request reports