Forward port of issue #20895 to 2.3.0.RC1.