Fix state
latest commit for pulling
Merge branch 'master' into contacts-integration
Merge branch 'release-1' into contacts-integration