Forward port of issue #21793 to 2.4.x.