Merge branch 'sb/xdiff-remove-unused-static-decl'