Forward port of issue #19002 to 2.3.0.M2.