Forward port of issue #21898 to 2.4.x.