Dev

Merged Hugo NOUTS requested to merge dev into master

Merge request reports