Forward port of issue #21751 to 2.3.x.