Merge branch '1.12' into perf-fixes