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