Forward port of issue #21421 to 2.3.0.