Merge "Fix service discovery bugs"