Merge branch 'hotfix-0.5.1' into develop