Forward port of issue #21916 to 2.4.x.