Forward port of issue #21759 to 2.3.x.