Merge branch 'jc/diff-no-no-index'