Forward port of issue #20835 to 2.3.0.RC1.