Merge pull request #1062 from LaurenceLiZhixin/Ftr/selfDiscovery

Ftr/self discovery