Merge branch 'release/0.9.11' into develop