Fix #1184.
Merge branch 'v3' into watcher