Forward port of issue #20843 to 2.3.0.RC1.