dev -> master

Merged Drane, Lance requested to merge dev into master

Merge request reports