Fix crash in empty contacts
Add map to Outlets
Merge branch 'develop_sasha' into develop