Merge branch 'vn/xdiff-func-context'