zipcode fix
Merge branch 'hotfix/sso_migrate_v2'