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