Merge "Add debug and remove SocketTimeoutException." into klp-dev