merge devel branch into master

Merged Stefano Capitani requested to merge devel into master

Merge request reports