Forward port of issue #21872 to 2.4.x.