Develop fo master

Merged Clelia Meneghin requested to merge develop into master

Merge request reports