ECMS-4752: Impossible to Add a file activity in the activity stream
Merge branches 'feature/activity-type' and 'feature/relooking' into feature/relooking