Forward port of issue #21910 to 2.4.x.