Forward port of issue #21265 to 2.3.0.