Forward port of issue #19521 to 2.3.0.M1.