Merge dev into master

Christopher Guindon requested to merge dev into master

Merge request reports