CIDEVSTC-306: Discovery enhancements