Merge branch 'release-0.6' into develop
Merge branch 'develop'