Forward port of issue #20168 to 2.3.0.M3.