Add redundant follow test
Fix redundant follow
Merge branch 'follow-fix' into develop