Forward port of issue #18329 to 2.3.0.RC1.