Merge branch 'configurable-tcp-timeout' into master