Merge pull request #1707 from bendiy/discovery