Forward port of issue #20681 to 2.3.0.M4.