Forward port of issue #20011 to 2.3.0.M2.