Merge "Improve keepalive offload documentation and error handling"