Forward port of issue #20361 to 2.3.0.M3.