Forward port of issue #21044 to 2.3.0.RC1.