Forward port of issue #1762 to 2025.0.x.
Activity