Merge "Fix shell permissions"