Merge "Adding a permission to Shell to enable testing" into sc-dev