Merge "Grant shell missing permissions" into sc-dev