Merge "Fix escaping and grouping of arguments to the Target shells"