Forward port of issue #20355 to 2.3.0.M3.