Merge pull request #6632 from annando/check-follow