- sync to newest SR and NodeManager again, this time with upstream header fix