Forward port of issue #19536 to 2.3.0.M1.