Merged with UI with ravi_updates
Make sure to never ever remove the Administrator group from the admin user.