Chris changes

Merged Chris Hines requested to merge chris_changes into master

Merge request reports