Forward port of issue #19972 to 2.3.0.RC1.