Merge "Merge code path for hostname lookup"