Forward port of issue #19564 to 2.3.0.M4.