Merge "Remove need to include admin in credentials in base classes"