Merge branch 'np/index-pack-memsave' into maint