Merge "Fix deleting tld records after tests" into mcp/stein