Merge "Do not inherit all permissions from shell" into rvc-dev