Merge branch 'nd/threaded-index-pack'