Merge branch 'hotfix/v0.5.1'
hotfix
Merge branch 'hotfix/v0.5.2' into develop