Merge "Add wfDeprecated calls to WatchedItem"