Merge pull request #9145 from annando/duplicate-apcontact