HCOLL-134 improved NodeDiscovery, but its still not fully correctly working, I still have to do more work on it.