Forward port of issue #27086 to 2.5.x.
Activity