Sync the code in webserver with ShellCmd branch