Forward port of issue #21769 to 2.4.x.