Fixes #280
Merge branch 'fix_addnode_spot_cluster' into vanilla_improvements