Fix for contact.
Merge branch 'develop'