Forward port of issue #20292 to 2.3.0.M3.