Forward port of issue #20680 to 2.3.0.RC1.