Merge branch 'jc/diff-index-refactor'