Forward port of issue #21672 to 2.4.x.