Backport of gh-27782
Activity