Merge "Add missing isShellUser check"