Forward port of issue #20536 to 2.3.0.M4.