[OE-2716] contacts refactoring
[OE-2716] contacts refactoring.
Merge branch 'release/1.4-moorfields' into feature/contacts
Merge branch 'feature/contacts' into release/1.4-moorfields