Merge "Add missing isShellUser check" into oc-mr1-dev