Could be combined with #3270
Activity