Forward port of issue #19913 to 2.3.0.M2.