Discovery locked in more places.
Merge branch 'master' of https://github.com/wozio/common