Forward port of issue #20689 to 2.3.0.M4.