Merge branch 'sp/keep-pack' into np/index-pack