Forward port of issue #21752 to 2.4.x.