Merge pull request #2141 from piotr1212/link_unixsock_with_cmds