Forward port of issue #21732 to 2.4.x.