Forward port of issue #21755 to 2.4.x.