Forward port of issue #20329 to 2.3.0.M3.