Forward port of issue #20708 to 2.3.0.M4.