Forward port of issue #21061 to 2.3.0.RC1.