v0.12-final
c1b74217 · Merge #9211: [0.12 branch] Backports ·