Forward port of issue #19595 to 2.3.0.M1.