Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'