8.x-2.6
b6319539 · sync with #299138 ·