Forward port of issue #20799 to 2.3.0.RC1.