Merge branch 'hotfix-r0.2'