[multi-tenancy] modified 'choose_register'
Merge branch 'org_lj' into feature/multi-tenancy