Fix template watcher
Merge branch 'master' into MYLOC-54