Lay the foundation for RBAC, catching up with develop branch.