Issue refs #1681: watcher service implemented and tested