Added support for Discovery Issue #2227
Merge remote-tracking branch 'sahutd/master'
[discovery] Extract more info and simplify
Merge remote-tracking branch 'origin/master'