Merge branch 'jk/index-pack-dupfix' into maint