Merge "Grant shell missing permissions"