Merged with upstream and moved SSO sign-in to plugin