Merge branch 'jk/index-pack-maint'