Forward port of issue #19999 to 2.3.0.M2.