Forward port of issue #19510 to 2.3.0.M1.