Forward port of issue #21702 to 2.4.x.