Fix for user role assignment
Merge branch 'user' into sso