Merge branch 'REL18-Discover_Service_API' into 'OCF64-rel17-to-rel18'

REL18 discover service

See merge request !51