Merge branch 'fix-recipients-from-activity' into 'develop'