fix watch operations to be thread safe
Merge remote-tracking branch 'origin/thread-safety'