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