Dev

Merged Matti Hyttinen requested to merge dev into master

Merge request reports