Merge pull request #9664 from annando/delete-contacts