implmented auto discovery scenarios: #284; #285
Merge branch 'repo-discovery'