Merge pull request #9324 from annando/endless-contact