Merge branch 'jc/diff-index-unpack'