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