Merge "Fix handling shell command when no argument is given." into main