Fix Bug
Merge branch 'master' into contacts-integration