Dev

Merged Konstantinos Platis requested to merge dev into master

Merge request reports