Merge branch 'rs/fix-unlink-unix-socket'