Sync NodeController with upstream