Forward port of issue #21523 to 2.4.x.