Forward port of issue #20745 to 2.3.0.RC1.