Merge "[Feature sync] Fix issue where multiple SRV records with same host are not fully resolved"