Merged latest master changes to streaming