Merge branch 'release/0.7.0' into develop
Merge branch 'develop'