Forward port of issue #19221 to 2.3.0.M4.