Forward port of issue #20134 to 2.3.0.M3.