Forward port of issue #20907 to 2.3.0.RC1.