Done with following users
Merge branch 'following-users'
Merge branch 'master' into following-users