Merge branch 'jk/diff-external-with-no-index'