LC - Add multi stream support - changes after code review