Forward port of issue #18917 to 2.3.0.RC1.