[squash] [streaming] Source rework wip3