Merge commit 'origin/riku-devel' into juha-devel