Merge branch 'hotfix/0.5.1'
Merge branch 'hotfix/0.5.2' into develop