Forward port of issue #19621 to 2.3.0.M1.