Merge commit 'origin/upstream' into juha-devel