* Merge latest unstable * Reduce diff * Reduce logic, discover up to max peers * Peer discovery for Natd peers