Merge "Handle lists of streamers" into feature/zuulv3