Merge branch 'jc/stream-to-pack'