Merge "Fix dns integration setup" into mcp/caracal