Merge branch 'release/0.8.0'
Merge branch 'master' into develop