Merge dev into master

Merged Stefano Capitani requested to merge dev into master

Merge request reports