Merge "Fix return types of sendMessageOnSocket/receiveMessageFromSocket"