Merge branch 'release-0.6.0' (early part)
Merge branch 'release-0.7.0' (early part)
Merge branch 'master' into develop