Merge new master to dev

Merged Irina Kera Gundersen requested to merge master into dev

Merge request reports