JBTIS-22 - merge modified discovery mechanism