Merge branch 'release/0.7'
Merge branch 'release/0.9'