Forward port of issue #20676 to 2.3.0.M4.