Forward port of issue #19552 to 2.3.0.M1.