Merge pull request #6224 from annando/dba-delete-contact