Core/RBAC: Added missing changes in 6e13263c7a0ae4c8eecdf4fd9560339e2d3d9787