Merge dev to master

Joonatan Korpela requested to merge dev into master

Merge request reports