Forward port of issue #21909 to 2.4.x.