bug:in2out out2in
Merge branch 'deving' into fibocom