8 Commits (fix/nodeid)