Forward port of issue #20617 to 2.3.0.M4.