Forward port of issue #20812 to 2.3.0.RC1.