merged shell

Signed-off-by: Lindell Xu <lxu@vetronicsltd.com.cn>