ENG-4524(b) Recreate the multi-COW changes, fix bug, and add unit test