Connection-level Error Handling and Heartbeat Timer Additions