Merge branch 'feature/activity-filter'