Update dev branch with latest version of master

Merged Konstantinos Platis requested to merge master into dev

Merge request reports