Forward port of issue #19707 to 2.3.0.M2.