Forward port of issue #21911 to 2.4.x.