Forward port of issue #20583 to 2.3.0.M4.