merged changes between UserClient and CMS