Fixed fix for restarting dead nodes.
Merge branch 'test' into dev