Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'