Merge pull request #9752 from annando/fork