Forward port of issue #21048 to 2.3.0.RC1.