Change patch for multistream support