Merge "EINTR handling and debugging for error cases"