Forward port of issue #20430 to 2.3.0.M3.