public marks

PUBLIC MARKS from nhoizey with tags soa & saml