Fix missing `@nodes.`.
Merge branch 'v3' into watcher