Forward port of issue #19540 to 2.3.0.M1.