Forward port of issue #19819 to 2.3.0.M1.