Merge branch 'dev_puontsi' into master_merge