Forward port of issue #20343 to 2.3.0.M3.