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