Merge branch 'jb/diff-no-index-no-abbrev'