Merge "discovery: update api"