0.7 -> 1.0
Merge branch 'release/1.0' into develop