Merge early part of branch 'np/index-pack' into sp/keep-pack