Merge "Use BasicShellCommandHandler instead of ShellCommand"