Merge "Patch to fix test_aggregates_basic_ops and test_aggregates tests" into mcp/caracal