ENG-4537 COW Context Refactoring