Updated discovery internals
Merge