Forward port of issue #19932 to 2.3.0.M2.