Merge "Fix access before assignment in zuul streamer" into feature/zuulv3