Bring all changes from dev into master

Merged Bryan BRANCOTTE requested to merge dev into master

Merge request reports