Forward port of issue #20216 to 2.3.0.M3.