Forward port of issue #19763 to 2.3.0.M1.