Merged fix tostreamline