Fix for unexpected socket closures and data leakage under heavy load

Fix for unexpected socket closures and data leakage under heavy load #632