ENG-4290 Multi-COW streaming changes