Forward port of issue #20169 to 2.3.0.M3.