Merge "Fix exec_command to hang indefinitely"