implemented: #278;#282;#283
Merge branch 'repo-discovery'