Forward port of issue #20866 to 2.3.0.RC1.