Added watcher delays.
Merge branch 'dev-0.3.x'