Forward port of issue #19807 to 2.3.0.RC1.