Dev to master

Merged Hugo NOUTS requested to merge dev_to_master into master

Merge request reports