Merge "Add default value for TCP buffers"