Forward port of issue #21794 to 2.4.x.