Forward port of issue #19687 to 2.3.0.M1.