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