Forward port of issue #20145 to 2.3.0.M2.