Adjusted cherry-pick from previous commit

Conflicts:

	src/server/node_manager.c