authentication.context.ri and authentication.simple version upgrade