Forward port of issue #21762 to 2.4.x.