Forward port of issue #19503 to 2.3.0.M1.