Merge branch 'jk/index-pack-correct-depth-fix'