Added TEST patch for multistream support