Merge "Close the socket fd in case of an exception during setupSocket method to avoid socket leak." into main