Merge branch 'release/0.10.0' into development
Merge branch 'master' into development