Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'