Forward port of issue #20846 to 2.3.0.RC1.