Merge branch 'hotfix/0.5.4'
Merge branch 'release/0.6.0'
Merge branch 'develop'