Another attempt to fix the CLOSE_WAIT issue without breaking other stuff :).
Merge branch 'pre-close-wait-fix' into diegows