Merge branch 'release/0.9.12' into develop