Dev

Merged Yohan Jarosz requested to merge dev into master

Merging dev to master

Merge request reports