Forward port of issue #20420 to 2.3.0.M3.