Merge branch 'jk/index-pack-streaming-fix'