Merge "Add a role for Shell." into sc-dev