Forward port of issue #21168 to 2.3.0.RC1.