Merge "Add missing isShellUser check" into rvc-dev