Forward port of issue #20713 to 2.3.0.M4.