Version 0.9.11
Merge branch 'release/v0.9.11' into develop