Forward port of issue #20793 to 2.3.0.M4.