Merge branch 'cancel-follow-request' into 'develop'