Mikko dev

Merged M2965 requested to merge mikko-dev into development

Merge request reports