Forward port of issue #20882 to 2.3.0.RC1.