Forward port of issue #20531 to 2.3.0.M4.