Merge "cmd-exec had a merge issue from elalto..."