Forward port of issue #21437 to 2.4.x.