Merge branch 'release/0.7'
Merge branch 'master' into develop