Forward port of issue #19333 to 2.3.0.M1.