Forward port of issue #20709 to 2.3.0.M4.