Merged dns-prefetch fix