emptySink and mergeSink was added
Merge branch 'fay' of github.com:lebastr/frp into fay