Forward port of issue #19710 to 2.3.0.M1.