Merge "Add system scope for admin auth"