Forward port of issue #20832 to 2.3.0.RC1.