Forward port of issue #20623 to 2.3.0.RC1.