Merge add/remove contact hooks
This is a small piece of refactoring extracted from the 237-versioning-client branch to reduce the reviewers' eye strain. :-)
This is a small piece of refactoring extracted from the 237-versioning-client branch to reduce the reviewers' eye strain. :-)