Merge branch 'hotfix-2.0.5'