re #868 - Removed address field
Merge branch 'feature/868-contacts'