Forward port of issue #20174 to 2.3.0.M3.