Socket timeout should not be modified if time_to_timeout is not specified
Merge branch 'fix_time_to_timeout'