Merge pull request #5776 from annando/fix-contact