first try of WHD SAML
Merge WHD saml changes in