Merge pull request #6627 from annando/check-follow