Forward port of issue #21758 to 2.4.x.