disable email
discovery improvements
Merge branch 'master' into dev
code cleanup