Forward port of issue #21172 to 2.3.0.