Forward port of issue #20578 to 2.3.0.M4.