Merge branch 'user-follow-all-unique' into 'develop'