some RBAC improvements
merge commit