Merge "Correctly stream the remaining buffer" into feature/zuulv3