Merge branch 'rs/xdiff-lose-emit-func'