Merge "Add retry on Conflict for manual speaker bind" into mcp/caracal