Forward port of issue #20847 to 2.3.0.RC1.