Respect tenant info from repose

RM7001
It's making sure all the roles are defined in the context.