Update SSO PR to be based on CR5