Merge pull request #16229 from icecrime/discovery

Add builtin nodes discovery