Forward port of issue #19671 to 2.3.0.M1.