Merge branch 'sp/maint-index-pack' into maint