Merge branch 'jk/index-pack-reduce-recheck'