Merge rbac into public repo