Add hijacking support when using unix socket
Merge branch 'Add_envs'