Merge branch 'jc/maint-index-pack-keep' into jc/index-pack