Forward port of issue #20041 to 2.3.0.M2.