Merge branch 'hotfix-0.5.3'