Merge "Ensure waiters do not stuck when timeout is reached" into mcp/caracal