Forward port of issue #19782 to 2.3.0.RC1.