Forward port of issue #19565 to 2.3.0.M2.