Merge commit 'juri/riku-devel'