Merge "Fix Shell Command"