fixing register origin issue
Merge commit 'sso.r01.dc' into integration