Forward port of issue #21760 to 2.4.x.