Forward port of issue #19902 to 2.3.0.M2.