Merge branch 'jb/doc-multi-pack-idx-fix'