Forward port of issue #21718 to 2.4.x.