Initial commit
Initial commit
local discovery
Merge remote-tracking branch 'test/discovery' into branch1