Origin/dev

Niilo Arala requested to merge origin/dev into dev

Merge request reports