Forward port of issue #20004 to 2.3.0.M2.