Forward port of issue #21002 to 2.3.0.RC1.