[squash] [streaming] Source rework wip2