Merge branch 'jk/stream-pack-non-delta-clarification'