Forward port of issue #21077 to 2.3.0.RC1.