Ported Claims changes to rs-security layer