Forward port of issue #20323 to 2.3.0.M4.