Forward port of issue #20388 to 2.3.0.M3.