Forward port of issue #21798 to 2.4.x.