Merge "Multi role RBAC validation"