Forward port of issue #20528 to 2.3.0.M4.