Forward port of issue #20577 to 2.3.0.M4.