Fixed bugs in multi node setup.
Merge branch 'test' into dev