Forward port of issue #20436 to 2.3.0.M3.