Forward port of issue #20955 to 2.3.0.RC1.