Merge branch 'hotfix/v0.6.1'
hotfix
Merge branch 'hotfix/v0.6.2' into develop