Merge "Include source IP address in socket timeout exceptions"