Forward port of issue #19580 to 2.3.0.M1.