Forward port of issue #19584 to 2.3.0.M1.