Dev

Merged Craig Earley requested to merge dev into master

Merge request reports