Forward port of issue #20917 to 2.3.0.RC1.