Forward port of issue #20313 to 2.3.0.M3.