Support custom contacts
Merge from develop into support_custom_contacts