Forward port of issue #19901 to 2.3.0.M2.