Forward port of issue #21046 to 2.3.0.RC1.