Merge pull request #2548 from esdrubal/discovery