Merge branch 'hotfix/v0.6.1' into develop