0.9.12.2
Merge branch 'release/0.9.12.2' into develop