Merge "Fix stream closing"