work on SSO; Jira tickets