Forward port of issue #21837 to 2.4.x.