Merge branch 'hotfix/v0.5.4'
Merge branch 'release/v0.6.0'
hotfix
Merge branch 'hotfix/v0.6.1' into develop