The first patch seemed to break the deletion of the contact record, as the domain was no longer taken in consideration. The deletion of the contact record is done after the deletion of attrs inside db_delete_ucontact_addr().

The formatting was at least for the first line:

module_name: ...

I will check the new patch when i get a chance.

—
Reply to this email directly or view it on GitHub.