Merge branch 'master_merge' into dev_puontsi