Forward port of issue #19998 to 2.3.0.M2.