Forward port of issue #19961 to 2.3.0.M2.