merge dev into master

Merged Damien DESPRES requested to merge development into master

Merge request reports