Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint