Forward port of issue #19508 to 2.3.0.M1.