Forward port of issue #19393 to 2.3.0.M1.