Forward port of issue #21789 to 2.4.x.