Merge branch 'release0.8.0' into develop