Issue #7622 by tj, added specific saml