Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'