Forward port of issue #20541 to 2.3.0.M4.