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