Merge dev into master

Merged Matti Hyttinen requested to merge dev into master

Merge dev into master

Merge request reports