Merge branch 'en/unpack-trees-split-index-fix'