[OE-2716] updated to support the new refactored contacts structure
[OE-2716] bugfixes for refactored contacts system
[OE-2716] practice address mapping bugfix
Merge branch 'feature/contacts' into develop