ENG-4617 fix

Use Cancellable watchers to fix ENG-4617