Merge branch 'jb/multi-pack-index-docfix'