Forward port of issue #19572 to 2.3.0.M1.