Fix bug in watcher preservation function. ST-610
Merge branch 'bender-words'