Fix test failed by merging branch 'master' into feature/activity-filter.