Merge "first version discover service"