1.11 -> 1.12
Merge branch 'release/1.12' into develop