Forward port of issue #21534 to 2.4.x.