Forward port of issue #18215 to 2.3.0.RC1.