Merge "[KV] Refactor sendDataToTransport() and finishTask()"