Jbtis 48

Merge discovery changes to trunk.