Merge "Add missing isShellUser check" into pi-dev