Forward port of issue #20727 to 2.3.0.M4.