Forward port of issue #21474 to 2.4.x.