Improved handling identity contact data.
Merge branch 'feature-20141029-master-preparation'