Merge branch 'nd/stream-index-pack'