Merge "Fix package shell command"