Forward port of issue #19969 to 2.3.0.M2.