Draft: Feat/discovery for you wider network #2199

Summary

(What is the Merge request intending to do, in plain language)

(Be sure to associate any related issues or merge requests)

Steps to test

(Steps to demonstrate merge achieves goal) (Include any platform specific directions)

Estimated Regression Scope

(What features do these changes effect in your estimation?)

Closes #2199 (closed)