Contacts Refactoring
Jira issue: WP-674
Contacts Refactoring
Jira issue: WP-674