Merge 'jberezanski/wincred-sso-r2' into HEAD