From 165e04da7e10926266e70603f2ec9c794a15dc4d Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Thu, 26 Aug 2021 09:59:14 -0700
Subject: [PATCH 01/17] Initial commit.

---
 .../documents/indexes/models/__init__.py      |  12 +-
 .../documents/indexes/models/_models.py       | 178 ++++++++++++++++++
 2 files changed, 182 insertions(+), 8 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
index 7fc795068670..0fc0ea648b54 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
@@ -58,9 +58,7 @@
     ElisionTokenFilter,
     EntityCategory,
     EntityLinkingSkill,
-    EntityRecognitionSkill,
     EntityRecognitionSkillLanguage,
-    EntityRecognitionSkillV3,
     FieldMapping,
     FieldMappingFunction,
     FreshnessScoringFunction,
@@ -130,9 +128,7 @@
     ScoringFunctionAggregation,
     ScoringFunctionInterpolation,
     ScoringProfile,
-    SentimentSkill,
     SentimentSkillLanguage,
-    SentimentSkillV3,
     ShaperSkill,
     ShingleTokenFilter,
     Similarity as SimilarityAlgorithm,
@@ -169,10 +165,14 @@
 from ._models import (
     AnalyzeTextOptions,
     CustomAnalyzer,
+    EntityRecognitionSkill,
+    EntityRecogntionSkillVersion,
     PatternAnalyzer,
     PatternTokenizer,
     SearchIndexerDataSourceConnection,
     SearchResourceEncryptionKey,
+    SentimentSkill,
+    SentimentSkillVersion,
     SynonymMap,
 )
 
@@ -205,9 +205,7 @@
     "EdgeNGramTokenFilterSide",
     "EntityCategory",
     "EntityLinkingSkill",
-    "EntityRecognitionSkill",
     "EntityRecognitionSkillLanguage",
-    "EntityRecognitionSkillV3",
     "FieldMapping",
     "FieldMappingFunction",
     "FreshnessScoringFunction",
@@ -284,9 +282,7 @@
     "SearchIndexerStatus",
     "SearchResourceEncryptionKey",
     "SearchableField",
-    "SentimentSkill",
     "SentimentSkillLanguage",
-    "SentimentSkillV3",
     "ShaperSkill",
     "ShingleTokenFilter",
     "SimpleField",
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index acc61ccc75af..c8e15b1ff239 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -3,6 +3,8 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+from enum import Enum, EnumMeta
+from six import with_metaclass
 import msrest.serialization
 from .._generated.models import (
     LexicalAnalyzer,
@@ -13,14 +15,190 @@
     PatternTokenizer as _PatternTokenizer,
     SearchResourceEncryptionKey as _SearchResourceEncryptionKey,
     SearchIndexerDataSource as _SearchIndexerDataSource,
+    SearchIndexerSkill,
     SynonymMap as _SynonymMap,
     DataSourceCredentials,
     AzureActiveDirectoryApplicationCredentials,
 )
+from .._generated.models._search_client_enums import _CaseInsensitiveEnumMeta
+
 
 DELIMITER = "|"
 
 
+class EntityRecognitionSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
+    """Specifies the Entity Recognition skill version to use."""
+
+    #: Use Entity Recognition skill V1.
+    V1 = "#Microsoft.Skills.Text.EntityRecognitionSkill"
+    #: Use Entity Recognition skill V3.
+    V3 = "#Microsoft.Skills.Text.V3.EntityRecognitionSkill"
+    #: Use latest version of Entity Recognition skill.
+    LATEST = "#Microsoft.Skills.Text.V3.EntityRecognitionSkill"
+
+
+class EntityRecognitionSkill(SearchIndexerSkill):
+    """Using the Text Analytics API, extracts entities of different types from text.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param odata_type: Required. Identifies the concrete type of the skill.Constant filled by
+     server.
+    :type odata_type: str
+    :param name: The name of the skill which uniquely identifies it within the skillset. A skill
+     with no name defined will be given a default name of its 1-based index in the skills array,
+     prefixed with the character '#'.
+    :type name: str
+    :param description: The description of the skill which describes the inputs, outputs, and usage
+     of the skill.
+    :type description: str
+    :param context: Represents the level at which operations take place, such as the document root
+     or document content (for example, /document or /document/content). The default is /document.
+    :type context: str
+    :param inputs: Required. Inputs of the skills could be a column in the source data set, or the
+     output of an upstream skill.
+    :type inputs: list[~azure.search.documents.indexes.models.InputFieldMappingEntry]
+    :param outputs: Required. The output of a skill is either a field in a search index, or a value
+     that can be consumed as an input by another skill.
+    :type outputs: list[~azure.search.documents.indexes.models.OutputFieldMappingEntry]
+    :param categories: A list of entity categories that should be extracted.
+    :type categories: list[str or ~azure.search.documents.indexes.models.EntityCategory]
+    :param default_language_code: A value indicating which language code to use. Default is en.
+     Possible values include: "ar", "cs", "zh-Hans", "zh-Hant", "da", "nl", "en", "fi", "fr", "de",
+     "el", "hu", "it", "ja", "ko", "no", "pl", "pt-PT", "pt-BR", "ru", "es", "sv", "tr".
+    :type default_language_code: str or
+     ~azure.search.documents.indexes.models.EntityRecognitionSkillLanguage
+    :param include_typeless_entities: Determines whether or not to include entities which are well
+     known but don't conform to a pre-defined type. If this configuration is not set (default), set
+     to null or set to false, entities which don't conform to one of the pre-defined types will not
+     be surfaced.
+    :type include_typeless_entities: bool
+    :param minimum_precision: A value between 0 and 1 that be used to only include entities whose
+     confidence score is greater than the value specified. If not set (default), or if explicitly
+     set to null, all entities will be included.
+    :type minimum_precision: float
+    :param model_version: The version of the model to use when calling the Text Analytics service.
+     It will default to the latest available when not specified. We recommend you do not specify
+     this value unless absolutely necessary.
+    :type model_version: str
+    """
+
+    _validation = {
+        'odata_type': {'required': True},
+        'inputs': {'required': True},
+        'outputs': {'required': True},
+        'minimum_precision': {'maximum': 1, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'odata_type': {'key': '@odata\\.type', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'context': {'key': 'context', 'type': 'str'},
+        'inputs': {'key': 'inputs', 'type': '[InputFieldMappingEntry]'},
+        'outputs': {'key': 'outputs', 'type': '[OutputFieldMappingEntry]'},
+        'categories': {'key': 'categories', 'type': '[str]'},
+        'default_language_code': {'key': 'defaultLanguageCode', 'type': 'str'},
+        'include_typeless_entities': {'key': 'includeTypelessEntities', 'type': 'bool'},
+        'minimum_precision': {'key': 'minimumPrecision', 'type': 'float'},
+        'model_version': {'key': 'modelVersion', 'type': 'str'},
+    }
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(EntityRecognitionSkill, self).__init__(**kwargs)   
+        skill_version = kwargs.get('skill_version', EntityRecognitionSkillVersion.V1)
+        self.odata_type = skill_version  # type: str
+        self.categories = kwargs.get('categories', None)
+        self.default_language_code = kwargs.get('default_language_code', None)
+        self.include_typeless_entities = kwargs.get('include_typeless_entities', None)
+        self.minimum_precision = kwargs.get('minimum_precision', None)
+        self.model_version = kwargs.get('model_version', None)
+
+
+class SentimentSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
+    """ Specifies the Sentiment Skill version to use."""
+
+    #: Use Sentiment skill V1.
+    V1 = "#Microsoft.Skills.Text.SentimentSkill"
+    #: Use Sentiment skill V3.
+    V3 = "#Microsoft.Skills.Text.V3.SentimentSkill"
+    #: Use latest version of Sentiment skill.
+    LATEST = "#Microsoft.Skills.Text.V3.SentimentSkill"
+
+
+class SentimentSkill(SearchIndexerSkill):
+    """V1: Text analytics positive-negative sentiment analysis, scored as a floating point value in a range of zero to 1.
+       V3: Using the Text Analytics API, evaluates unstructured text and for each record, provides sentiment labels (such as "negative", "neutral" and "positive") based on the highest confidence score found by the service at a sentence and document-level.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param odata_type: Required. Identifies the concrete type of the skill.Constant filled by
+     server.
+    :type odata_type: str
+    :param name: The name of the skill which uniquely identifies it within the skillset. A skill
+     with no name defined will be given a default name of its 1-based index in the skills array,
+     prefixed with the character '#'.
+    :type name: str
+    :param description: The description of the skill which describes the inputs, outputs, and usage
+     of the skill.
+    :type description: str
+    :param context: Represents the level at which operations take place, such as the document root
+     or document content (for example, /document or /document/content). The default is /document.
+    :type context: str
+    :param inputs: Required. Inputs of the skills could be a column in the source data set, or the
+     output of an upstream skill.
+    :type inputs: list[~azure.search.documents.indexes.models.InputFieldMappingEntry]
+    :param outputs: Required. The output of a skill is either a field in a search index, or a value
+     that can be consumed as an input by another skill.
+    :type outputs: list[~azure.search.documents.indexes.models.OutputFieldMappingEntry]
+    :param default_language_code: A value indicating which language code to use. Default is en.
+     Possible values include: "da", "nl", "en", "fi", "fr", "de", "el", "it", "no", "pl", "pt-PT",
+     "ru", "es", "sv", "tr".
+    :type default_language_code: str or
+     ~azure.search.documents.indexes.models.SentimentSkillLanguage
+    :param include_opinion_mining: If set to true, the skill output will include information from
+     Text Analytics for opinion mining, namely targets (nouns or verbs) and their associated
+     assessment (adjective) in the text. Default is false.
+    :type include_opinion_mining: bool
+    :param model_version: The version of the model to use when calling the Text Analytics service.
+     It will default to the latest available when not specified. We recommend you do not specify
+     this value unless absolutely necessary.
+    :type model_version: str
+    """
+
+    _validation = {
+        'odata_type': {'required': True},
+        'inputs': {'required': True},
+        'outputs': {'required': True},
+    }
+
+    _attribute_map = {
+        'odata_type': {'key': '@odata\\.type', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'context': {'key': 'context', 'type': 'str'},
+        'inputs': {'key': 'inputs', 'type': '[InputFieldMappingEntry]'},
+        'outputs': {'key': 'outputs', 'type': '[OutputFieldMappingEntry]'},
+        'default_language_code': {'key': 'defaultLanguageCode', 'type': 'str'},
+        'include_opinion_mining': {'key': 'includeOpinionMining', 'type': 'bool'},
+        'model_version': {'key': 'modelVersion', 'type': 'str'},
+    }
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(SentimentSkill, self).__init__(**kwargs)
+        skill_version = kwargs.get('skill_version', SentimentSkillVersion.V1)
+        self.odata_type = skill_version  # type: str
+        self.default_language_code = kwargs.get('default_language_code', None)
+        self.include_opinion_mining = kwargs.get('include_opinion_mining', False)
+        self.model_version = kwargs.get('model_version', None)
+
+
 class AnalyzeTextOptions(msrest.serialization.Model):
     """Specifies some text and analysis components used to break that text into tokens.
 

From 9b7b166a6ae1743231840ff8fe257c0ae59e36be Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Thu, 26 Aug 2021 10:06:15 -0700
Subject: [PATCH 02/17] Add docstrings for skill_version

---
 .../azure/search/documents/indexes/models/_models.py        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index c8e15b1ff239..da96cd9cacde 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -81,6 +81,9 @@ class EntityRecognitionSkill(SearchIndexerSkill):
      It will default to the latest available when not specified. We recommend you do not specify
      this value unless absolutely necessary.
     :type model_version: str
+    :param skill_version: The version of the skill to use when calling the Text Analytics service.
+     It will default to V1 when not specified.
+    :type skill_version: ~azure.search.documents.indexes.models.EntityRecognitionSkillVersion
     """
 
     _validation = {
@@ -167,6 +170,9 @@ class SentimentSkill(SearchIndexerSkill):
      It will default to the latest available when not specified. We recommend you do not specify
      this value unless absolutely necessary.
     :type model_version: str
+    :param skill_version: The version of the skill to use when calling the Text Analytics service.
+     It will default to V1 when not specified.
+    :type skill_version: ~azure.search.documents.indexes.models.SentimentSkillVersion
     """
 
     _validation = {

From 6938a52068392ceba86de555d3cde80c0c215ae2 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Fri, 27 Aug 2021 14:17:49 -0700
Subject: [PATCH 03/17] Ensure SearchIndexerSkillset can convert between custom
 and generated models.

---
 .../indexes/_search_indexer_client.py         |  15 +-
 .../documents/indexes/models/__init__.py      |   8 +-
 .../documents/indexes/models/_models.py       | 163 +++++++++++++++++-
 ...search_index_client_skillset_live_async.py |  15 +-
 4 files changed, 184 insertions(+), 17 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
index 18f7daf1a058..7f65cb8940ec 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
@@ -10,7 +10,7 @@
 from azure.core.tracing.decorator import distributed_trace
 
 from ._generated import SearchClient as _SearchServiceClient
-from ._generated.models import SearchIndexerSkillset
+from .models import SearchIndexerSkillset
 from ._utils import (
     get_access_conditions,
     normalize_endpoint,
@@ -469,7 +469,7 @@ def get_skillsets(self, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
         result = self._client.skillsets.list(**kwargs)
-        return result.skillsets
+        return [SearchIndexerSkillset._from_generated(skillset) for skillset in result.skillsets]
 
     @distributed_trace
     def get_skillset_names(self, **kwargs):
@@ -507,7 +507,8 @@ def get_skillset(self, name, **kwargs):
 
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
-        return self._client.skillsets.get(name, **kwargs)
+        result = self._client.skillsets.get(name, **kwargs)
+        return SearchIndexerSkillset._from_generated(result)
 
     @distributed_trace
     def delete_skillset(self, skillset, **kwargs):
@@ -563,8 +564,9 @@ def create_skillset(self, skillset, **kwargs):
 
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
+        result =  self._client.skillsets.create(skillset._to_generated(), **kwargs)
+        return SearchIndexerSkillset._from_generated(result)
 
-        return self._client.skillsets.create(skillset, **kwargs)
 
     @distributed_trace
     def create_or_update_skillset(self, skillset, **kwargs):
@@ -586,9 +588,10 @@ def create_or_update_skillset(self, skillset, **kwargs):
         )
         kwargs.update(access_condition)
 
-        return self._client.skillsets.create_or_update(
+        result = self._client.skillsets.create_or_update(
             skillset_name=skillset.name,
-            skillset=skillset,
+            skillset=skillset._to_generated(),
             error_map=error_map,
             **kwargs
         )
+        return SearchIndexerSkillset._from_generated(result)
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
index 0fc0ea648b54..58af2c002d11 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py
@@ -122,7 +122,6 @@
     SearchIndexerKnowledgeStoreProjection,
     SearchIndexerKnowledgeStoreTableProjectionSelector,
     SearchIndexerLimits,
-    SearchIndexerSkillset,
     SearchIndexerStatus,
     ScoringFunction,
     ScoringFunctionAggregation,
@@ -166,10 +165,11 @@
     AnalyzeTextOptions,
     CustomAnalyzer,
     EntityRecognitionSkill,
-    EntityRecogntionSkillVersion,
+    EntityRecognitionSkillVersion,
     PatternAnalyzer,
     PatternTokenizer,
     SearchIndexerDataSourceConnection,
+    SearchIndexerSkillset,
     SearchResourceEncryptionKey,
     SentimentSkill,
     SentimentSkillVersion,
@@ -205,7 +205,9 @@
     "EdgeNGramTokenFilterSide",
     "EntityCategory",
     "EntityLinkingSkill",
+    "EntityRecognitionSkill",
     "EntityRecognitionSkillLanguage",
+    "EntityRecognitionSkillVersion",
     "FieldMapping",
     "FieldMappingFunction",
     "FreshnessScoringFunction",
@@ -282,7 +284,9 @@
     "SearchIndexerStatus",
     "SearchResourceEncryptionKey",
     "SearchableField",
+    "SentimentSkill",
     "SentimentSkillLanguage",
+    "SentimentSkillVersion",
     "ShaperSkill",
     "ShingleTokenFilter",
     "SimpleField",
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index da96cd9cacde..f80b7e0e4ec2 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -11,11 +11,16 @@
     LexicalTokenizer,
     AnalyzeRequest,
     CustomAnalyzer as _CustomAnalyzer,
+    EntityRecognitionSkill as _EntityRecognitionSkillV1,
+    EntityRecognitionSkillV3 as _EntityRecognitionSkillV3,
     PatternAnalyzer as _PatternAnalyzer,
     PatternTokenizer as _PatternTokenizer,
     SearchResourceEncryptionKey as _SearchResourceEncryptionKey,
     SearchIndexerDataSource as _SearchIndexerDataSource,
     SearchIndexerSkill,
+    SearchIndexerSkillset as _SearchIndexerSkillset,
+    SentimentSkill as _SentimentSkillV1,
+    SentimentSkillV3 as _SentimentSkillV3,
     SynonymMap as _SynonymMap,
     DataSourceCredentials,
     AzureActiveDirectoryApplicationCredentials,
@@ -26,6 +31,79 @@
 DELIMITER = "|"
 
 
+class SearchIndexerSkillset(_SearchIndexerSkillset):
+    """A list of skills.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The name of the skillset.
+    :type name: str
+    :param description: The description of the skillset.
+    :type description: str
+    :param skills: Required. A list of skills in the skillset.
+    :type skills: list[~azure.search.documents.indexes.models.SearchIndexerSkill]
+    :param cognitive_services_account: Details about cognitive services to be used when running
+     skills.
+    :type cognitive_services_account:
+     ~azure.search.documents.indexes.models.CognitiveServicesAccount
+    :param knowledge_store: Definition of additional projections to azure blob, table, or files, of
+     enriched data.
+    :type knowledge_store: ~azure.search.documents.indexes.models.SearchIndexerKnowledgeStore
+    :param e_tag: The ETag of the skillset.
+    :type e_tag: str
+    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
+     This key is used to provide an additional level of encryption-at-rest for your skillset
+     definition when you want full assurance that no one, not even Microsoft, can decrypt your
+     skillset definition in Azure Cognitive Search. Once you have encrypted your skillset
+     definition, it will always remain encrypted. Azure Cognitive Search will ignore attempts to set
+     this property to null. You can change this property as needed if you want to rotate your
+     encryption key; Your skillset definition will be unaffected. Encryption with customer-managed
+     keys is not available for free search services, and is only available for paid services created
+     on or after January 1, 2019.
+    :type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
+    """
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(_SearchIndexerSkillset, self).__init__(**kwargs)
+
+    def _to_generated(self):
+        generated_skills = []
+        for skill in self.skills:
+            if hasattr(skill, '_to_generated'):
+                generated_skills.append(skill._to_generated())
+            else:
+                generated_skills.append(skill)
+        assert len(generated_skills) == len(self.skills)
+        return _SearchIndexerSkillset(
+            name=getattr(self, 'name', None),
+            description=getattr(self, 'description', None),
+            skills=generated_skills,
+            cognitive_services_account=getattr(self, 'cognitive_services_account', None),
+            knowledge_store=getattr(self, 'knowledge_store', None),
+            e_tag=getattr(self, 'e_tag', None),
+            encryption_key=getattr(self, 'encryption_key', None)
+        )
+
+    @classmethod
+    def _from_generated(cls, skillset):
+        custom_skills = []
+        for skill in skillset.skills:
+            skill_cls = type(skill)
+            if skill_cls in [_EntityRecognitionSkillV1, _EntityRecognitionSkillV3]:
+                custom_skills.append(EntityRecognitionSkill._from_generated(skill))
+            elif skill_cls in [_SentimentSkillV1, _SentimentSkillV3]:
+                custom_skills.append(SentimentSkill._from_generated(skill))
+            else:
+                custom_skills.append(skill)
+        assert len(skillset.skills) == len(custom_skills)
+        kwargs = skillset.as_dict()
+        kwargs['skills'] = custom_skills
+        return cls(**kwargs)
+
+
 class EntityRecognitionSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
     """Specifies the Entity Recognition skill version to use."""
 
@@ -111,15 +189,57 @@ def __init__(
         self,
         **kwargs
     ):
-        super(EntityRecognitionSkill, self).__init__(**kwargs)   
-        skill_version = kwargs.get('skill_version', EntityRecognitionSkillVersion.V1)
-        self.odata_type = skill_version  # type: str
+        super(EntityRecognitionSkill, self).__init__(**kwargs)
+        self.skill_version = kwargs.get('skill_version', EntityRecognitionSkillVersion.V1)
+        self.odata_type = self.skill_version  # type: str
         self.categories = kwargs.get('categories', None)
         self.default_language_code = kwargs.get('default_language_code', None)
         self.include_typeless_entities = kwargs.get('include_typeless_entities', None)
         self.minimum_precision = kwargs.get('minimum_precision', None)
         self.model_version = kwargs.get('model_version', None)
 
+    def _to_generated(self):
+        if self.skill_version == EntityRecognitionSkillVersion.V1:
+            return _EntityRecognitionSkillV1(
+                inputs=self.inputs,
+                outputs=self.outputs,
+                name=self.name,
+                odata_type=self.odata_type,
+                categories=self.categories,
+                default_language_code=self.default_language_code,
+                include_typeless_entities=self.include_typeless_entities,
+                minimum_precision=self.minimum_precision,
+                model_version = self.model_version
+            )
+        if self.skill_version in [EntityRecognitionSkillVersion.V3, EntityRecognitionSkillVersion.LATEST]:
+            return _EntityRecognitionSkillV3(
+                inputs=self.inputs,
+                outputs=self.outputs,
+                name=self.name,
+                odata_type=self.odata_type,
+                categories=self.categories,
+                default_language_code=self.default_language_code,
+                include_typeless_entities=self.include_typeless_entities,
+                minimum_precision=self.minimum_precision,
+                model_version = self.model_version
+            )
+
+    @classmethod
+    def _from_generated(cls, skill):
+        if not skill:
+            return None
+        kwargs = skill.as_dict()
+        if isinstance(skill, _EntityRecognitionSkillV1):
+            return EntityRecognitionSkill(
+                **kwargs,
+                skill_version=EntityRecognitionSkillVersion.V1
+            )
+        if isinstance(skill, _EntityRecognitionSkillV3):
+            return EntityRecognitionSkill(
+                **kwargs,
+                skill_version=EntityRecognitionSkillVersion.V3
+            )
+
 
 class SentimentSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
     """ Specifies the Sentiment Skill version to use."""
@@ -198,12 +318,43 @@ def __init__(
         **kwargs
     ):
         super(SentimentSkill, self).__init__(**kwargs)
-        skill_version = kwargs.get('skill_version', SentimentSkillVersion.V1)
-        self.odata_type = skill_version  # type: str
+        self.skill_version = kwargs.get('skill_version', SentimentSkillVersion.V1)
+        self.odata_type = self.skill_version  # type: str
         self.default_language_code = kwargs.get('default_language_code', None)
-        self.include_opinion_mining = kwargs.get('include_opinion_mining', False)
+        self.include_opinion_mining = kwargs.get('include_opinion_mining', False )
         self.model_version = kwargs.get('model_version', None)
 
+    def _to_generated(self):
+        if self.skill_version == SentimentSkillVersion.V1:
+            return _SentimentSkillV1(
+                name=self.name,
+                odata_type=self.odata_type,
+                default_language_code = self.default_language_code,
+                include_opinion_mining = self.include_opinion_mining,
+                model_version = self.model_version
+            )
+        if self.skill_version in [SentimentSkillVersion.V3, SentimentSkillVersion.LATEST]:
+            return _SentimentSkillV3(
+                name=self.name,
+                odata_type=self.odata_type,
+                default_language_code = self.default_language_code,
+                include_opinion_mining = self.include_opinion_mining,
+                model_version = self.model_version
+            )
+
+    @classmethod
+    def _from_generated(cls, skill):
+        if not skill:
+            return None
+        if isinstance(cls, _SentimentSkillV1):
+            return SentimentSkill(
+                skill_version=SentimentSkillVersion.V1
+            )
+        if isinstance(cls, _SentimentSkillV3):
+            return SentimentSkill(
+                skill_version=SentimentSkillVersion.V3
+            )
+
 
 class AnalyzeTextOptions(msrest.serialization.Model):
     """Specifies some text and analysis components used to break that text into tokens.
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
index 17089fc01430..1712596c1202 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
@@ -22,10 +22,15 @@
 from azure.core.exceptions import HttpResponseError
 from azure.search.documents.indexes.models import(
     EntityRecognitionSkill,
+    EntityRecognitionSkillVersion,
     InputFieldMappingEntry,
     OutputFieldMappingEntry,
     SearchIndexerSkillset,
 )
+from azure.search.documents.indexes._generated.models import (
+    EntityRecognitionSkill as EntityRecognitionSkillV1,
+    EntityRecognitionSkillV3
+)
 from azure.search.documents.indexes.aio import SearchIndexerClient
 
 CWD = dirname(realpath(__file__))
@@ -57,15 +62,19 @@ async def test_create_skillset(self, api_key, endpoint, index_name, **kwargs):
 
         s = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizations")])
+        sv3 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                   outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizations")],
+                                   skill_version=EntityRecognitionSkillVersion.V3)
 
-        skillset = SearchIndexerSkillset(name='test-ss', skills=list([s]), description="desc")
+        skillset = SearchIndexerSkillset(name='test-ss', skills=list([s, sv3]), description="desc")
         result = await client.create_skillset(skillset)
         assert isinstance(result, SearchIndexerSkillset)
         assert result.name == "test-ss"
         assert result.description == "desc"
         assert result.e_tag
-        assert len(result.skills) == 1
-        assert isinstance(result.skills[0], EntityRecognitionSkill)
+        assert len(result.skills) == 2
+        assert isinstance(result.skills[0], EntityRecognitionSkillV1)
+        assert isinstance(result.skills[1], EntityRecognitionSkillV3)
 
         assert len(await client.get_skillsets()) == 1
 

From ca74de0549fc651cad864cd096201319561916bb Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Mon, 30 Aug 2021 13:00:06 -0700
Subject: [PATCH 04/17] Update tests.

---
 .../documents/indexes/models/_models.py       |   2 +-
 ...e_async.test_async_get_document_count.yaml |   8 +-
 ...nt_basic_live_async.test_get_document.yaml |  74 +++---
 ..._live_async.test_get_document_missing.yaml |   8 +-
 ..._async.test_delete_documents_existing.yaml |  44 ++--
 ...e_async.test_delete_documents_missing.yaml |  46 ++--
 ...e_async.test_merge_documents_existing.yaml |  44 ++--
 ...ve_async.test_merge_documents_missing.yaml |  46 ++--
 ..._async.test_merge_or_upload_documents.yaml |  40 +--
 ..._async.test_upload_documents_existing.yaml |  28 +-
 ..._live_async.test_upload_documents_new.yaml |  42 +--
 ..._async.test_delete_documents_existing.yaml |  30 +--
 ...e_async.test_delete_documents_missing.yaml |  32 +--
 ...e_async.test_merge_documents_existing.yaml |  30 +--
 ...ve_async.test_merge_documents_missing.yaml |  30 +--
 ..._async.test_merge_or_upload_documents.yaml |  32 +--
 ..._async.test_upload_documents_existing.yaml |   8 +-
 ..._live_async.test_upload_documents_new.yaml |  32 +--
 ...t_search_live_async.test_autocomplete.yaml |   8 +-
 ...rch_live_async.test_get_search_counts.yaml |  16 +-
 ...h_live_async.test_get_search_coverage.yaml |  16 +-
 ...ive_async.test_get_search_facets_none.yaml |   8 +-
 ...e_async.test_get_search_facets_result.yaml |   8 +-
 ...rch_live_async.test_get_search_filter.yaml |   8 +-
 ...ve_async.test_get_search_filter_array.yaml |   8 +-
 ...rch_live_async.test_get_search_simple.yaml |  16 +-
 ...async.test_get_search_simple_with_top.yaml |  16 +-
 ...client_search_live_async.test_suggest.yaml |   8 +-
 ...ve_async.test_create_datasource_async.yaml |  12 +-
 ...est_create_or_update_datasource_async.yaml |  64 ++---
 ...ate_or_update_datasource_if_unchanged.yaml |  38 +--
 ...ve_async.test_delete_datasource_async.yaml |  38 +--
 ...c.test_delete_datasource_if_unchanged.yaml |  32 +--
 ..._live_async.test_get_datasource_async.yaml |  24 +-
 ...live_async.test_list_datasource_async.yaml |  36 +--
 ...x_client_live_async.test_analyze_text.yaml |   8 +-
 ...x_client_live_async.test_create_index.yaml |  12 +-
 ...ive_async.test_create_or_update_index.yaml |  24 +-
 ...create_or_update_indexes_if_unchanged.yaml |  36 +--
 ...client_live_async.test_delete_indexes.yaml |  16 +-
 ...sync.test_delete_indexes_if_unchanged.yaml |  34 +--
 ...ndex_client_live_async.test_get_index.yaml |  12 +-
 ..._live_async.test_get_index_statistics.yaml |   8 +-
 ...ive_async.test_get_service_statistics.yaml |   8 +-
 ...x_client_live_async.test_list_indexes.yaml |  12 +-
 ...nt_live_async.test_list_indexes_empty.yaml |   8 +-
 ..._async.test_create_or_update_skillset.yaml |  50 ++--
 ...reate_or_update_skillset_if_unchanged.yaml | 109 --------
 ...est_create_or_update_skillset_inplace.yaml | 139 ----------
 ...llset_live_async.test_create_skillset.yaml |  49 +---
 ...llset_live_async.test_delete_skillset.yaml |  38 +--
 ...ync.test_delete_skillset_if_unchanged.yaml |  34 +--
 ...skillset_live_async.test_get_skillset.yaml |  36 +--
 ...killset_live_async.test_get_skillsets.yaml |  36 +--
 ...ync.test_create_or_update_synonym_map.yaml |  64 ++---
 ...ap_live_async.test_create_synonym_map.yaml |  24 +-
 ...ap_live_async.test_delete_synonym_map.yaml | 121 ---------
 ....test_delete_synonym_map_if_unchanged.yaml | 109 --------
 ...m_map_live_async.test_get_synonym_map.yaml |  97 -------
 ..._map_live_async.test_get_synonym_maps.yaml |  39 +--
 ...client_live_async.test_create_indexer.yaml |  54 ++--
 ...e_async.test_create_or_update_indexer.yaml | 179 +++----------
 ...create_or_update_indexer_if_unchanged.yaml | 132 +++-------
 ...client_live_async.test_delete_indexer.yaml | 136 +++-------
 ...sync.test_delete_indexer_if_unchanged.yaml | 124 +++------
 ...er_client_live_async.test_get_indexer.yaml |  84 +++---
 ...nt_live_async.test_get_indexer_status.yaml |  83 +++---
 ...r_client_live_async.test_list_indexer.yaml | 144 ++++-------
 ..._client_live_async.test_reset_indexer.yaml | 136 +++-------
 ...er_client_live_async.test_run_indexer.yaml | 137 +++-------
 ...search_index_client_skillset_live_async.py |  28 +-
 ...h_client_basic_live.test_get_document.yaml |  76 +++---
 ...nt_basic_live.test_get_document_count.yaml |   8 +-
 ..._basic_live.test_get_document_missing.yaml |   8 +-
 ...r_live.test_delete_documents_existing.yaml |  44 ++--
 ...er_live.test_delete_documents_missing.yaml |  44 ++--
 ...er_live.test_merge_documents_existing.yaml |  44 ++--
 ...der_live.test_merge_documents_missing.yaml |  44 ++--
 ...r_live.test_merge_or_upload_documents.yaml |  42 +--
 ...r_live.test_upload_documents_existing.yaml |  28 +-
 ...sender_live.test_upload_documents_new.yaml |  44 ++--
 ...t_live.test_delete_documents_existing.yaml |  32 +--
 ...nt_live.test_delete_documents_missing.yaml |  32 +--
 ...nt_live.test_merge_documents_existing.yaml |  30 +--
 ...ent_live.test_merge_documents_missing.yaml |  30 +--
 ...t_live.test_merge_or_upload_documents.yaml |  30 +--
 ...t_live.test_upload_documents_existing.yaml |   8 +-
 ...cument_live.test_upload_documents_new.yaml |  32 +--
 ..._client_search_live.test_autocomplete.yaml |   8 +-
 ...nt_search_live.test_get_search_counts.yaml |  14 +-
 ..._search_live.test_get_search_coverage.yaml |  16 +-
 ...arch_live.test_get_search_facets_none.yaml |   8 +-
 ...ch_live.test_get_search_facets_result.yaml |   8 +-
 ...nt_search_live.test_get_search_filter.yaml |   8 +-
 ...rch_live.test_get_search_filter_array.yaml |   8 +-
 ...nt_search_live.test_get_search_simple.yaml |  16 +-
 ..._live.test_get_search_simple_with_top.yaml |  16 +-
 ...earch_client_search_live.test_suggest.yaml |   8 +-
 ...ta_source_live.test_create_datasource.yaml |  12 +-
 ...live.test_create_or_update_datasource.yaml |  56 ++--
 ...ate_or_update_datasource_if_unchanged.yaml |  36 +--
 ...ta_source_live.test_delete_datasource.yaml |  38 +--
 ...e.test_delete_datasource_if_unchanged.yaml |  34 +--
 ...delete_datasource_string_if_unchanged.yaml |  24 +-
 ..._data_source_live.test_get_datasource.yaml |  24 +-
 ...data_source_live.test_list_datasource.yaml |  34 +--
 ...h_index_client_live.test_analyze_text.yaml |   8 +-
 ...h_index_client_live.test_create_index.yaml |  12 +-
 ...ient_live.test_create_or_update_index.yaml |  24 +-
 ...create_or_update_indexes_if_unchanged.yaml |  36 +--
 ...index_client_live.test_delete_indexes.yaml |  16 +-
 ...live.test_delete_indexes_if_unchanged.yaml |  34 +--
 ...arch_index_client_live.test_get_index.yaml |  12 +-
 ...client_live.test_get_index_statistics.yaml |   8 +-
 ...ient_live.test_get_service_statistics.yaml |   8 +-
 ...h_index_client_live.test_list_indexes.yaml |  10 +-
 ...x_client_live.test_list_indexes_empty.yaml |   8 +-
 ...t_live.test_create_or_update_skillset.yaml |  46 ++--
 ...reate_or_update_skillset_if_unchanged.yaml |  34 +--
 ...est_create_or_update_skillset_inplace.yaml |  46 ++--
 ...nt_skillset_live.test_create_skillset.yaml |  33 +--
 ...nt_skillset_live.test_delete_skillset.yaml |  36 +--
 ...ive.test_delete_skillset_if_unchanged.yaml |  34 +--
 ...lient_skillset_live.test_get_skillset.yaml |  34 +--
 ...ient_skillset_live.test_get_skillsets.yaml |  34 +--
 ...ive.test_create_or_update_synonym_map.yaml |  56 ++--
 ...te_or_update_synonym_map_if_unchanged.yaml |  34 +--
 ...onym_map_live.test_create_synonym_map.yaml |  22 +-
 ...onym_map_live.test_delete_synonym_map.yaml |  38 +--
 ....test_delete_synonym_map_if_unchanged.yaml |  34 +--
 ...synonym_map_live.test_get_synonym_map.yaml |  34 +--
 ...ynonym_map_live.test_get_synonym_maps.yaml |  36 +--
 ...dexer_client_live.test_create_indexer.yaml |  57 ++--
 ...nt_live.test_create_or_update_indexer.yaml | 244 +++---------------
 ...create_or_update_indexer_if_unchanged.yaml | 162 +++---------
 ...dexer_client_live.test_delete_indexer.yaml | 181 +++----------
 ...live.test_delete_indexer_if_unchanged.yaml | 156 +++--------
 ..._indexer_client_live.test_get_indexer.yaml | 103 +++-----
 ...r_client_live.test_get_indexer_status.yaml | 101 +++-----
 ...indexer_client_live.test_list_indexer.yaml | 178 ++++---------
 ...ndexer_client_live.test_reset_indexer.yaml | 181 +++----------
 ..._indexer_client_live.test_run_indexer.yaml | 183 +++----------
 .../test_search_index_client_skillset_live.py |  20 +-
 143 files changed, 2246 insertions(+), 4283 deletions(-)
 delete mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
 delete mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
 delete mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
 delete mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
 delete mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index f80b7e0e4ec2..898babbea19a 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -67,7 +67,7 @@ def __init__(
         self,
         **kwargs
     ):
-        super(_SearchIndexerSkillset, self).__init__(**kwargs)
+        super(SearchIndexerSkillset, self).__init__(**kwargs)
 
     def _to_generated(self):
         generated_skills = []
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml
index db4c279ed153..e535fef7b563 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search6dc91ab1.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:17:55 GMT
-      elapsed-time: '97'
+      date: Mon, 30 Aug 2021 20:26:59 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 66ac7723-d9f9-11eb-acb5-a0481ca055a9
+      request-id: a1675905-09d0-11ec-979d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml
index c0d54c2767ac..0b5f8fc0533b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('1')?api-version=2021-04-30-Preview
   response:
@@ -22,13 +22,13 @@ interactions:
       cache-control: no-cache
       content-length: '748'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '101'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '91'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6fbba2b6-d9f9-11eb-badd-a0481ca055a9
+      request-id: a9dd7b3a-09d0-11ec-b994-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -41,7 +41,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('2')?api-version=2021-04-30-Preview
   response:
@@ -53,13 +53,13 @@ interactions:
       cache-control: no-cache
       content-length: '449'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
+      date: Mon, 30 Aug 2021 20:27:14 GMT
       elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6fea4cea-d9f9-11eb-9a16-a0481ca055a9
+      request-id: aa0661d1-09d0-11ec-aa48-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -72,7 +72,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -83,13 +83,13 @@ interactions:
       cache-control: no-cache
       content-length: '438'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '5'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6ff2afb7-d9f9-11eb-ae05-a0481ca055a9
+      request-id: aa0e4995-09d0-11ec-a343-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -102,7 +102,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -113,13 +113,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6ffbd293-d9f9-11eb-a867-a0481ca055a9
+      request-id: aa156b1b-09d0-11ec-a1a1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -132,7 +132,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('5')?api-version=2021-04-30-Preview
   response:
@@ -143,13 +143,13 @@ interactions:
       cache-control: no-cache
       content-length: '424'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
+      date: Mon, 30 Aug 2021 20:27:14 GMT
       elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7004732a-d9f9-11eb-96e4-a0481ca055a9
+      request-id: aa1d3e77-09d0-11ec-8fda-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -162,7 +162,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('6')?api-version=2021-04-30-Preview
   response:
@@ -173,13 +173,13 @@ interactions:
       cache-control: no-cache
       content-length: '301'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 700da56d-d9f9-11eb-b1c5-a0481ca055a9
+      request-id: aa24bf02-09d0-11ec-a46b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -192,7 +192,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('7')?api-version=2021-04-30-Preview
   response:
@@ -204,13 +204,13 @@ interactions:
       cache-control: no-cache
       content-length: '357'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
+      date: Mon, 30 Aug 2021 20:27:14 GMT
       elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7016e708-d9f9-11eb-a48d-a0481ca055a9
+      request-id: aa2cd2a2-09d0-11ec-a8b7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -223,7 +223,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('8')?api-version=2021-04-30-Preview
   response:
@@ -236,13 +236,13 @@ interactions:
       cache-control: no-cache
       content-length: '411'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '3'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 701f1d37-d9f9-11eb-b920-a0481ca055a9
+      request-id: aa3404e3-09d0-11ec-b50f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -255,7 +255,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('9')?api-version=2021-04-30-Preview
   response:
@@ -282,13 +282,13 @@ interactions:
       cache-control: no-cache
       content-length: '1061'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '10'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 702648df-d9f9-11eb-8ef5-a0481ca055a9
+      request-id: aa3cdc29-09d0-11ec-acef-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -301,7 +301,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search496815ac.search.windows.net/indexes('drgqefsg')/docs('10')?api-version=2021-04-30-Preview
   response:
@@ -324,13 +324,13 @@ interactions:
       cache-control: no-cache
       content-length: '938'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:11 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 20:27:14 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 702f74d0-d9f9-11eb-959a-a0481ca055a9
+      request-id: aa45a33d-09d0-11ec-8ed8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml
index e1ff92cd3258..d6c36dc5c542 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search5c91905.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -14,11 +14,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:18:27 GMT
-      elapsed-time: '79'
+      date: Mon, 30 Aug 2021 20:27:28 GMT
+      elapsed-time: '88'
       expires: '-1'
       pragma: no-cache
-      request-id: 79637f50-d9f9-11eb-bf5f-a0481ca055a9
+      request-id: b1c169fd-09d0-11ec-b98d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml
index d937f7080bd4..22c133b935e1 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf051f3d.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaf051f3d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C2543D87600\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchaf051f3d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF49B268E93\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:15:03 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D93C2543D87600"
+      date: Mon, 30 Aug 2021 20:27:40 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96BF49B268E93"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 61dd1f84-da01-11eb-b16e-a0481ca055a9
+      request-id: b90df38b-09d0-11ec-88f3-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchaf051f3d.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Thu, 01 Jul 2021 00:15:04 GMT
-      elapsed-time: '119'
+      date: Mon, 30 Aug 2021 20:27:40 GMT
+      elapsed-time: '25'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6202278b-da01-11eb-a655-a0481ca055a9
+      request-id: b92ba6dc-09d0-11ec-9fac-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -69,7 +69,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf051f3d.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Thu, 01 Jul 2021 00:15:06 GMT
-      elapsed-time: '21'
+      date: Mon, 30 Aug 2021 20:27:43 GMT
+      elapsed-time: '105'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 63fd9131-da01-11eb-92d3-a0481ca055a9
+      request-id: bb13ed34-09d0-11ec-a3d9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -98,7 +98,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf051f3d.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -107,11 +107,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Thu, 01 Jul 2021 00:15:06 GMT
-      elapsed-time: '24'
+      date: Mon, 30 Aug 2021 20:27:43 GMT
+      elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: 641f8232-da01-11eb-9602-a0481ca055a9
+      request-id: bb43b340-09d0-11ec-bd3b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -123,7 +123,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf051f3d.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -132,11 +132,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Thu, 01 Jul 2021 00:15:06 GMT
-      elapsed-time: '5'
+      date: Mon, 30 Aug 2021 20:27:43 GMT
+      elapsed-time: '3'
       expires: '-1'
       pragma: no-cache
-      request-id: 642b7624-da01-11eb-b244-a0481ca055a9
+      request-id: bb4b2d88-09d0-11ec-ad94-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml
index fe962ec8b1fa..94c15df25990 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search8fba1ecc.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8fba1ecc.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D6A561B09\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search8fba1ecc.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4A4A706BF\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
-      content-length: '1181'
+      content-length: '1180'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:18:52 GMT
-      elapsed-time: '835'
-      etag: W/"0x8D93C1D6A561B09"
+      date: Mon, 30 Aug 2021 20:27:56 GMT
+      elapsed-time: '21'
+      etag: W/"0x8D96BF4A4A706BF"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 887d316d-d9f9-11eb-9b38-a0481ca055a9
+      request-id: c2925b1a-09d0-11ec-8a47-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search8fba1ecc.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:18:53 GMT
-      elapsed-time: '228'
+      date: Mon, 30 Aug 2021 20:27:56 GMT
+      elapsed-time: '104'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 891c3cae-d9f9-11eb-ba56-a0481ca055a9
+      request-id: c2b7afd6-09d0-11ec-b357-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -69,7 +69,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search8fba1ecc.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:18:57 GMT
-      elapsed-time: '92'
+      date: Mon, 30 Aug 2021 20:27:59 GMT
+      elapsed-time: '81'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8b32c184-d9f9-11eb-ae3b-a0481ca055a9
+      request-id: c4ac3462-09d0-11ec-9c34-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -98,7 +98,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search8fba1ecc.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -107,11 +107,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:18:57 GMT
-      elapsed-time: '23'
+      date: Mon, 30 Aug 2021 20:27:59 GMT
+      elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: 8b74e97a-d9f9-11eb-a0a3-a0481ca055a9
+      request-id: c4d286e1-09d0-11ec-aed7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -123,7 +123,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search8fba1ecc.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -132,11 +132,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:18:57 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:27:59 GMT
+      elapsed-time: '7'
       expires: '-1'
       pragma: no-cache
-      request-id: 8b807358-d9f9-11eb-8ea1-a0481ca055a9
+      request-id: c4d93d8a-09d0-11ec-a821-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml
index b02d497891e3..225a94be532d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search909e1eda.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search909e1eda.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D7715BB3F\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search909e1eda.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4AE04D532\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
-      content-length: '1182'
+      content-length: '1181'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:19:14 GMT
-      elapsed-time: '802'
-      etag: W/"0x8D93C1D7715BB3F"
+      date: Mon, 30 Aug 2021 20:28:11 GMT
+      elapsed-time: '21'
+      etag: W/"0x8D96BF4AE04D532"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 95166d5c-d9f9-11eb-9487-a0481ca055a9
+      request-id: cbef67b8-09d0-11ec-b03e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search909e1eda.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:14 GMT
-      elapsed-time: '207'
+      date: Mon, 30 Aug 2021 20:28:12 GMT
+      elapsed-time: '112'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 95b5695d-d9f9-11eb-8e5e-a0481ca055a9
+      request-id: cc0a126c-09d0-11ec-ac43-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -69,7 +69,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search909e1eda.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:19:18 GMT
-      elapsed-time: '131'
+      date: Mon, 30 Aug 2021 20:28:15 GMT
+      elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 97c221dc-d9f9-11eb-a662-a0481ca055a9
+      request-id: cdfecf44-09d0-11ec-bf29-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -98,7 +98,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search909e1eda.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -109,13 +109,13 @@ interactions:
       cache-control: no-cache
       content-length: '438'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:18 GMT
-      elapsed-time: '32'
+      date: Mon, 30 Aug 2021 20:28:15 GMT
+      elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 97fdfbd0-d9f9-11eb-b3f5-a0481ca055a9
+      request-id: ce21fdd8-09d0-11ec-b174-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -128,7 +128,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search909e1eda.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -139,13 +139,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:18 GMT
+      date: Mon, 30 Aug 2021 20:28:15 GMT
       elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 980cbfc8-d9f9-11eb-b932-a0481ca055a9
+      request-id: ce2954ef-09d0-11ec-a6df-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml
index 5bb927a39e11..b51dc6900608 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search71b61e69.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b61e69.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D835A6810\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search71b61e69.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4B7CB63ED\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
-      content-length: '1182'
+      content-length: '1183'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:19:33 GMT
-      elapsed-time: '77'
-      etag: W/"0x8D93C1D835A6810"
+      date: Mon, 30 Aug 2021 20:28:28 GMT
+      elapsed-time: '29'
+      etag: W/"0x8D96BF4B7CB63ED"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a149ffda-d9f9-11eb-ba0d-a0481ca055a9
+      request-id: d5b3c7e2-09d0-11ec-9ff9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search71b61e69.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -51,13 +51,13 @@ interactions:
       cache-control: no-cache
       content-length: '225'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:34 GMT
-      elapsed-time: '161'
+      date: Mon, 30 Aug 2021 20:28:28 GMT
+      elapsed-time: '94'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a173aa88-d9f9-11eb-9a6a-a0481ca055a9
+      request-id: d5dd5e1c-09d0-11ec-a273-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -70,7 +70,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search71b61e69.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -80,13 +80,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:19:37 GMT
-      elapsed-time: '87'
+      date: Mon, 30 Aug 2021 20:28:31 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a3734e7d-d9f9-11eb-a46c-a0481ca055a9
+      request-id: d7ce20df-09d0-11ec-bfca-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -99,7 +99,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search71b61e69.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -108,11 +108,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:19:37 GMT
-      elapsed-time: '5'
+      date: Mon, 30 Aug 2021 20:28:31 GMT
+      elapsed-time: '4'
       expires: '-1'
       pragma: no-cache
-      request-id: a39c8c34-d9f9-11eb-b2fc-a0481ca055a9
+      request-id: d7e7407a-09d0-11ec-bcc6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -124,7 +124,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search71b61e69.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -135,13 +135,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:37 GMT
-      elapsed-time: '9'
+      date: Mon, 30 Aug 2021 20:28:31 GMT
+      elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a3a32fb7-d9f9-11eb-9575-a0481ca055a9
+      request-id: d7ed82a5-09d0-11ec-ada8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml
index 100e4ae11d8b..f5b17fcaaaec 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf391f34.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaf391f34.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D8FBC19E8\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchaf391f34.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4C1552CA1\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:19:56 GMT
-      elapsed-time: '861'
-      etag: W/"0x8D93C1D8FBC19E8"
+      date: Mon, 30 Aug 2021 20:28:44 GMT
+      elapsed-time: '18'
+      etag: W/"0x8D96BF4C1552CA1"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: adbfe87d-d9f9-11eb-a8ce-a0481ca055a9
+      request-id: df3d436c-09d0-11ec-96be-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchaf391f34.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:56 GMT
-      elapsed-time: '92'
+      date: Mon, 30 Aug 2021 20:28:44 GMT
+      elapsed-time: '151'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ae64dcfe-d9f9-11eb-9aa7-a0481ca055a9
+      request-id: df5faeaf-09d0-11ec-b02b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -69,7 +69,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf391f34.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:19:59 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 20:28:47 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b05a0cb2-d9f9-11eb-be55-a0481ca055a9
+      request-id: e15b1963-09d0-11ec-99ef-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -98,7 +98,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf391f34.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -108,13 +108,13 @@ interactions:
       cache-control: no-cache
       content-length: '257'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:59 GMT
+      date: Mon, 30 Aug 2021 20:28:47 GMT
       elapsed-time: '15'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b0756443-d9f9-11eb-9567-a0481ca055a9
+      request-id: e173a9dd-09d0-11ec-9249-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -127,7 +127,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaf391f34.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:19:59 GMT
+      date: Mon, 30 Aug 2021 20:28:47 GMT
       elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b07e8c90-d9f9-11eb-acc0-a0481ca055a9
+      request-id: e17c2767-09d0-11ec-9855-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml
index e5ae2576d078..25f0537f606a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchb0ef1f4f.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0ef1f4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D9BDC45B7\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchb0ef1f4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4CAB9B311\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:20:15 GMT
-      elapsed-time: '32'
-      etag: W/"0x8D93C1D9BDC45B7"
+      date: Mon, 30 Aug 2021 20:29:00 GMT
+      elapsed-time: '19'
+      etag: W/"0x8D96BF4CAB9B311"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b9d124db-d9f9-11eb-a027-a0481ca055a9
+      request-id: e8a5dcff-09d0-11ec-80d1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -41,7 +41,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchb0ef1f4f.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -51,13 +51,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:20:14 GMT
-      elapsed-time: '181'
+      date: Mon, 30 Aug 2021 20:29:00 GMT
+      elapsed-time: '119'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b9ef33fe-d9f9-11eb-bc75-a0481ca055a9
+      request-id: e8c051d9-09d0-11ec-bad6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -70,7 +70,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchb0ef1f4f.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -80,13 +80,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:20:18 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:29:03 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: bbf038ce-d9f9-11eb-a251-a0481ca055a9
+      request-id: eac6005a-09d0-11ec-9a03-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml
index f4ca82c23790..5361981802e6 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search18931d2e.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search18931d2e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1DA725B2F3\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search18931d2e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4D40CF868\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:20:34 GMT
-      elapsed-time: '28'
-      etag: W/"0x8D93C1DA725B2F3"
+      date: Mon, 30 Aug 2021 20:29:15 GMT
+      elapsed-time: '27'
+      etag: W/"0x8D96BF4D40CF868"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c5231ea5-d9f9-11eb-b2b9-a0481ca055a9
+      request-id: f1fa10c2-09d0-11ec-824b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -41,7 +41,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search18931d2e.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -51,13 +51,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:20:34 GMT
-      elapsed-time: '150'
+      date: Mon, 30 Aug 2021 20:29:15 GMT
+      elapsed-time: '102'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c544b37c-d9f9-11eb-97b8-a0481ca055a9
+      request-id: f2188973-09d0-11ec-bedb-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -70,7 +70,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search18931d2e.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -80,13 +80,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:20:37 GMT
-      elapsed-time: '66'
+      date: Mon, 30 Aug 2021 20:29:19 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c7453ec1-d9f9-11eb-b90c-a0481ca055a9
+      request-id: f40b09f2-09d0-11ec-906f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -99,7 +99,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search18931d2e.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -109,13 +109,13 @@ interactions:
       cache-control: no-cache
       content-length: '267'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:20:37 GMT
+      date: Mon, 30 Aug 2021 20:29:19 GMT
       elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c76da62c-d9f9-11eb-9d0d-a0481ca055a9
+      request-id: f42da44a-09d0-11ec-8ce4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -128,7 +128,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search18931d2e.search.windows.net/indexes('drgqefsg')/docs('1001')?api-version=2021-04-30-Preview
   response:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '268'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:20:37 GMT
-      elapsed-time: '14'
+      date: Mon, 30 Aug 2021 20:29:19 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c77833f1-d9f9-11eb-832b-a0481ca055a9
+      request-id: f43639b1-09d0-11ec-b93a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml
index 95040b96ecc3..0e72dfcef568 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search94f31ef0.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:20:54 GMT
-      elapsed-time: '124'
+      date: Mon, 30 Aug 2021 20:29:32 GMT
+      elapsed-time: '112'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d0ec88b8-d9f9-11eb-914f-a0481ca055a9
+      request-id: fbb71f2d-09d0-11ec-94ef-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -39,7 +39,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search94f31ef0.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:20:57 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:29:35 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d2e6d261-d9f9-11eb-a668-a0481ca055a9
+      request-id: fdab6122-09d0-11ec-b9f0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -68,7 +68,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search94f31ef0.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -77,11 +77,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:20:57 GMT
-      elapsed-time: '3'
+      date: Mon, 30 Aug 2021 20:29:35 GMT
+      elapsed-time: '4'
       expires: '-1'
       pragma: no-cache
-      request-id: d2ee4eda-d9f9-11eb-870e-a0481ca055a9
+      request-id: fdb2e83e-09d0-11ec-9270-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -93,7 +93,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search94f31ef0.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -102,11 +102,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:20:57 GMT
+      date: Mon, 30 Aug 2021 20:29:35 GMT
       elapsed-time: '4'
       expires: '-1'
       pragma: no-cache
-      request-id: d2f50518-d9f9-11eb-8065-a0481ca055a9
+      request-id: fdb9d41d-09d0-11ec-a4b9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml
index f11d118e2172..e20618921f19 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search75f51e7f.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:21:12 GMT
-      elapsed-time: '113'
+      date: Mon, 30 Aug 2021 20:29:48 GMT
+      elapsed-time: '105'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: dbb15d79-d9f9-11eb-af39-a0481ca055a9
+      request-id: 057cd58e-09d1-11ec-b000-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -39,7 +39,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search75f51e7f.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:21:15 GMT
-      elapsed-time: '21'
+      date: Mon, 30 Aug 2021 20:29:51 GMT
+      elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ddaaea4c-d9f9-11eb-a8e2-a0481ca055a9
+      request-id: 0774d741-09d1-11ec-bc2f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -68,7 +68,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search75f51e7f.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -77,11 +77,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:21:15 GMT
-      elapsed-time: '11'
+      date: Mon, 30 Aug 2021 20:29:51 GMT
+      elapsed-time: '3'
       expires: '-1'
       pragma: no-cache
-      request-id: ddb7d779-d9f9-11eb-bbe1-a0481ca055a9
+      request-id: 077b8c28-09d1-11ec-9855-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -93,7 +93,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search75f51e7f.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -102,11 +102,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:21:15 GMT
-      elapsed-time: '3'
+      date: Mon, 30 Aug 2021 20:29:51 GMT
+      elapsed-time: '9'
       expires: '-1'
       pragma: no-cache
-      request-id: ddc0b6e9-d9f9-11eb-87f9-a0481ca055a9
+      request-id: 0781f577-09d1-11ec-9fb2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml
index 693e4e87c35a..aa13186ca3a8 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search76d91e8d.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:21:30 GMT
-      elapsed-time: '96'
+      date: Mon, 30 Aug 2021 20:30:05 GMT
+      elapsed-time: '21'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e6850abf-d9f9-11eb-b954-a0481ca055a9
+      request-id: 0fcb593c-09d1-11ec-9423-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -39,7 +39,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search76d91e8d.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:21:33 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:30:08 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e87be420-d9f9-11eb-a86a-a0481ca055a9
+      request-id: 11b576b9-09d1-11ec-aa3b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -68,7 +68,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search76d91e8d.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '438'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:21:33 GMT
-      elapsed-time: '15'
+      date: Mon, 30 Aug 2021 20:30:08 GMT
+      elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e8845861-d9f9-11eb-b378-a0481ca055a9
+      request-id: 11bc52c6-09d1-11ec-a093-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -98,7 +98,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search76d91e8d.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -109,13 +109,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:21:33 GMT
+      date: Mon, 30 Aug 2021 20:30:08 GMT
       elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e890d728-d9f9-11eb-b9dd-a0481ca055a9
+      request-id: 11c3f1d6-09d1-11ec-9218-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml
index f8dfdfbe1e41..68a3ee05ff59 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search583e1e1c.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -21,13 +21,13 @@ interactions:
       cache-control: no-cache
       content-length: '225'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:21:49 GMT
-      elapsed-time: '152'
+      date: Mon, 30 Aug 2021 20:30:21 GMT
+      elapsed-time: '26'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f1b73ed6-d9f9-11eb-81ef-a0481ca055a9
+      request-id: 195aab78-09d1-11ec-92e1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search583e1e1c.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:21:52 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:30:24 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f3b17b3d-d9f9-11eb-b91d-a0481ca055a9
+      request-id: 1b41e979-09d1-11ec-af87-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -69,7 +69,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search583e1e1c.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -78,11 +78,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Wed, 30 Jun 2021 23:21:52 GMT
+      date: Mon, 30 Aug 2021 20:30:24 GMT
       elapsed-time: '4'
       expires: '-1'
       pragma: no-cache
-      request-id: f3ba9043-d9f9-11eb-b712-a0481ca055a9
+      request-id: 1b49b761-09d1-11ec-9350-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -94,7 +94,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search583e1e1c.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -105,13 +105,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:21:52 GMT
-      elapsed-time: '10'
+      date: Mon, 30 Aug 2021 20:30:24 GMT
+      elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f3c304f2-d9f9-11eb-8301-a0481ca055a9
+      request-id: 1b50bb4a-09d1-11ec-a692-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml
index b1ab70e9ae0e..c0d43bfc5083 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search95271ee7.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:07 GMT
-      elapsed-time: '150'
+      date: Mon, 30 Aug 2021 20:30:41 GMT
+      elapsed-time: '43'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fc8108a9-d9f9-11eb-a1b8-a0481ca055a9
+      request-id: 25117279-09d1-11ec-a1c1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -39,7 +39,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search95271ee7.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:22:10 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:30:44 GMT
+      elapsed-time: '14'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fe7e12c8-d9f9-11eb-b1fc-a0481ca055a9
+      request-id: 270837ba-09d1-11ec-9d29-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -68,7 +68,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search95271ee7.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -78,13 +78,13 @@ interactions:
       cache-control: no-cache
       content-length: '257'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:10 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 20:30:44 GMT
+      elapsed-time: '21'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fe85c02e-d9f9-11eb-b1fa-a0481ca055a9
+      request-id: 27106eae-09d1-11ec-912c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -97,7 +97,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search95271ee7.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -108,13 +108,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:10 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 20:30:44 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fe8ed654-d9f9-11eb-aeca-a0481ca055a9
+      request-id: 271a1366-09d1-11ec-89f0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml
index 84f5579e987b..70bb4bd98cfa 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml
@@ -11,7 +11,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search96dd1f02.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -21,13 +21,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:23 GMT
-      elapsed-time: '112'
+      date: Mon, 30 Aug 2021 20:31:00 GMT
+      elapsed-time: '131'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 062a2a02-d9fa-11eb-9f2d-a0481ca055a9
+      request-id: 302226c4-09d1-11ec-a993-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml
index 29fce153072a..91eaf00da4af 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml
@@ -11,7 +11,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search21ce1.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -21,13 +21,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:37 GMT
-      elapsed-time: '95'
+      date: Mon, 30 Aug 2021 20:31:14 GMT
+      elapsed-time: '186'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0e892478-d9fa-11eb-89cd-a0481ca055a9
+      request-id: 389345d5-09d1-11ec-b127-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -40,7 +40,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search21ce1.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Wed, 30 Jun 2021 23:22:40 GMT
-      elapsed-time: '4'
+      date: Mon, 30 Aug 2021 20:31:17 GMT
+      elapsed-time: '12'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 107d54ef-d9fa-11eb-8933-a0481ca055a9
+      request-id: 3a9fc944-09d1-11ec-85f6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -69,7 +69,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search21ce1.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '267'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:40 GMT
-      elapsed-time: '11'
+      date: Mon, 30 Aug 2021 20:31:17 GMT
+      elapsed-time: '20'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 108501a5-d9fa-11eb-887e-a0481ca055a9
+      request-id: 3aa9db94-09d1-11ec-ba6e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -98,7 +98,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=none
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search21ce1.search.windows.net/indexes('drgqefsg')/docs('1001')?api-version=2021-04-30-Preview
   response:
@@ -108,13 +108,13 @@ interactions:
       cache-control: no-cache
       content-length: '268'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:40 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 20:31:17 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 108e4525-d9fa-11eb-9f61-a0481ca055a9
+      request-id: 3ab3ed0b-09d1-11ec-a5ac-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml
index 988efbbfbac8..4be2dbdb2756 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search62221634.search.windows.net/indexes('drgqefsg')/docs/search.post.autocomplete?api-version=2021-04-30-Preview
   response:
@@ -19,13 +19,13 @@ interactions:
       cache-control: no-cache
       content-length: '163'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:22:56 GMT
-      elapsed-time: '221'
+      date: Mon, 30 Aug 2021 20:31:30 GMT
+      elapsed-time: '192'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 19dced6f-d9fa-11eb-b842-a0481ca055a9
+      request-id: 425e600d-09d1-11ec-8135-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml
index 266d9e82affd..4df9a7fb1651 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd5601832.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -62,13 +62,13 @@ interactions:
       cache-control: no-cache
       content-length: '2378'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:23:13 GMT
-      elapsed-time: '138'
+      date: Mon, 30 Aug 2021 20:31:45 GMT
+      elapsed-time: '180'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 242f7000-d9fa-11eb-9c58-a0481ca055a9
+      request-id: 4acd7a6f-09d1-11ec-8ad2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -85,7 +85,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd5601832.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '2387'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:23:13 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 20:31:45 GMT
+      elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 24626141-d9fa-11eb-bfc5-a0481ca055a9
+      request-id: 4b03a7c1-09d1-11ec-9361-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml
index 2486d2bae010..011427ec7108 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search6a118e2.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -62,13 +62,13 @@ interactions:
       cache-control: no-cache
       content-length: '2378'
       content-type: application/json; odata.metadata=none
-      date: Thu, 01 Jul 2021 00:18:48 GMT
-      elapsed-time: '23'
+      date: Mon, 30 Aug 2021 20:31:58 GMT
+      elapsed-time: '22'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e813256f-da01-11eb-906b-a0481ca055a9
+      request-id: 531cb46c-09d1-11ec-b225-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -85,7 +85,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search6a118e2.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '2391'
       content-type: application/json; odata.metadata=none
-      date: Thu, 01 Jul 2021 00:18:48 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 20:31:58 GMT
+      elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e835b58e-da01-11eb-8101-a0481ca055a9
+      request-id: 53518606-09d1-11ec-a501-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml
index de8d783ab234..e30e25aa53e8 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search53351a1b.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -29,13 +29,13 @@ interactions:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:23:38 GMT
-      elapsed-time: '186'
+      date: Mon, 30 Aug 2021 20:32:12 GMT
+      elapsed-time: '18'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 327d1242-d9fa-11eb-b34b-a0481ca055a9
+      request-id: 5b3f137b-09d1-11ec-957d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml
index 7228fc46f18b..ec19bafbeb5e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search88e11b0a.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -29,13 +29,13 @@ interactions:
       cache-control: no-cache
       content-length: '646'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:23:53 GMT
-      elapsed-time: '350'
+      date: Mon, 30 Aug 2021 20:32:25 GMT
+      elapsed-time: '154'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3b616c3e-d9fa-11eb-8ed9-a0481ca055a9
+      request-id: 63481cae-09d1-11ec-a72a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml
index 1aa2b35d93ad..afc252355415 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd523181c.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -26,13 +26,13 @@ interactions:
       cache-control: no-cache
       content-length: '442'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:24:08 GMT
-      elapsed-time: '208'
+      date: Mon, 30 Aug 2021 20:32:39 GMT
+      elapsed-time: '94'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 44d59787-d9fa-11eb-a956-a0481ca055a9
+      request-id: 6b49803b-09d1-11ec-8837-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml
index 77fa6775e7ee..6131641f11c1 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml
@@ -10,7 +10,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search6e521a9a.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -26,13 +26,13 @@ interactions:
       cache-control: no-cache
       content-length: '442'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:24:24 GMT
-      elapsed-time: '309'
+      date: Mon, 30 Aug 2021 20:32:53 GMT
+      elapsed-time: '94'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4de0892a-d9fa-11eb-8a1c-a0481ca055a9
+      request-id: 7372be5b-09d1-11ec-a36c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml
index b96786345a3a..7c934ab4e7e0 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd56a1820.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -62,13 +62,13 @@ interactions:
       cache-control: no-cache
       content-length: '2378'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:24:38 GMT
-      elapsed-time: '104'
+      date: Mon, 30 Aug 2021 20:33:07 GMT
+      elapsed-time: '130'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5765416f-d9fa-11eb-8bc4-a0481ca055a9
+      request-id: 7c20428a-09d1-11ec-8d30-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -85,7 +85,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd56a1820.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -114,13 +114,13 @@ interactions:
       cache-control: no-cache
       content-length: '1269'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:24:39 GMT
-      elapsed-time: '9'
+      date: Mon, 30 Aug 2021 20:33:07 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5795de01-d9fa-11eb-9703-a0481ca055a9
+      request-id: 7c5123e1-09d1-11ec-9009-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml
index 91f4e96dcbfe..26587362c2a3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchc16d1bed.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -34,13 +34,13 @@ interactions:
       cache-control: no-cache
       content-length: '1174'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:24:54 GMT
-      elapsed-time: '99'
+      date: Mon, 30 Aug 2021 20:33:23 GMT
+      elapsed-time: '181'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6095d66f-d9fa-11eb-bf27-a0481ca055a9
+      request-id: 8574de1a-09d1-11ec-bf8c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -57,7 +57,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchc16d1bed.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -86,13 +86,13 @@ interactions:
       cache-control: no-cache
       content-length: '1269'
       content-type: application/json; odata.metadata=none
-      date: Wed, 30 Jun 2021 23:24:54 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 20:33:23 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 60c07fd6-d9fa-11eb-8e33-a0481ca055a9
+      request-id: 85b9110c-09d1-11ec-a987-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml
index 2d5819c66643..7d6a95413415 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf7671424.search.windows.net/indexes('drgqefsg')/docs/search.post.suggest?api-version=2021-04-30-Preview
   response:
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '216'
       content-type: application/json; odata.metadata=none
-      date: Thu, 01 Jul 2021 00:19:28 GMT
-      elapsed-time: '166'
+      date: Mon, 30 Aug 2021 20:33:37 GMT
+      elapsed-time: '137'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ff886bf5-da01-11eb-83b1-a0481ca055a9
+      request-id: 8e2017db-09d1-11ec-a442-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
index 139bcbbf7052..59acd531f736 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchb0841f28.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0841f28.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C25F60D572E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb0841f28.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF57A989E13\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:19:58 GMT
-      elapsed-time: '41'
-      etag: W/"0x8D93C25F60D572E"
+      date: Mon, 30 Aug 2021 20:33:51 GMT
+      elapsed-time: '29'
+      etag: W/"0x8D96BF57A989E13"
       expires: '-1'
       location: https://searchb0841f28.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 11ca8b0c-da02-11eb-aba6-a0481ca055a9
+      request-id: 96622fa7-09d1-11ec-9207-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
index 10312173a7ba..7e8aa4cade1f 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E59B278DD\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF582A7B647\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:29 GMT
-      elapsed-time: '154'
-      etag: W/"0x8D93C1E59B278DD"
+      date: Mon, 30 Aug 2021 20:34:04 GMT
+      elapsed-time: '41'
+      etag: W/"0x8D96BF582A7B647"
       expires: '-1'
       location: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 75589492-d9fa-11eb-b1d2-a0481ca055a9
+      request-id: 9e78ed6b-09d1-11ec-a239-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,23 +41,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1E59B278DD\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF582A7B647\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '380'
+      content-length: '381'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:29 GMT
-      elapsed-time: '56'
+      date: Mon, 30 Aug 2021 20:34:05 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 758dcb39-d9fa-11eb-9846-a0481ca055a9
+      request-id: 9e995b62-09d1-11ec-b276-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,24 +78,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E59D410C3\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF582BD8C2B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
-      content-length: '381'
+      content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:29 GMT
-      elapsed-time: '41'
-      etag: W/"0x8D93C1E59D410C3"
+      date: Mon, 30 Aug 2021 20:34:05 GMT
+      elapsed-time: '38'
+      etag: W/"0x8D96BF582BD8C2B"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 75a01088-d9fa-11eb-9c8c-a0481ca055a9
+      request-id: 9ea2dcda-09d1-11ec-93b6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -108,23 +108,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1E59D410C3\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF582BD8C2B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '386'
+      content-length: '387'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:29 GMT
-      elapsed-time: '19'
+      date: Mon, 30 Aug 2021 20:34:05 GMT
+      elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 75ae7cab-d9fa-11eb-952b-a0481ca055a9
+      request-id: 9eafba33-09d1-11ec-9f62-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -137,24 +137,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E59D410C3\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF582BD8C2B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
-      content-length: '381'
+      content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:29 GMT
-      elapsed-time: '10'
-      etag: W/"0x8D93C1E59D410C3"
+      date: Mon, 30 Aug 2021 20:34:05 GMT
+      elapsed-time: '7'
+      etag: W/"0x8D96BF582BD8C2B"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 75b98175-d9fa-11eb-bbeb-a0481ca055a9
+      request-id: 9ebb53e8-09d1-11ec-ae88-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
index 93618a6912c0..99547761cc66 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search802607.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E640114AE\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF58A87ED88\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '405'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:47 GMT
-      elapsed-time: '155'
-      etag: W/"0x8D93C1E640114AE"
+      date: Mon, 30 Aug 2021 20:34:18 GMT
+      elapsed-time: '33'
+      etag: W/"0x8D96BF58A87ED88"
       expires: '-1'
       location: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7fa748b9-d9fa-11eb-ae82-a0481ca055a9
+      request-id: a6446d65-09d1-11ec-a1f8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -49,24 +49,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E640ED2D4\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF58A93D69D\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
-      content-length: '380'
+      content-length: '381'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:47 GMT
-      elapsed-time: '39'
-      etag: W/"0x8D93C1E640ED2D4"
+      date: Mon, 30 Aug 2021 20:34:18 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96BF58A93D69D"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7fdacf6a-d9fa-11eb-9bc9-a0481ca055a9
+      request-id: a679522d-09d1-11ec-95d8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -76,7 +76,7 @@ interactions:
 - request:
     body: '{"name": "sample-datasource", "description": "changed", "type": "azureblob",
       "credentials": {"connectionString": "DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net"},
-      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D93C1E640114AE\""}'
+      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96BF58A87ED88\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -85,11 +85,11 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D93C1E640114AE"'
+      - '"0x8D96BF58A87ED88"'
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
@@ -102,13 +102,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:25:47 GMT
-      elapsed-time: '9'
+      date: Mon, 30 Aug 2021 20:34:18 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7fe807b2-d9fa-11eb-9dbe-a0481ca055a9
+      request-id: a68535e8-09d1-11ec-aef7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
index af856b8d43ea..5c8849c135e3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E6E627A39\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF59301C1E9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:04 GMT
-      elapsed-time: '39'
-      etag: W/"0x8D93C1E6E627A39"
+      date: Mon, 30 Aug 2021 20:34:32 GMT
+      elapsed-time: '45'
+      etag: W/"0x8D96BF59301C1E9"
       expires: '-1'
       location: https://searchb0601f27.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8a1a810d-d9fa-11eb-acd5-a0481ca055a9
+      request-id: aec40ded-09d1-11ec-a0bd-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,23 +41,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1E6E627A39\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF59301C1E9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
       content-length: '381'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:04 GMT
-      elapsed-time: '30'
+      date: Mon, 30 Aug 2021 20:34:32 GMT
+      elapsed-time: '12'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8a3cd24e-d9fa-11eb-b44f-a0481ca055a9
+      request-id: aef38c44-09d1-11ec-880f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -70,7 +70,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchb0601f27.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
@@ -78,11 +78,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Wed, 30 Jun 2021 23:26:04 GMT
-      elapsed-time: '53'
+      date: Mon, 30 Aug 2021 20:34:32 GMT
+      elapsed-time: '24'
       expires: '-1'
       pragma: no-cache
-      request-id: 8a492c7a-d9fa-11eb-94fe-a0481ca055a9
+      request-id: aefbbaa2-09d1-11ec-baa1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -94,7 +94,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
@@ -104,13 +104,13 @@ interactions:
       cache-control: no-cache
       content-length: '202'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:04 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 20:34:32 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8a585b4c-d9fa-11eb-b9cf-a0481ca055a9
+      request-id: af067898-09d1-11ec-b6b4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
index e9249e7403cd..0b215ae4b60b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search950921e4.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E7871E026\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF59ADD647F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:21 GMT
-      elapsed-time: '96'
-      etag: W/"0x8D93C1E7871E026"
+      date: Mon, 30 Aug 2021 20:34:45 GMT
+      elapsed-time: '39'
+      etag: W/"0x8D96BF59ADD647F"
       expires: '-1'
       location: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9420b538-d9fa-11eb-a35e-a0481ca055a9
+      request-id: b6afe41c-09d1-11ec-a75f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -49,24 +49,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E787FC55C\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF59AE8FF4F\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:21 GMT
-      elapsed-time: '30'
-      etag: W/"0x8D93C1E787FC55C"
+      date: Mon, 30 Aug 2021 20:34:45 GMT
+      elapsed-time: '33'
+      etag: W/"0x8D96BF59AE8FF4F"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 944c71b2-d9fa-11eb-b101-a0481ca055a9
+      request-id: b6cefca6-09d1-11ec-bdfe-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,9 +79,9 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D93C1E7871E026"'
+      - '"0x8D96BF59ADD647F"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
@@ -94,13 +94,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:21 GMT
+      date: Mon, 30 Aug 2021 20:34:45 GMT
       elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 945904f3-d9fa-11eb-8365-a0481ca055a9
+      request-id: b6da925e-09d1-11ec-bc74-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
index 1bddff5e7711..ef0f06582f75 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search54ec1df4.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E82425CB7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5A2FFE0FF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:38 GMT
-      elapsed-time: '31'
-      etag: W/"0x8D93C1E82425CB7"
+      date: Mon, 30 Aug 2021 20:34:59 GMT
+      elapsed-time: '34'
+      etag: W/"0x8D96BF5A2FFE0FF"
       expires: '-1'
       location: https://search54ec1df4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9df9d61e-d9fa-11eb-95da-a0481ca055a9
+      request-id: bed0d507-09d1-11ec-b06b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,24 +41,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search54ec1df4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E82425CB7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5A2FFE0FF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '375'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:38 GMT
-      elapsed-time: '6'
-      etag: W/"0x8D93C1E82425CB7"
+      date: Mon, 30 Aug 2021 20:34:59 GMT
+      elapsed-time: '9'
+      etag: W/"0x8D96BF5A2FFE0FF"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9e1bc745-d9fa-11eb-80e3-a0481ca055a9
+      request-id: bef1def9-09d1-11ec-847b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
index 16d925b57868..4aeb7cf3bc56 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E8C1DB0A2\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5AAE4FB33\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:54 GMT
-      elapsed-time: '146'
-      etag: W/"0x8D93C1E8C1DB0A2"
+      date: Mon, 30 Aug 2021 20:35:12 GMT
+      elapsed-time: '32'
+      etag: W/"0x8D96BF5AAE4FB33"
       expires: '-1'
       location: https://search74a71e70.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a7c58d22-d9fa-11eb-986f-a0481ca055a9
+      request-id: c6af06c7-09d1-11ec-8381-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -47,25 +47,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1E8C2BE40D\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5AAF15987\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '404'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:54 GMT
-      elapsed-time: '33'
-      etag: W/"0x8D93C1E8C2BE40D"
+      date: Mon, 30 Aug 2021 20:35:12 GMT
+      elapsed-time: '31'
+      etag: W/"0x8D96BF5AAF15987"
       expires: '-1'
       location: https://search74a71e70.search.windows.net/datasources('another-sample')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a7f8692a-d9fa-11eb-8b80-a0481ca055a9
+      request-id: c6d6e822-09d1-11ec-9293-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -77,23 +77,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1E8C2BE40D\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D93C1E8C1DB0A2\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF5AAF15987\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96BF5AAE4FB33\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '405'
+      content-length: '406'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:26:54 GMT
-      elapsed-time: '61'
+      date: Mon, 30 Aug 2021 20:35:12 GMT
+      elapsed-time: '18'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a805d4c3-d9fa-11eb-906d-a0481ca055a9
+      request-id: c6e2de9f-09d1-11ec-be4d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml
index 6cf84d3447e7..980b53a81859 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml
@@ -9,7 +9,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search4cbf15dc.search.windows.net/indexes('drgqefsg')/search.analyze?api-version=2021-04-30-Preview
   response:
@@ -19,13 +19,13 @@ interactions:
       cache-control: no-cache
       content-length: '305'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:27:12 GMT
-      elapsed-time: '731'
+      date: Mon, 30 Aug 2021 20:35:32 GMT
+      elapsed-time: '51'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b2231419-d9fa-11eb-8ccf-a0481ca055a9
+      request-id: d258d06d-09d1-11ec-bb82-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml
index 5aa4fd3d3c1c..d88f5b53222a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml
@@ -14,25 +14,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search4bde15af.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4bde15af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1EA29E5D82\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search4bde15af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5BEFDF777\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1020'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:27:31 GMT
-      elapsed-time: '1541'
-      etag: W/"0x8D93C1EA29E5D82"
+      date: Mon, 30 Aug 2021 20:35:46 GMT
+      elapsed-time: '963'
+      etag: W/"0x8D96BF5BEFDF777"
       expires: '-1'
       location: https://search4bde15af.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: bd76ed68-d9fa-11eb-a129-a0481ca055a9
+      request-id: da421b5d-09d1-11ec-a89c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml
index ea63b016131b..ace9bb45482f 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml
@@ -16,25 +16,25 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search3b9d19d1.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C260447E173\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5C74567EE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '946'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:20:22 GMT
-      elapsed-time: '522'
-      etag: W/"0x8D93C260447E173"
+      date: Mon, 30 Aug 2021 20:36:00 GMT
+      elapsed-time: '500'
+      etag: W/"0x8D96BF5C74567EE"
       expires: '-1'
       location: https://search3b9d19d1.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1fbb59e3-da02-11eb-a573-a0481ca055a9
+      request-id: e2d083aa-09d1-11ec-829a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -57,24 +57,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search3b9d19d1.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C26047B0BDB\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5C7822DF8\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '588'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:20:22 GMT
-      elapsed-time: '286'
-      etag: W/"0x8D93C26047B0BDB"
+      date: Mon, 30 Aug 2021 20:36:00 GMT
+      elapsed-time: '354'
+      etag: W/"0x8D96BF5C7822DF8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 2025e3ac-da02-11eb-92a8-a0481ca055a9
+      request-id: e337d5e5-09d1-11ec-9b04-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml
index 65b1ea5d2d7a..7676c033403b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml
@@ -12,25 +12,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchefa91fe3.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1EB2440009\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5CFB464E2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1014'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:27:57 GMT
-      elapsed-time: '1231'
-      etag: W/"0x8D93C1EB2440009"
+      date: Mon, 30 Aug 2021 20:36:14 GMT
+      elapsed-time: '514'
+      etag: W/"0x8D96BF5CFB464E2"
       expires: '-1'
       location: https://searchefa91fe3.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cd4c86ba-d9fa-11eb-bf6a-a0481ca055a9
+      request-id: eb3b2e4a-09d1-11ec-88b4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -51,24 +51,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchefa91fe3.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1EB26E4C0B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5CFEDCEF3\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '555'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:27:59 GMT
-      elapsed-time: '166'
-      etag: W/"0x8D93C1EB26E4C0B"
+      date: Mon, 30 Aug 2021 20:36:14 GMT
+      elapsed-time: '328'
+      etag: W/"0x8D96BF5CFEDCEF3"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ce2643c3-d9fa-11eb-ac7c-a0481ca055a9
+      request-id: eba6d2a7-09d1-11ec-9a79-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,7 +79,7 @@ interactions:
     body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
       "key": true, "retrievable": true, "searchable": false}, {"name": "baseRate",
       "type": "Edm.Double", "retrievable": true}], "scoringProfiles": [], "corsOptions":
-      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D93C1EB2440009\""}'
+      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D96BF5CFB464E2\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -88,11 +88,11 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D93C1EB2440009"'
+      - '"0x8D96BF5CFB464E2"'
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchefa91fe3.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
@@ -105,13 +105,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:27:59 GMT
-      elapsed-time: '40'
+      date: Mon, 30 Aug 2021 20:36:14 GMT
+      elapsed-time: '21'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ce48ea16-d9fa-11eb-b9ef-a0481ca055a9
+      request-id: ebe04eef-09d1-11ec-91e6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml
index fa8c25a7a7e9..c61dc536a619 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search785e1686.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
@@ -13,11 +13,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Wed, 30 Jun 2021 23:28:17 GMT
-      elapsed-time: '177'
+      date: Mon, 30 Aug 2021 20:36:38 GMT
+      elapsed-time: '171'
       expires: '-1'
       pragma: no-cache
-      request-id: d8cbd716-d9fa-11eb-be4b-a0481ca055a9
+      request-id: f9ca2595-09d1-11ec-bd2f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -29,7 +29,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search785e1686.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
@@ -39,13 +39,13 @@ interactions:
       cache-control: no-cache
       content-length: '200'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:28:22 GMT
-      elapsed-time: '50'
+      date: Mon, 30 Aug 2021 20:36:43 GMT
+      elapsed-time: '18'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: dbff3e43-d9fa-11eb-be56-a0481ca055a9
+      request-id: fd068d19-09d1-11ec-a4fa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml
index 644642f68434..1cd9b8f83f78 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml
@@ -12,25 +12,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchc1c41bc0.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1ECA18872C\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5E927D698\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1014'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:28:38 GMT
-      elapsed-time: '427'
-      etag: W/"0x8D93C1ECA18872C"
+      date: Mon, 30 Aug 2021 20:36:56 GMT
+      elapsed-time: '521'
+      etag: W/"0x8D96BF5E927D698"
       expires: '-1'
       location: https://searchc1c41bc0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e594e15a-d9fa-11eb-bb84-a0481ca055a9
+      request-id: 04af2f1a-09d2-11ec-bcc2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -51,24 +51,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchc1c41bc0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1ECA33B542\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5E96511DD\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '556'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:28:38 GMT
-      elapsed-time: '134'
-      etag: W/"0x8D93C1ECA33B542"
+      date: Mon, 30 Aug 2021 20:36:57 GMT
+      elapsed-time: '353'
+      etag: W/"0x8D96BF5E96511DD"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e5f20ada-d9fa-11eb-81c5-a0481ca055a9
+      request-id: 051a8f78-09d2-11ec-aab0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -81,9 +81,9 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D93C1ECA18872C"'
+      - '"0x8D96BF5E927D698"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchc1c41bc0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
@@ -96,13 +96,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:28:38 GMT
-      elapsed-time: '22'
+      date: Mon, 30 Aug 2021 20:36:57 GMT
+      elapsed-time: '23'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e60d0d2f-d9fa-11eb-866a-a0481ca055a9
+      request-id: 055856ad-09d2-11ec-ae09-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml
index 6afeb45c22ea..395ac62f910a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml
@@ -5,24 +5,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc3d147b.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc3d147b.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1ED1876E89\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc3d147b.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5EF238B97\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1181'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:28:55 GMT
-      elapsed-time: '793'
-      etag: W/"0x8D93C1ED1876E89"
+      date: Mon, 30 Aug 2021 20:37:10 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96BF5EF238B97"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ef86cd30-d9fa-11eb-81a2-a0481ca055a9
+      request-id: 0d1a23a4-09d2-11ec-8aa3-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml
index a3e6016a9bee..2572d151379e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search9691925.search.windows.net/indexes('drgqefsg')/search.stats?api-version=2021-04-30-Preview
   response:
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '263'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:29:13 GMT
-      elapsed-time: '875'
+      date: Mon, 30 Aug 2021 20:37:25 GMT
+      elapsed-time: '19'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f9ec3b98-d9fa-11eb-8ff2-a0481ca055a9
+      request-id: 15a1f9fe-09d2-11ec-aad8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml
index a29f66b6b1c1..a86c2681b750 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search3d4a19fe.search.windows.net/servicestats?api-version=2021-04-30-Preview
   response:
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '431'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:29:25 GMT
-      elapsed-time: '45'
+      date: Mon, 30 Aug 2021 20:37:35 GMT
+      elapsed-time: '40'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 01ab3c5b-d9fb-11eb-a664-a0481ca055a9
+      request-id: 1bf78703-09d2-11ec-8d8f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml
index c03bb9985cec..83380b611172 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml
@@ -5,23 +5,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search4ce615cf.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ce615cf.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D93C1EEE222447\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
+      string: '{"@odata.context":"https://search4ce615cf.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D96BF60644D7F6\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
     headers:
       cache-control: no-cache
-      content-length: '1169'
+      content-length: '1171'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:29:43 GMT
-      elapsed-time: '96'
+      date: Mon, 30 Aug 2021 20:37:49 GMT
+      elapsed-time: '81'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0c37e6b8-d9fb-11eb-90be-a0481ca055a9
+      request-id: 243498a1-09d2-11ec-b4ad-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml
index a0e71ca72a3c..49cf33040444 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml
@@ -5,7 +5,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchd858185d.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '200'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:29:55 GMT
-      elapsed-time: '61'
+      date: Mon, 30 Aug 2021 20:37:58 GMT
+      elapsed-time: '27'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 13551371-d9fb-11eb-b53b-a0481ca055a9
+      request-id: 291e5ee7-09d2-11ec-85b4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
index 09a46cc5e51d..afaa439e2595 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
@@ -14,25 +14,25 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C25327335F6\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAB9EB6622\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:14:29 GMT
-      elapsed-time: '60'
-      etag: W/"0x8D93C25327335F6"
+      date: Mon, 30 Aug 2021 21:11:25 GMT
+      elapsed-time: '41'
+      etag: W/"0x8D96BFAB9EB6622"
       expires: '-1'
       location: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4e2ffee7-da01-11eb-99c4-a0481ca055a9
+      request-id: d5baa84d-09d6-11ec-8ac9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -53,24 +53,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C2532842A14\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAB9F860D4\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '475'
+      content-length: '476'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:14:29 GMT
-      elapsed-time: '50'
-      etag: W/"0x8D93C2532842A14"
+      date: Mon, 30 Aug 2021 21:11:25 GMT
+      elapsed-time: '39'
+      etag: W/"0x8D96BFAB9F860D4"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4e52c941-da01-11eb-9421-a0481ca055a9
+      request-id: d5e50ffc-09d6-11ec-a830-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -83,23 +83,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search971e1eee.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C2532842A14\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAB9F860D4\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '532'
+      content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:14:30 GMT
-      elapsed-time: '18'
+      date: Mon, 30 Aug 2021 21:11:25 GMT
+      elapsed-time: '15'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4e642e4c-da01-11eb-9d00-a0481ca055a9
+      request-id: d5f180dd-09d6-11ec-b1df-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -112,24 +112,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C2532842A14\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAB9F860D4\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:14:30 GMT
-      elapsed-time: '12'
-      etag: W/"0x8D93C2532842A14"
+      date: Mon, 30 Aug 2021 21:11:25 GMT
+      elapsed-time: '14'
+      etag: W/"0x8D96BFAB9F860D4"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4e6df25e-da01-11eb-890d-a0481ca055a9
+      request-id: d5f9d4a9-09d6-11ec-ad7c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
deleted file mode 100644
index 2169b2774f7b..000000000000
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "test-ss", "description": "desc1", "skills": [{"@odata.type":
-      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
-      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
-      "organizations"}]}]}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '253'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C217BDE8A3F\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '609'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:47:55 GMT
-      elapsed-time: '1270'
-      etag: W/"0x8D93C217BDE8A3F"
-      expires: '-1'
-      location: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 96dde58c-d9fd-11eb-9aec-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "test-ss", "description": "desc2", "skills": [{"@odata.type":
-      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
-      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
-      "organizations"}]}]}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '253'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C217BF01ABA\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '475'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:47:55 GMT
-      elapsed-time: '54'
-      etag: W/"0x8D93C217BF01ABA"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 97bb8cd7-d9fd-11eb-8c89-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search4ddb2428.search.windows.net/skillsets?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C217BF01ABA\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '532'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:47:55 GMT
-      elapsed-time: '32'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 97cc40b1-d9fd-11eb-b88a-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search4ddb2428.search.windows.net/skillsets?api-version=2021-04-30-Preview
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
deleted file mode 100644
index 3e3e23525ca7..000000000000
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "test-ss", "description": "desc1", "skills": [{"@odata.type":
-      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
-      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
-      "organizations"}]}]}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '253'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C2186236374\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '609'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:12 GMT
-      elapsed-time: '1244'
-      etag: W/"0x8D93C2186236374"
-      expires: '-1'
-      location: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a126ba54-d9fd-11eb-8531-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "test-ss", "description": "desc2", "skills": [{"@odata.type":
-      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
-      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
-      "organizations"}]}]}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '253'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C218634095A\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '476'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:12 GMT
-      elapsed-time: '50'
-      etag: W/"0x8D93C218634095A"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a200237a-d9fd-11eb-beb5-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search9d362229.search.windows.net/skillsets?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C218634095A\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '533'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:12 GMT
-      elapsed-time: '43'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a21012d0-d9fd-11eb-aa87-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search9d362229.search.windows.net/skillsets?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C218634095A\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '531'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:12 GMT
-      elapsed-time: '13'
-      etag: W/"0x8D93C218634095A"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a21f60d7-d9fd-11eb-9775-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
index 07e471bb5bb8..d517effc26ed 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
@@ -2,66 +2,39 @@ interactions:
 - request:
     body: '{"name": "test-ss", "description": "desc", "skills": [{"@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill",
       "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
-      "organizations", "targetName": "organizations"}]}]}'
+      "organizations", "targetName": "organizationsV1"}]}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityRecognitionSkill",
+      "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
+      "organizations", "targetName": "organizationsV3"}]}]}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '252'
+      - '457'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C21913A6629\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAC98F6DA8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '608'
+      content-length: '967'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:31 GMT
-      elapsed-time: '1670'
-      etag: W/"0x8D93C21913A6629"
+      date: Mon, 30 Aug 2021 21:11:51 GMT
+      elapsed-time: '42'
+      etag: W/"0x8D96BFAC98F6DA8"
       expires: '-1'
       location: https://search75151acc.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: abfa914e-d9fd-11eb-98d2-a0481ca055a9
+      request-id: e569dc27-09d6-11ec-9f98-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
       message: Created
     url: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C21913A6629\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '532'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:31 GMT
-      elapsed-time: '86'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: ad15c706-d9fd-11eb-adcc-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
index b6aa207945e5..04410b066cdf 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C219AC6E63A\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAD184DE5E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:47 GMT
-      elapsed-time: '47'
-      etag: W/"0x8D93C219AC6E63A"
+      date: Mon, 30 Aug 2021 21:12:05 GMT
+      elapsed-time: '72'
+      etag: W/"0x8D96BFAD184DE5E"
       expires: '-1'
       location: https://search74f91acb.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b6813fc0-d9fd-11eb-a4a2-a0481ca055a9
+      request-id: ed5a4b8f-09d6-11ec-9720-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,23 +41,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C219AC6E63A\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAD184DE5E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '532'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:47 GMT
-      elapsed-time: '19'
+      date: Mon, 30 Aug 2021 21:12:05 GMT
+      elapsed-time: '21'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b6a27aea-d9fd-11eb-8810-a0481ca055a9
+      request-id: ed7ea889-09d6-11ec-840e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -70,7 +70,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search74f91acb.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
@@ -78,11 +78,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Wed, 30 Jun 2021 23:48:47 GMT
-      elapsed-time: '33'
+      date: Mon, 30 Aug 2021 21:12:05 GMT
+      elapsed-time: '25'
       expires: '-1'
       pragma: no-cache
-      request-id: b6ac90b5-d9fd-11eb-a4c4-a0481ca055a9
+      request-id: ed88b3f4-09d6-11ec-995f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -94,7 +94,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
@@ -104,13 +104,13 @@ interactions:
       cache-control: no-cache
       content-length: '201'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:48:53 GMT
-      elapsed-time: '7'
+      date: Mon, 30 Aug 2021 21:12:10 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b9b53c3b-d9fd-11eb-8f17-a0481ca055a9
+      request-id: f08e1514-09d6-11ec-8403-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
index 83a3ce23351f..600ca2028768 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf5e02005.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C21A84853D9\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFADCC8409E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:49:10 GMT
-      elapsed-time: '56'
-      etag: W/"0x8D93C21A84853D9"
+      date: Mon, 30 Aug 2021 21:12:23 GMT
+      elapsed-time: '38'
+      etag: W/"0x8D96BFADCC8409E"
       expires: '-1'
       location: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c3fd5256-d9fd-11eb-b291-a0481ca055a9
+      request-id: f8a3779b-09d6-11ec-85b9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,24 +50,24 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C21A857E806\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFADCD5B091\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '478'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:49:10 GMT
-      elapsed-time: '48'
-      etag: W/"0x8D93C21A857E806"
+      date: Mon, 30 Aug 2021 21:12:23 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96BFADCD5B091"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c423fd1b-d9fd-11eb-9b18-a0481ca055a9
+      request-id: f8c22ab9-09d6-11ec-bcd1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -80,9 +80,9 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D93C21A84853D9"'
+      - '"0x8D96BFADCC8409E"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
@@ -95,13 +95,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:49:10 GMT
-      elapsed-time: '11'
+      date: Mon, 30 Aug 2021 21:12:23 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c4339657-d9fd-11eb-87c6-a0481ca055a9
+      request-id: f8cf5623-09d6-11ec-b51d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
index 0be91493a880..2a1f0434d25e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
@@ -11,25 +11,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C21B21EE732\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAE51FB90D\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:49:26 GMT
-      elapsed-time: '43'
-      etag: W/"0x8D93C21B21EE732"
+      date: Mon, 30 Aug 2021 21:12:37 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96BFAE51FB90D"
       expires: '-1'
       location: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cdd5e130-d9fd-11eb-9547-a0481ca055a9
+      request-id: 00f9ce8e-09d7-11ec-855e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,23 +41,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C21B21EE732\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAE51FB90D\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '532'
+      content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:49:26 GMT
-      elapsed-time: '18'
+      date: Mon, 30 Aug 2021 21:12:37 GMT
+      elapsed-time: '16'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cdfaf5b3-d9fd-11eb-8bf4-a0481ca055a9
+      request-id: 0119faea-09d7-11ec-be47-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -70,24 +70,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C21B21EE732\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAE51FB90D\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:49:26 GMT
-      elapsed-time: '15'
-      etag: W/"0x8D93C21B21EE732"
+      date: Mon, 30 Aug 2021 21:12:37 GMT
+      elapsed-time: '11'
+      etag: W/"0x8D96BFAE51FB90D"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ce0645a6-d9fd-11eb-aea3-a0481ca055a9
+      request-id: 01232a93-09d7-11ec-ae8b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
index 454eccaa7754..0aa22d89f66f 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
@@ -12,25 +12,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C26DF813BF6\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAEDCCB208\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:26:30 GMT
-      elapsed-time: '1493'
-      etag: W/"0x8D93C26DF813BF6"
+      date: Mon, 30 Aug 2021 21:12:52 GMT
+      elapsed-time: '41'
+      etag: W/"0x8D96BFAEDCCB208"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fa5e45b1-da02-11eb-9207-a0481ca055a9
+      request-id: 0993c682-09d7-11ec-b1d4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -49,25 +49,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C26DF9193A0\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAEDDFC850\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:26:30 GMT
-      elapsed-time: '47'
-      etag: W/"0x8D93C26DF9193A0"
+      date: Mon, 30 Aug 2021 21:12:52 GMT
+      elapsed-time: '81'
+      etag: W/"0x8D96BFAEDDFC850"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fb5fbb67-da02-11eb-a0bc-a0481ca055a9
+      request-id: 09c63636-09d7-11ec-8771-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -79,23 +79,23 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C26DF813BF6\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D93C26DF9193A0\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAEDCCB208\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96BFAEDDFC850\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '565'
+      content-length: '564'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:26:30 GMT
-      elapsed-time: '45'
+      date: Mon, 30 Aug 2021 21:12:52 GMT
+      elapsed-time: '18'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fb6f6640-da02-11eb-b189-a0481ca055a9
+      request-id: 09d9b91a-09d7-11ec-bf0d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
index 004742a09718..87d583183449 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
@@ -10,26 +10,26 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F56FF3448\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF65648856E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:32:35 GMT
-      elapsed-time: '84'
-      etag: W/"0x8D93C1F56FF3448"
+      date: Mon, 30 Aug 2021 20:40:00 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96BF65648856E"
       expires: '-1'
       location: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72b21298-d9fb-11eb-93e3-a0481ca055a9
+      request-id: 721586a0-09d2-11ec-902b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,24 +41,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1F56FF3448\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF65648856E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '336'
+      content-length: '337'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:32:35 GMT
-      elapsed-time: '52'
+      date: Mon, 30 Aug 2021 20:40:00 GMT
+      elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72db6219-d9fb-11eb-a8a6-a0481ca055a9
+      request-id: 7239cdef-09d2-11ec-8f33-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,25 +78,25 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F571D48E8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF6565A14D8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '302'
+      content-length: '303'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:32:35 GMT
-      elapsed-time: '22'
-      etag: W/"0x8D93C1F571D48E8"
+      date: Mon, 30 Aug 2021 20:40:00 GMT
+      elapsed-time: '16'
+      etag: W/"0x8D96BF6565A14D8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72eaf1f1-d9fb-11eb-bcbd-a0481ca055a9
+      request-id: 72419417-09d2-11ec-ab7c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -109,24 +109,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1F571D48E8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF6565A14D8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '307'
+      content-length: '308'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:32:35 GMT
-      elapsed-time: '11'
+      date: Mon, 30 Aug 2021 20:40:00 GMT
+      elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72f5fa3c-d9fb-11eb-94a9-a0481ca055a9
+      request-id: 724b2e7e-09d2-11ec-9ed8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -139,25 +139,25 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F571D48E8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF6565A14D8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '302'
+      content-length: '303'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:32:35 GMT
-      elapsed-time: '7'
-      etag: W/"0x8D93C1F571D48E8"
+      date: Mon, 30 Aug 2021 20:40:00 GMT
+      elapsed-time: '5'
+      etag: W/"0x8D96BF6565A14D8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72ff4fcd-d9fb-11eb-b2ee-a0481ca055a9
+      request-id: 72531bab-09d2-11ec-b6d4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
index ec9f0fce97ea..fe7a24995d00 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
@@ -10,26 +10,26 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search23141d6a.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C2506DD1090\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF65E6C61D9\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:13:17 GMT
-      elapsed-time: '32'
-      etag: W/"0x8D93C2506DD1090"
+      date: Mon, 30 Aug 2021 20:40:13 GMT
+      elapsed-time: '29'
+      etag: W/"0x8D96BF65E6C61D9"
       expires: '-1'
       location: https://search23141d6a.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 2297c1db-da01-11eb-9fc2-a0481ca055a9
+      request-id: 7a410bad-09d2-11ec-8251-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -41,24 +41,24 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search23141d6a.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C2506DD1090\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF65E6C61D9\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '336'
+      content-length: '337'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:13:17 GMT
-      elapsed-time: '11'
+      date: Mon, 30 Aug 2021 20:40:13 GMT
+      elapsed-time: '15'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 22b8a7a6-da01-11eb-bb4a-a0481ca055a9
+      request-id: 7a5e41fd-09d2-11ec-a800-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
deleted file mode 100644
index 6f14cf8f0951..000000000000
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
-      United States of America\nWashington, Wash. => WA"}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '127'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C24E10BC195\"","name":"test-syn-map","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '272'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:12:14 GMT
-      elapsed-time: '96'
-      etag: W/"0x8D93C24E10BC195"
-      expires: '-1'
-      location: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: fcba61e6-da00-11eb-8ad3-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C24E10BC195\"","name":"test-syn-map","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '336'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:12:14 GMT
-      elapsed-time: '24'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: fce79aff-da00-11eb-a636-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: DELETE
-    uri: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control: no-cache
-      date: Thu, 01 Jul 2021 00:12:14 GMT
-      elapsed-time: '17'
-      expires: '-1'
-      pragma: no-cache
-      request-id: fcf3702a-da00-11eb-8a98-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 204
-      message: No Content
-    url: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps","value":[]}'
-    headers:
-      cache-control: no-cache
-      content-length: '204'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:12:14 GMT
-      elapsed-time: '21'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: fcfdcb8f-da00-11eb-a905-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
deleted file mode 100644
index a8aa0745d8a1..000000000000
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
-      United States of America\nWashington, Wash. => WA"}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '127'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searchc5e222a3.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F6E16A35F\"","name":"test-syn-map","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '272'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:33:14 GMT
-      elapsed-time: '342'
-      etag: W/"0x8D93C1F6E16A35F"
-      expires: '-1'
-      location: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 898a2e30-d9fb-11eb-9ca2-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://searchc5e222a3.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
-      \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA"}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '125'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F6E69E0C1\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
-        \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA","encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '334'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:33:14 GMT
-      elapsed-time: '267'
-      etag: W/"0x8D93C1F6E69E0C1"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 8a11f1c3-d9fb-11eb-9ff7-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      If-Match:
-      - '"0x8D93C1F6E16A35F"'
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: DELETE
-    uri: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"The precondition given in one of the
-        request headers evaluated to false. No change was made to the resource from
-        this request."}}'
-    headers:
-      cache-control: no-cache
-      content-language: en
-      content-length: '160'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:33:14 GMT
-      elapsed-time: '172'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 8a5f7720-d9fb-11eb-bc49-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 412
-      message: Precondition Failed
-    url: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
deleted file mode 100644
index 71e12ad22c7e..000000000000
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
-      United States of America\nWashington, Wash. => WA"}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '127'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F85D9DD25\"","name":"test-syn-map","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '272'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:33:52 GMT
-      elapsed-time: '53'
-      etag: W/"0x8D93C1F85D9DD25"
-      expires: '-1'
-      location: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a158688f-d9fb-11eb-8fab-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1F85D9DD25\"","name":"test-syn-map","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '276'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:33:53 GMT
-      elapsed-time: '113'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a1baca3f-d9fb-11eb-91d0-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 200
-      message: OK
-    url: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F85D9DD25\"","name":"test-syn-map","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '272'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:33:53 GMT
-      elapsed-time: '11'
-      etag: W/"0x8D93C1F85D9DD25"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: a1e1e358-d9fb-11eb-adef-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 200
-      message: OK
-    url: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
index 6617de33583c..ca0b866e1452 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
@@ -10,26 +10,26 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F906C74AE\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF72682570D\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '274'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:34:11 GMT
-      elapsed-time: '27'
-      etag: W/"0x8D93C1F906C74AE"
+      date: Mon, 30 Aug 2021 20:45:49 GMT
+      elapsed-time: '54'
+      etag: W/"0x8D96BF72682570D"
       expires: '-1'
       location: https://searche98a1ca9.search.windows.net/synonymmaps('test-syn-map-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: abeea55d-d9fb-11eb-89aa-a0481ca055a9
+      request-id: 42540565-09d3-11ec-9c63-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,26 +46,26 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1F90BF3CC6\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF7268CB93F\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '228'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:34:11 GMT
-      elapsed-time: '483'
-      etag: W/"0x8D93C1F90BF3CC6"
+      date: Mon, 30 Aug 2021 20:45:49 GMT
+      elapsed-time: '29'
+      etag: W/"0x8D96BF7268CB93F"
       expires: '-1'
       location: https://searche98a1ca9.search.windows.net/synonymmaps('test-syn-map-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ac463c89-d9fb-11eb-9152-a0481ca055a9
+      request-id: 4274977b-09d3-11ec-b0f9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -77,26 +77,27 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1F906C74AE\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null},{"@odata.etag":"\"0x8D93C1F90BF3CC6\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF72682570D\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null},{"@odata.etag":"\"0x8D96BF7268CB93F\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '416'
+      content-length: '358'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:34:11 GMT
-      elapsed-time: '204'
+      date: Mon, 30 Aug 2021 20:45:49 GMT
+      elapsed-time: '34'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ac984060-d9fb-11eb-a9ea-a0481ca055a9
+      request-id: 427f6cc4-09d3-11ec-849a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
     status:
       code: 200
       message: OK
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
index c35d0103db50..2e1bae146374 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha7b8175d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C24C959CC61\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF72F0B978D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:34 GMT
-      elapsed-time: '33'
-      etag: W/"0x8D93C24C959CC61"
+      date: Mon, 30 Aug 2021 20:46:03 GMT
+      elapsed-time: '37'
+      etag: W/"0x8D96BF72F0B978D"
       expires: '-1'
       location: https://searcha7b8175d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e512e287-da00-11eb-9386-a0481ca055a9
+      request-id: 4ade53cb-09d3-11ec-880d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha7b8175d.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C24C9BE24FB\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF72FA5D107\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:34 GMT
-      elapsed-time: '466'
-      etag: W/"0x8D93C24C9BE24FB"
+      date: Mon, 30 Aug 2021 20:46:04 GMT
+      elapsed-time: '833'
+      etag: W/"0x8D96BF72FA5D107"
       expires: '-1'
       location: https://searcha7b8175d.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e536b9c6-da00-11eb-8f4b-a0481ca055a9
+      request-id: 4affd856-09d3-11ec-a977-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,28 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha7b8175d.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C24CAD09B37\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:37 GMT
-      elapsed-time: '1718'
-      etag: W/"0x8D93C24CAD09B37"
+      date: Mon, 30 Aug 2021 20:46:05 GMT
+      elapsed-time: '824'
       expires: '-1'
-      location: https://searcha7b8175d.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e59b7e88-da00-11eb-85f2-a0481ca055a9
+      request-id: 4b9abb3f-09d3-11ec-9496-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
     url: https://searcha7b8175d.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
index c8f6e881a69c..6e6045952d69 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha8211b7f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C24AF49CB56\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7389A42E6\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:10:50 GMT
-      elapsed-time: '34'
-      etag: W/"0x8D93C24AF49CB56"
+      date: Mon, 30 Aug 2021 20:46:20 GMT
+      elapsed-time: '31'
+      etag: W/"0x8D96BF7389A42E6"
       expires: '-1'
       location: https://searcha8211b7f.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cb046190-da00-11eb-be55-a0481ca055a9
+      request-id: 546e7dfc-09d3-11ec-986a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha8211b7f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C24AFCC3A87\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF7396FBB94\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:10:51 GMT
-      elapsed-time: '664'
-      etag: W/"0x8D93C24AFCC3A87"
+      date: Mon, 30 Aug 2021 20:46:21 GMT
+      elapsed-time: '1240'
+      etag: W/"0x8D96BF7396FBB94"
       expires: '-1'
       location: https://searcha8211b7f.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cb271d2a-da00-11eb-9619-a0481ca055a9
+      request-id: 548e0bdd-09d3-11ec-b806-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,153 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C24BA8AF4C2\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:09 GMT
-      elapsed-time: '17973'
-      etag: W/"0x8D93C24BA8AF4C2"
+      date: Mon, 30 Aug 2021 20:46:22 GMT
+      elapsed-time: '961'
       expires: '-1'
-      location: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cba97c01-da00-11eb-83cf-a0481ca055a9
+      request-id: 5569ab2f-09d3-11ec-b11b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
     url: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C24BA8AF4C2\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '378'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:09 GMT
-      elapsed-time: '19'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: d6801d08-da00-11eb-9ea7-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '139'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C24BAEF7462\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '378'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:09 GMT
-      elapsed-time: '387'
-      etag: W/"0x8D93C24BAEF7462"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: d68b3975-da00-11eb-8b10-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C24BAEF7462\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '382'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:09 GMT
-      elapsed-time: '13'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: d6cea411-da00-11eb-8518-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C24BAEF7462\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '378'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:11:10 GMT
-      elapsed-time: '11'
-      etag: W/"0x8D93C24BAEF7462"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: d6d872f3-da00-11eb-a079-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
index b3d5f738cae9..621343c2a8b2 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search323b20b9.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1FB0313D9D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7426E1A70\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:04 GMT
-      elapsed-time: '152'
-      etag: W/"0x8D93C1FB0313D9D"
+      date: Mon, 30 Aug 2021 20:46:36 GMT
+      elapsed-time: '33'
+      etag: W/"0x8D96BF7426E1A70"
       expires: '-1'
       location: https://search323b20b9.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cbd9902e-d9fb-11eb-b613-a0481ca055a9
+      request-id: 5e390168-09d3-11ec-bb3b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search323b20b9.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1FB2958D5D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF742D79DEE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:08 GMT
-      elapsed-time: '3854'
-      etag: W/"0x8D93C1FB2958D5D"
+      date: Mon, 30 Aug 2021 20:46:36 GMT
+      elapsed-time: '532'
+      etag: W/"0x8D96BF742D79DEE"
       expires: '-1'
       location: https://search323b20b9.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cc0cdde8-d9fb-11eb-afde-a0481ca055a9
+      request-id: 5e624245-09d3-11ec-a263-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,106 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search323b20b9.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1FBD415BDA\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '383'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:26 GMT
-      elapsed-time: '17747'
-      etag: W/"0x8D93C1FBD415BDA"
-      expires: '-1'
-      location: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: ce75e590-d9fb-11eb-b41b-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://search323b20b9.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '139'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1FBD9731F9\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '379'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:26 GMT
-      elapsed-time: '367'
-      etag: W/"0x8D93C1FBD9731F9"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: d933402d-d9fb-11eb-92e1-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false, "@odata.etag":
-      "\"0x8D93C1FBD415BDA\""}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '179'
-      Content-Type:
-      - application/json
-      If-Match:
-      - '"0x8D93C1FBD415BDA"'
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"The precondition given in one of the
-        request headers evaluated to false. No change was made to the resource from
-        this request."}}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
       content-language: en
-      content-length: '160'
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:26 GMT
-      elapsed-time: '9'
+      date: Mon, 30 Aug 2021 20:46:37 GMT
+      elapsed-time: '502'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d9737db8-d9fb-11eb-9d67-a0481ca055a9
+      request-id: 5ecb6fb1-09d3-11ec-a185-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 412
-      message: Precondition Failed
-    url: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      code: 400
+      message: Bad Request
+    url: https://search323b20b9.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
index e1e28118d181..9dec982ac99a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha79d175c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1FC8C28897\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF74B548027\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:45 GMT
-      elapsed-time: '132'
-      etag: W/"0x8D93C1FC8C28897"
+      date: Mon, 30 Aug 2021 20:46:51 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96BF74B548027"
       expires: '-1'
       location: https://searcha79d175c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e46dc162-d9fb-11eb-b80b-a0481ca055a9
+      request-id: 671a4eb8-09d3-11ec-b792-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha79d175c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1FCA4D0BE2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF74BB9E448\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:48 GMT
-      elapsed-time: '2442'
-      etag: W/"0x8D93C1FCA4D0BE2"
+      date: Mon, 30 Aug 2021 20:46:51 GMT
+      elapsed-time: '513'
+      etag: W/"0x8D96BF74BB9E448"
       expires: '-1'
       location: https://searcha79d175c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e49df071-d9fb-11eb-9b46-a0481ca055a9
+      request-id: 67483ad2-09d3-11ec-9516-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,110 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1FCA9C77ED\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:48 GMT
-      elapsed-time: '430'
-      etag: W/"0x8D93C1FCA9C77ED"
+      date: Mon, 30 Aug 2021 20:46:52 GMT
+      elapsed-time: '494'
       expires: '-1'
-      location: https://searcha79d175c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e62cb101-d9fb-11eb-b3e7-a0481ca055a9
+      request-id: 67adf2b8-09d3-11ec-be4e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
-    url: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1FCA9C77ED\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '379'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:48 GMT
-      elapsed-time: '20'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: e68af489-d9fb-11eb-b583-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: DELETE
-    uri: https://searcha79d175c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control: no-cache
-      date: Wed, 30 Jun 2021 23:35:48 GMT
-      elapsed-time: '43'
-      expires: '-1'
-      pragma: no-cache
-      request-id: e694df45-d9fb-11eb-b7e6-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 204
-      message: No Content
-    url: https://searcha79d175c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexers","value":[]}'
-    headers:
-      cache-control: no-cache
-      content-length: '200'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:35:49 GMT
-      elapsed-time: '44'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: e6a2562a-d9fb-11eb-af89-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
     url: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
index dfc653fb4baa..3a0275a16786 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchfbe11c96.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1FD626F603\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF753B37C48\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:08 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D93C1FD626F603"
+      date: Mon, 30 Aug 2021 20:47:05 GMT
+      elapsed-time: '33'
+      etag: W/"0x8D96BF753B37C48"
       expires: '-1'
       location: https://searchfbe11c96.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f1def389-d9fb-11eb-af9e-a0481ca055a9
+      request-id: 6f861f5f-09d3-11ec-beca-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchfbe11c96.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1FD7341435\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF75459299B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:10 GMT
-      elapsed-time: '1577'
-      etag: W/"0x8D93C1FD7341435"
+      date: Mon, 30 Aug 2021 20:47:05 GMT
+      elapsed-time: '935'
+      etag: W/"0x8D96BF75459299B"
       expires: '-1'
       location: https://searchfbe11c96.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f2024141-d9fb-11eb-bfe7-a0481ca055a9
+      request-id: 6fa79300-09d3-11ec-9844-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,98 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchfbe11c96.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1FD86C1D53\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '383'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:12 GMT
-      elapsed-time: '2013'
-      etag: W/"0x8D93C1FD86C1D53"
-      expires: '-1'
-      location: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: f30f20f6-d9fb-11eb-885c-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://searchfbe11c96.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '139'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1FD8E737C2\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '378'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:13 GMT
-      elapsed-time: '608'
-      etag: W/"0x8D93C1FD8E737C2"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: f45e3b84-d9fb-11eb-9a0c-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      If-Match:
-      - '"0x8D93C1FD86C1D53"'
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: DELETE
-    uri: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"The precondition given in one of the
-        request headers evaluated to false. No change was made to the resource from
-        this request."}}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
       content-language: en
-      content-length: '160'
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:13 GMT
-      elapsed-time: '10'
+      date: Mon, 30 Aug 2021 20:47:07 GMT
+      elapsed-time: '735'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f4c3d73c-d9fb-11eb-a67a-a0481ca055a9
+      request-id: 704d5e5e-09d3-11ec-b38d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 412
-      message: Precondition Failed
-    url: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      code: 400
+      message: Bad Request
+    url: https://searchfbe11c96.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
index d8acad890deb..6dab4ce50d89 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search632a1629.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C2464CDF3E1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF75D3664D1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:08:45 GMT
-      elapsed-time: '37'
-      etag: W/"0x8D93C2464CDF3E1"
+      date: Mon, 30 Aug 2021 20:47:21 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96BF75D3664D1"
       expires: '-1'
       location: https://search632a1629.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 808a875f-da00-11eb-8ee0-a0481ca055a9
+      request-id: 78fbf854-09d3-11ec-ab2f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search632a1629.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C24655CC224\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF75DA6C753\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:08:46 GMT
-      elapsed-time: '766'
-      etag: W/"0x8D93C24655CC224"
+      date: Mon, 30 Aug 2021 20:47:22 GMT
+      elapsed-time: '563'
+      etag: W/"0x8D96BF75DA6C753"
       expires: '-1'
       location: https://search632a1629.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 80aa4be4-da00-11eb-9c5d-a0481ca055a9
+      request-id: 792acea1-09d3-11ec-9de4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,58 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search632a1629.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C246F877CCA\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:09:03 GMT
-      elapsed-time: '17060'
-      etag: W/"0x8D93C246F877CCA"
+      date: Mon, 30 Aug 2021 20:47:22 GMT
+      elapsed-time: '590'
       expires: '-1'
-      location: https://search632a1629.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8139474c-da00-11eb-a66f-a0481ca055a9
+      request-id: 799c08b0-09d3-11ec-9223-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
     url: https://search632a1629.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search632a1629.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C246F877CCA\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '375'
-      content-type: application/json; odata.metadata=minimal
-      date: Thu, 01 Jul 2021 00:09:03 GMT
-      elapsed-time: '17'
-      etag: W/"0x8D93C246F877CCA"
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 8b7eb478-da00-11eb-80fc-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search632a1629.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
index ea5291f4e87d..55773ad8c1a7 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha24192c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1FE8A7C52F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7662D93A6\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '406'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:39 GMT
-      elapsed-time: '142'
-      etag: W/"0x8D93C1FE8A7C52F"
+      date: Mon, 30 Aug 2021 20:47:36 GMT
+      elapsed-time: '34'
+      etag: W/"0x8D96BF7662D93A6"
       expires: '-1'
       location: https://searcha24192c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 04517df8-d9fc-11eb-8631-a0481ca055a9
+      request-id: 82022333-09d3-11ec-aa71-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha24192c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1FE9A7E765\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF766DD2D8E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '663'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:36:41 GMT
-      elapsed-time: '1544'
-      etag: W/"0x8D93C1FE9A7E765"
+      date: Mon, 30 Aug 2021 20:47:37 GMT
+      elapsed-time: '982'
+      etag: W/"0x8D96BF766DD2D8E"
       expires: '-1'
       location: https://searcha24192c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0483faf2-d9fc-11eb-a3b4-a0481ca055a9
+      request-id: 82222da2-09d3-11ec-9fa6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,57 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha24192c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1FF4BE7400\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '382'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:00 GMT
-      elapsed-time: '18616'
-      etag: W/"0x8D93C1FF4BE7400"
+      date: Mon, 30 Aug 2021 20:47:38 GMT
+      elapsed-time: '542'
       expires: '-1'
-      location: https://searcha24192c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 058c18f6-d9fc-11eb-bdee-a0481ca055a9
+      request-id: 82d2a17c-09d3-11ec-97e8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
     url: https://searcha24192c.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searcha24192c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
-    headers:
-      cache-control: no-cache
-      content-length: '439'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:00 GMT
-      elapsed-time: '35'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 10c055aa-d9fc-11eb-a57b-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://searcha24192c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
index 4c987f7727d2..67f4c9628217 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search7a7716a5.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1FFF58110A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF76ECC0B05\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:17 GMT
-      elapsed-time: '161'
-      etag: W/"0x8D93C1FFF58110A"
+      date: Mon, 30 Aug 2021 20:47:50 GMT
+      elapsed-time: '45'
+      etag: W/"0x8D96BF76ECC0B05"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1afe8dd2-d9fc-11eb-8653-a0481ca055a9
+      request-id: 8a9ec613-09d3-11ec-a335-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search7a7716a5.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C20004B85FB\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF76F342EAA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:18 GMT
-      elapsed-time: '1436'
-      etag: W/"0x8D93C20004B85FB"
+      date: Mon, 30 Aug 2021 20:47:51 GMT
+      elapsed-time: '521'
+      etag: W/"0x8D96BF76F342EAA"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1b33cdd1-d9fc-11eb-8adf-a0481ca055a9
+      request-id: 8ac06ea7-09d3-11ec-8c93-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -76,29 +76,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '326'
+      - '320'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search7a7716a5.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C200072EDBB\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF76F61FDC8\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '408'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:19 GMT
-      elapsed-time: '38'
-      etag: W/"0x8D93C200072EDBB"
+      date: Mon, 30 Aug 2021 20:47:51 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96BF76F61FDC8"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/datasources('another-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1c2c392a-d9fc-11eb-8f11-a0481ca055a9
+      request-id: 8b291dfa-09d3-11ec-8b91-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -115,25 +115,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search7a7716a5.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C2000FDC362\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF77011E5D6\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '671'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:20 GMT
-      elapsed-time: '738'
-      etag: W/"0x8D93C2000FDC362"
+      date: Mon, 30 Aug 2021 20:47:53 GMT
+      elapsed-time: '984'
+      etag: W/"0x8D96BF77011E5D6"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/indexes('another-index')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1c4dce38-d9fc-11eb-9214-a0481ca055a9
+      request-id: 8b56c34f-09d3-11ec-afbf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -150,92 +150,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C200B598509\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:37 GMT
-      elapsed-time: '17337'
-      etag: W/"0x8D93C200B598509"
+      date: Mon, 30 Aug 2021 20:47:53 GMT
+      elapsed-time: '518'
       expires: '-1'
-      location: https://search7a7716a5.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1cd96143-d9fc-11eb-9673-a0481ca055a9
+      request-id: 8c0687bc-09d3-11ec-8d71-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
-    url: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: '{"name": "another-indexer", "dataSourceName": "another-datasource", "targetIndexName":
-      "another-index", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Content-Length:
-      - '122'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C200BAC742A\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control: no-cache
-      content-length: '392'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:37 GMT
-      elapsed-time: '464'
-      etag: W/"0x8D93C200BAC742A"
-      expires: '-1'
-      location: https://search7a7716a5.search.windows.net/indexers('another-indexer')?api-version=2021-04-30-Preview
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 274bd00c-d9fc-11eb-9a09-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-    url: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C200BAC742A\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null},{"@odata.etag":"\"0x8D93C200B598509\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '415'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:37 GMT
-      elapsed-time: '63'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 279ab84f-d9fc-11eb-a9c7-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
     url: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
index 8f687211e122..9f4c926d8d30 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search916a170c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C20163DF8DF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7785E84CD\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:55 GMT
-      elapsed-time: '145'
-      etag: W/"0x8D93C20163DF8DF"
+      date: Mon, 30 Aug 2021 20:48:07 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96BF7785E84CD"
       expires: '-1'
       location: https://search916a170c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 31e62da4-d9fc-11eb-abfe-a0481ca055a9
+      request-id: 9432b3e2-09d3-11ec-a7f1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search916a170c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C20172BC73A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF778C436EF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:57 GMT
-      elapsed-time: '1397'
-      etag: W/"0x8D93C20172BC73A"
+      date: Mon, 30 Aug 2021 20:48:07 GMT
+      elapsed-time: '513'
+      etag: W/"0x8D96BF778C436EF"
       expires: '-1'
       location: https://search916a170c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3219a1ff-d9fc-11eb-952f-a0481ca055a9
+      request-id: 9452a0d1-09d3-11ec-94ca-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,110 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C20185E7771\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:59 GMT
-      elapsed-time: '1959'
-      etag: W/"0x8D93C20185E7771"
+      date: Mon, 30 Aug 2021 20:48:08 GMT
+      elapsed-time: '553'
       expires: '-1'
-      location: https://search916a170c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 330bf956-d9fc-11eb-98d1-a0481ca055a9
+      request-id: 94b8788c-09d3-11ec-935b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
     url: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C20185E7771\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '379'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:59 GMT
-      elapsed-time: '22'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 344f7402-d9fc-11eb-bbcf-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.reset?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control: no-cache
-      date: Wed, 30 Jun 2021 23:37:59 GMT
-      elapsed-time: '352'
-      expires: '-1'
-      pragma: no-cache
-      request-id: 345b0b9e-d9fc-11eb-9c8b-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 204
-      message: No Content
-    url: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.reset?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":{"status":"inProgress","statusDetail":null,"errorMessage":null,"startTime":"2021-06-30T23:38:00.221Z","endTime":null,"itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null},"executionHistory":[{"status":"reset","statusDetail":null,"errorMessage":null,"startTime":"2021-06-30T23:37:59.816Z","endTime":"2021-06-30T23:37:59.816Z","itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null}],"limits":{"maxRunTime":"PT2M","maxDocumentExtractionSize":16777216,"maxDocumentContentCharactersToExtract":32768},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
-    headers:
-      cache-control: no-cache
-      content-length: '599'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:37:59 GMT
-      elapsed-time: '17'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 3497e449-d9fc-11eb-9d8a-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
index bf8608838ece..6076f46ff0ed 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
@@ -6,29 +6,29 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search640d163e.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C2022FCD08B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF78122171E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:38:17 GMT
-      elapsed-time: '44'
-      etag: W/"0x8D93C2022FCD08B"
+      date: Mon, 30 Aug 2021 20:48:21 GMT
+      elapsed-time: '32'
+      etag: W/"0x8D96BF78122171E"
       expires: '-1'
       location: https://search640d163e.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3eb3a5d9-d9fc-11eb-b91d-a0481ca055a9
+      request-id: 9ce5158f-09d3-11ec-8c58-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -45,25 +45,25 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search640d163e.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C20238D25CE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF7818CD345\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:38:18 GMT
-      elapsed-time: '765'
-      etag: W/"0x8D93C20238D25CE"
+      date: Mon, 30 Aug 2021 20:48:22 GMT
+      elapsed-time: '546'
+      etag: W/"0x8D96BF7818CD345"
       expires: '-1'
       location: https://search640d163e.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3ed81b3b-d9fc-11eb-b0d2-a0481ca055a9
+      request-id: 9d1638a8-09d3-11ec-aa78-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -80,111 +80,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C2023ED1070\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control: no-cache
-      content-length: '383'
+      content-language: en
+      content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:38:19 GMT
-      elapsed-time: '747'
-      etag: W/"0x8D93C2023ED1070"
+      date: Mon, 30 Aug 2021 20:48:23 GMT
+      elapsed-time: '505'
       expires: '-1'
-      location: https://search640d163e.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3f686fbf-d9fc-11eb-bd5b-a0481ca055a9
+      request-id: 9d815b5d-09d3-11ec-80a0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
     url: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C2023ED1070\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control: no-cache
-      content-length: '379'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:38:19 GMT
-      elapsed-time: '36'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 3ff505d3-d9fc-11eb-a69f-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.run?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control: no-cache
-      content-length: '0'
-      date: Wed, 30 Jun 2021 23:38:19 GMT
-      elapsed-time: '61'
-      expires: '-1'
-      pragma: no-cache
-      request-id: 4001ce07-d9fc-11eb-80e0-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-    status:
-      code: 202
-      message: Accepted
-    url: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.run?api-version=2021-04-30-Preview
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
-    headers:
-      cache-control: no-cache
-      content-length: '440'
-      content-type: application/json; odata.metadata=minimal
-      date: Wed, 30 Jun 2021 23:38:19 GMT
-      elapsed-time: '21'
-      expires: '-1'
-      odata-version: '4.0'
-      pragma: no-cache
-      preference-applied: odata.include-annotations="*"
-      request-id: 4011b8ca-d9fc-11eb-b898-a0481ca055a9
-      strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
-    status:
-      code: 200
-      message: OK
-    url: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
index 1712596c1202..6320c485d25d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
@@ -27,10 +27,6 @@
     OutputFieldMappingEntry,
     SearchIndexerSkillset,
 )
-from azure.search.documents.indexes._generated.models import (
-    EntityRecognitionSkill as EntityRecognitionSkillV1,
-    EntityRecognitionSkillV3
-)
 from azure.search.documents.indexes.aio import SearchIndexerClient
 
 CWD = dirname(realpath(__file__))
@@ -59,22 +55,28 @@ class SearchSkillsetClientTest(AzureMgmtTestCase):
     @SearchServicePreparer(schema=SCHEMA, index_batch=BATCH)
     async def test_create_skillset(self, api_key, endpoint, index_name, **kwargs):
         client = SearchIndexerClient(endpoint, AzureKeyCredential(api_key))
+        name = "test-ss"
 
-        s = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                   outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizations")])
-        sv3 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                   outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizations")],
-                                   skill_version=EntityRecognitionSkillVersion.V3)
+        s1 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")])
+
+        s2 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV3")],
+                                    skill_version=EntityRecognitionSkillVersion.V3)
+
+        skillset = SearchIndexerSkillset(name=name, skills=list([s1, s2]), description="desc")
 
-        skillset = SearchIndexerSkillset(name='test-ss', skills=list([s, sv3]), description="desc")
         result = await client.create_skillset(skillset)
+
         assert isinstance(result, SearchIndexerSkillset)
-        assert result.name == "test-ss"
+        assert result.name == name
         assert result.description == "desc"
         assert result.e_tag
         assert len(result.skills) == 2
-        assert isinstance(result.skills[0], EntityRecognitionSkillV1)
-        assert isinstance(result.skills[1], EntityRecognitionSkillV3)
+        assert isinstance(result.skills[0], EntityRecognitionSkill)
+        assert result.skills[0].skill_version == EntityRecognitionSkillVersion.V1
+        assert isinstance(result.skills[1], EntityRecognitionSkill)
+        assert result.skills[1].skill_version == EntityRecognitionSkillVersion.V3
 
         assert len(await client.get_skillsets()) == 1
 
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml
index 70e271f0382b..145f58275902 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('1')?api-version=2021-04-30-Preview
   response:
@@ -31,9 +31,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:58 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '123'
+      - '107'
       expires:
       - '-1'
       odata-version:
@@ -43,7 +43,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ca6ff6df-da01-11eb-a86b-a0481ca055a9
+      - 3453c145-09ce-11ec-b63c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -61,7 +61,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('2')?api-version=2021-04-30-Preview
   response:
@@ -77,9 +77,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:58 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '7'
+      - '4'
       expires:
       - '-1'
       odata-version:
@@ -89,7 +89,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cab7a619-da01-11eb-806b-a0481ca055a9
+      - 34870dc8-09ce-11ec-afa2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -107,7 +107,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -122,9 +122,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:58 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '7'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -134,7 +134,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cac672a0-da01-11eb-862c-a0481ca055a9
+      - 348f9fae-09ce-11ec-a131-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -152,7 +152,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -167,9 +167,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:58 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '12'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -179,7 +179,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cad5b514-da01-11eb-bad4-a0481ca055a9
+      - 3498c8d6-09ce-11ec-b62a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -197,7 +197,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('5')?api-version=2021-04-30-Preview
   response:
@@ -212,9 +212,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:58 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '5'
+      - '4'
       expires:
       - '-1'
       odata-version:
@@ -224,7 +224,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cae501ed-da01-11eb-8c91-a0481ca055a9
+      - 34a17b15-09ce-11ec-831d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -242,7 +242,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('6')?api-version=2021-04-30-Preview
   response:
@@ -257,9 +257,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:59 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '4'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -269,7 +269,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - caf35905-da01-11eb-b703-a0481ca055a9
+      - 34a9dff9-09ce-11ec-9dff-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -287,7 +287,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('7')?api-version=2021-04-30-Preview
   response:
@@ -303,7 +303,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:59 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
       - '5'
       expires:
@@ -315,7 +315,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cb03d41e-da01-11eb-a652-a0481ca055a9
+      - 34b44bb4-09ce-11ec-9d77-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -333,7 +333,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('8')?api-version=2021-04-30-Preview
   response:
@@ -351,9 +351,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:59 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '6'
+      - '4'
       expires:
       - '-1'
       odata-version:
@@ -363,7 +363,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cb1119e4-da01-11eb-9ab5-a0481ca055a9
+      - 34be523b-09ce-11ec-978f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -381,7 +381,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('9')?api-version=2021-04-30-Preview
   response:
@@ -413,7 +413,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:59 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
       - '11'
       expires:
@@ -425,7 +425,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cb20d765-da01-11eb-885c-a0481ca055a9
+      - 34c6d03a-09ce-11ec-9673-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -443,7 +443,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcca2132f.search.windows.net/indexes('drgqefsg')/docs('10')?api-version=2021-04-30-Preview
   response:
@@ -471,9 +471,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:17:59 GMT
+      - Mon, 30 Aug 2021 20:09:38 GMT
       elapsed-time:
-      - '6'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -483,7 +483,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cb2e5200-da01-11eb-9e55-a0481ca055a9
+      - 34d10b6d-09ce-11ec-9257-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml
index d57eb94becff..2765a0e53ce2 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search485f15b7.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Thu, 01 Jul 2021 00:22:59 GMT
+      - Mon, 30 Aug 2021 20:09:52 GMT
       elapsed-time:
-      - '24'
+      - '98'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7d7f5267-da02-11eb-9076-a0481ca055a9
+      - 3c405878-09ce-11ec-a236-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml
index d054b8f0716e..1580a1020dad 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search751b1688.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -21,15 +21,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:55:51 GMT
+      - Mon, 30 Aug 2021 20:10:05 GMT
       elapsed-time:
-      - '95'
+      - '99'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 5167794b-d9f6-11eb-b9dc-a0481ca055a9
+      - 445e8c47-09ce-11ec-84fa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml
index 0ee832d0aadd..588f09b26d7a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9201cc0.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf9201cc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A3D0D65D5\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf9201cc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF22EAEEF8C\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:56:08 GMT
+      - Mon, 30 Aug 2021 20:10:19 GMT
       elapsed-time:
-      - '598'
+      - '44'
       etag:
-      - W/"0x8D93C1A3D0D65D5"
+      - W/"0x8D96BF22EAEEF8C"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5b09d6a0-d9f6-11eb-852e-a0481ca055a9
+      - 4ca2f9e3-09ce-11ec-88b4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -60,7 +60,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf9201cc0.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:56:09 GMT
+      - Mon, 30 Aug 2021 20:10:20 GMT
       elapsed-time:
-      - '241'
+      - '160'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5ba7d136-d9f6-11eb-8add-a0481ca055a9
+      - 4cd10782-09ce-11ec-b6b6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -104,7 +104,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9201cc0.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:56:12 GMT
+      - Mon, 30 Aug 2021 20:10:23 GMT
       elapsed-time:
-      - '62'
+      - '23'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5dd9b154-d9f6-11eb-ad07-a0481ca055a9
+      - 4ed8f4c6-09ce-11ec-87a3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -148,7 +148,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9201cc0.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -160,15 +160,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:56:12 GMT
+      - Mon, 30 Aug 2021 20:10:23 GMT
       elapsed-time:
-      - '4'
+      - '25'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 5e180a2e-d9f6-11eb-87fb-a0481ca055a9
+      - 4f0aa62a-09ce-11ec-80c8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -184,7 +184,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9201cc0.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -196,15 +196,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:56:12 GMT
+      - Mon, 30 Aug 2021 20:10:23 GMT
       elapsed-time:
-      - '4'
+      - '6'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 5e29e24a-d9f6-11eb-a4e0-a0481ca055a9
+      - 4f1578b1-09ce-11ec-a088-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml
index 000ab12d9519..12361f8f6afb 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdc521c4f.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchdc521c4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A4952C86A\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchdc521c4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF23A05B684\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:56:28 GMT
+      - Mon, 30 Aug 2021 20:10:38 GMT
       elapsed-time:
-      - '24'
+      - '74'
       etag:
-      - W/"0x8D93C1A4952C86A"
+      - W/"0x8D96BF23A05B684"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 674e8397-d9f6-11eb-b3eb-a0481ca055a9
+      - 57f0805d-09ce-11ec-a3bc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -60,7 +60,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchdc521c4f.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:56:28 GMT
+      - Mon, 30 Aug 2021 20:10:38 GMT
       elapsed-time:
-      - '145'
+      - '105'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 678d87d2-d9f6-11eb-8233-a0481ca055a9
+      - 5827ab5b-09ce-11ec-aeff-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -104,7 +104,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdc521c4f.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:56:32 GMT
+      - Mon, 30 Aug 2021 20:10:41 GMT
       elapsed-time:
-      - '73'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 69a9dd91-d9f6-11eb-aa07-a0481ca055a9
+      - 5a2384ac-09ce-11ec-8287-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -148,7 +148,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdc521c4f.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -160,15 +160,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:56:32 GMT
+      - Mon, 30 Aug 2021 20:10:41 GMT
       elapsed-time:
-      - '3'
+      - '6'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 69eeba9c-d9f6-11eb-ac3c-a0481ca055a9
+      - 5a47c054-09ce-11ec-948f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -184,7 +184,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdc521c4f.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -196,15 +196,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:56:32 GMT
+      - Mon, 30 Aug 2021 20:10:41 GMT
       elapsed-time:
-      - '4'
+      - '3'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 69ff5bf2-d9f6-11eb-8912-a0481ca055a9
+      - 5a509081-09ce-11ec-90aa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml
index baef725aaf4d..f00a74e2333a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdd361c5d.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchdd361c5d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A550BFE5D\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchdd361c5d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF24472DCEB\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:56:49 GMT
+      - Mon, 30 Aug 2021 20:10:56 GMT
       elapsed-time:
-      - '849'
+      - '28'
       etag:
-      - W/"0x8D93C1A550BFE5D"
+      - W/"0x8D96BF24472DCEB"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 730cd91d-d9f6-11eb-a8c4-a0481ca055a9
+      - 625dd752-09ce-11ec-9424-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -60,7 +60,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchdd361c5d.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:56:49 GMT
+      - Mon, 30 Aug 2021 20:10:56 GMT
       elapsed-time:
-      - '23'
+      - '99'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 73c6aa1d-d9f6-11eb-a44a-a0481ca055a9
+      - 62850d79-09ce-11ec-b324-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -104,7 +104,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdd361c5d.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:56:53 GMT
+      - Mon, 30 Aug 2021 20:10:59 GMT
       elapsed-time:
-      - '26'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 75d83a0e-d9f6-11eb-b229-a0481ca055a9
+      - 6483bcf9-09ce-11ec-bcff-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -148,7 +148,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdd361c5d.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -163,9 +163,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:56:53 GMT
+      - Mon, 30 Aug 2021 20:10:59 GMT
       elapsed-time:
-      - '43'
+      - '11'
       expires:
       - '-1'
       odata-version:
@@ -175,7 +175,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 761de3e1-d9f6-11eb-be0c-a0481ca055a9
+      - 64acaae3-09ce-11ec-9550-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -193,7 +193,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchdd361c5d.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -208,9 +208,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:56:53 GMT
+      - Mon, 30 Aug 2021 20:10:59 GMT
       elapsed-time:
-      - '5'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -220,7 +220,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 763c5c0c-d9f6-11eb-a05a-a0481ca055a9
+      - 64b72f69-09ce-11ec-a15b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml
index c20735cc01ea..d0422fe071de 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc0cb1bec.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc0cb1bec.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A61891CBF\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc0cb1bec.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF24EC54A6F\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:57:09 GMT
+      - Mon, 30 Aug 2021 20:11:13 GMT
       elapsed-time:
-      - '768'
+      - '22'
       etag:
-      - W/"0x8D93C1A61891CBF"
+      - W/"0x8D96BF24EC54A6F"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7f84b5db-d9f6-11eb-95d4-a0481ca055a9
+      - 6cacd454-09ce-11ec-851b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -60,7 +60,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchc0cb1bec.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:57:10 GMT
+      - Mon, 30 Aug 2021 20:11:13 GMT
       elapsed-time:
-      - '167'
+      - '52'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8033e29e-d9f6-11eb-b782-a0481ca055a9
+      - 6ccb653e-09ce-11ec-aee5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -105,7 +105,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc0cb1bec.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -119,9 +119,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:57:13 GMT
+      - Mon, 30 Aug 2021 20:11:16 GMT
       elapsed-time:
-      - '80'
+      - '98'
       expires:
       - '-1'
       odata-version:
@@ -131,7 +131,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 824c864e-d9f6-11eb-ab06-a0481ca055a9
+      - 6ec36ab4-09ce-11ec-b966-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -149,7 +149,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc0cb1bec.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -161,15 +161,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:57:13 GMT
+      - Mon, 30 Aug 2021 20:11:16 GMT
       elapsed-time:
-      - '28'
+      - '5'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 829935c0-d9f6-11eb-a9ee-a0481ca055a9
+      - 6eec95f0-09ce-11ec-ad60-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -185,7 +185,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc0cb1bec.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -200,9 +200,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:57:13 GMT
+      - Mon, 30 Aug 2021 20:11:16 GMT
       elapsed-time:
-      - '17'
+      - '10'
       expires:
       - '-1'
       odata-version:
@@ -212,7 +212,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 82ad7aa0-d9f6-11eb-802c-a0481ca055a9
+      - 6ef3b937-09ce-11ec-87f7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml
index 95e57e6e457a..04bbc694a74b 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9541cb7.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf9541cb7.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A6E63ADE2\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf9541cb7.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF259BDDA8E\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:57:30 GMT
+      - Mon, 30 Aug 2021 20:11:31 GMT
       elapsed-time:
-      - '30'
+      - '37'
       etag:
-      - W/"0x8D93C1A6E63ADE2"
+      - W/"0x8D96BF259BDDA8E"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8c58379b-d9f6-11eb-b162-a0481ca055a9
+      - 77a58c33-09ce-11ec-b19b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -60,7 +60,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf9541cb7.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:57:31 GMT
+      - Mon, 30 Aug 2021 20:11:31 GMT
       elapsed-time:
-      - '93'
+      - '24'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8c98ea2b-d9f6-11eb-988f-a0481ca055a9
+      - 77c846fc-09ce-11ec-a4d5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -104,7 +104,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9541cb7.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:57:34 GMT
+      - Mon, 30 Aug 2021 20:11:35 GMT
       elapsed-time:
-      - '72'
+      - '76'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8e9c7788-d9f6-11eb-9a76-a0481ca055a9
+      - 79b02291-09ce-11ec-b28d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -148,7 +148,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9541cb7.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -162,7 +162,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:57:34 GMT
+      - Mon, 30 Aug 2021 20:11:35 GMT
       elapsed-time:
       - '8'
       expires:
@@ -174,7 +174,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8ed5b0c2-d9f6-11eb-bfce-a0481ca055a9
+      - 79d5e52a-09ce-11ec-a714-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -192,7 +192,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf9541cb7.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -207,9 +207,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:57:34 GMT
+      - Mon, 30 Aug 2021 20:11:35 GMT
       elapsed-time:
-      - '8'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -219,7 +219,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8ee36c69-d9f6-11eb-9418-a0481ca055a9
+      - 79de0545-09ce-11ec-a2e6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml
index 59523350d7b9..e36ea3ec3eb2 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchfb0a1cd2.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfb0a1cd2.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A79F6423A\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchfb0a1cd2.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF263C59CBE\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:57:49 GMT
+      - Mon, 30 Aug 2021 20:11:48 GMT
       elapsed-time:
-      - '17'
+      - '24'
       etag:
-      - W/"0x8D93C1A79F6423A"
+      - W/"0x8D96BF263C59CBE"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 97f5c913-d9f6-11eb-98f2-a0481ca055a9
+      - 81ad73c8-09ce-11ec-8996-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -61,7 +61,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchfb0a1cd2.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:57:50 GMT
+      - Mon, 30 Aug 2021 20:11:48 GMT
       elapsed-time:
-      - '18'
+      - '122'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9830d5be-d9f6-11eb-9e91-a0481ca055a9
+      - 81d3dfb1-09ce-11ec-887d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -105,7 +105,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchfb0a1cd2.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -119,9 +119,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:57:54 GMT
+      - Mon, 30 Aug 2021 20:11:52 GMT
       elapsed-time:
-      - '4'
+      - '89'
       expires:
       - '-1'
       odata-version:
@@ -131,7 +131,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9a3b56c3-d9f6-11eb-9583-a0481ca055a9
+      - 83cbacd8-09ce-11ec-a8f1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml
index b2151598f5fa..ed9d16d7a4f4 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search6f1f1ab1.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search6f1f1ab1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1A8596E2B6\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search6f1f1ab1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF26DD59E24\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 22:58:09 GMT
+      - Mon, 30 Aug 2021 20:12:05 GMT
       elapsed-time:
-      - '17'
+      - '27'
       etag:
-      - W/"0x8D93C1A8596E2B6"
+      - W/"0x8D96BF26DD59E24"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a38decc0-d9f6-11eb-a74b-a0481ca055a9
+      - 8bc7bea4-09ce-11ec-966c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -61,7 +61,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search6f1f1ab1.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:58:09 GMT
+      - Mon, 30 Aug 2021 20:12:05 GMT
       elapsed-time:
-      - '162'
+      - '102'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a3c13199-d9f6-11eb-b738-a0481ca055a9
+      - 8befbdda-09ce-11ec-8667-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -105,7 +105,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search6f1f1ab1.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -119,9 +119,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:58:13 GMT
+      - Mon, 30 Aug 2021 20:12:09 GMT
       elapsed-time:
-      - '6'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -131,7 +131,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a5d32cfc-d9f6-11eb-85d7-a0481ca055a9
+      - 8de828c9-09ce-11ec-826e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -149,7 +149,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search6f1f1ab1.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -163,9 +163,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:58:13 GMT
+      - Mon, 30 Aug 2021 20:12:09 GMT
       elapsed-time:
-      - '18'
+      - '13'
       expires:
       - '-1'
       odata-version:
@@ -175,7 +175,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a60cb39a-d9f6-11eb-9cfb-a0481ca055a9
+      - 8e02e478-09ce-11ec-9a85-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -193,7 +193,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search6f1f1ab1.search.windows.net/indexes('drgqefsg')/docs('1001')?api-version=2021-04-30-Preview
   response:
@@ -207,9 +207,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:58:13 GMT
+      - Mon, 30 Aug 2021 20:12:09 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -219,7 +219,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a61fc667-d9f6-11eb-981c-a0481ca055a9
+      - 8e0b7e30-09ce-11ec-ac6b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml
index 3107211fb7bc..742399ca4a3c 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche0dc1c73.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:58:28 GMT
+      - Mon, 30 Aug 2021 20:12:21 GMT
       elapsed-time:
-      - '169'
+      - '101'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - aef21771-d9f6-11eb-b188-a0481ca055a9
+      - 9549c7e0-09ce-11ec-973c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -58,7 +58,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche0dc1c73.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -72,9 +72,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:58:32 GMT
+      - Mon, 30 Aug 2021 20:12:24 GMT
       elapsed-time:
-      - '7'
+      - '22'
       expires:
       - '-1'
       odata-version:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b11e0c59-d9f6-11eb-836f-a0481ca055a9
+      - 97417251-09ce-11ec-ab4c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -102,7 +102,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche0dc1c73.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -114,15 +114,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:58:32 GMT
+      - Mon, 30 Aug 2021 20:12:24 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - b12dc3d1-d9f6-11eb-b9bf-a0481ca055a9
+      - 974e4fab-09ce-11ec-9bab-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -138,7 +138,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche0dc1c73.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -150,15 +150,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:58:32 GMT
+      - Mon, 30 Aug 2021 20:12:24 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - b1401356-d9f6-11eb-b8bf-a0481ca055a9
+      - 97564906-09ce-11ec-acdc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml
index 6e19c7dbb8c8..cb2b38650ac6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchc45b1c02.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 22:58:52 GMT
+      - Mon, 30 Aug 2021 20:12:36 GMT
       elapsed-time:
-      - '69'
+      - '103'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bcebd902-d9f6-11eb-aeec-a0481ca055a9
+      - 9e7683c5-09ce-11ec-a4cb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -58,7 +58,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc45b1c02.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -72,9 +72,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 22:58:55 GMT
+      - Mon, 30 Aug 2021 20:12:39 GMT
       elapsed-time:
-      - '3'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - befb9968-d9f6-11eb-8b37-a0481ca055a9
+      - a06c931c-09ce-11ec-80f1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -102,7 +102,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc45b1c02.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -114,15 +114,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:58:55 GMT
+      - Mon, 30 Aug 2021 20:12:39 GMT
       elapsed-time:
-      - '3'
+      - '4'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - bf0d9ad4-d9f6-11eb-b0e8-a0481ca055a9
+      - a074eacb-09ce-11ec-954e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -138,7 +138,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc45b1c02.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -150,15 +150,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 22:58:55 GMT
+      - Mon, 30 Aug 2021 20:12:39 GMT
       elapsed-time:
-      - '2'
+      - '4'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - bf1f50f3-d9f6-11eb-b6e8-a0481ca055a9
+      - a07be560-09ce-11ec-968e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml
index 2f7ccc8fc04f..9eb96b3e00be 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchc53f1c10.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:05 GMT
+      - Mon, 30 Aug 2021 20:12:52 GMT
       elapsed-time:
-      - '23'
+      - '22'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e8b96017-d9f6-11eb-ab5c-a0481ca055a9
+      - a81578f5-09ce-11ec-a8ef-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -58,7 +58,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc53f1c10.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -72,7 +72,7 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 23:00:09 GMT
+      - Mon, 30 Aug 2021 20:12:55 GMT
       elapsed-time:
       - '5'
       expires:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - eb0d5083-d9f6-11eb-94d0-a0481ca055a9
+      - a9fdfe71-09ce-11ec-8439-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -102,7 +102,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc53f1c10.search.windows.net/indexes('drgqefsg')/docs('3')?api-version=2021-04-30-Preview
   response:
@@ -117,9 +117,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:09 GMT
+      - Mon, 30 Aug 2021 20:12:55 GMT
       elapsed-time:
-      - '10'
+      - '14'
       expires:
       - '-1'
       odata-version:
@@ -129,7 +129,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - eb26eb96-d9f6-11eb-9d08-a0481ca055a9
+      - aa059974-09ce-11ec-8027-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -147,7 +147,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchc53f1c10.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -162,9 +162,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:09 GMT
+      - Mon, 30 Aug 2021 20:12:55 GMT
       elapsed-time:
-      - '4'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -174,7 +174,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - eb426275-d9f6-11eb-84a3-a0481ca055a9
+      - aa118854-09ce-11ec-85f1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml
index d5a89b77458f..5e0a444680c8 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcha9211b9f.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -29,9 +29,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:28 GMT
+      - Mon, 30 Aug 2021 20:13:10 GMT
       elapsed-time:
-      - '96'
+      - '37'
       expires:
       - '-1'
       odata-version:
@@ -41,7 +41,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f6776b16-d9f6-11eb-b5f2-a0481ca055a9
+      - b24baa80-09ce-11ec-a09b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -59,7 +59,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searcha9211b9f.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -73,9 +73,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 23:00:32 GMT
+      - Mon, 30 Aug 2021 20:13:13 GMT
       elapsed-time:
-      - '3'
+      - '4'
       expires:
       - '-1'
       odata-version:
@@ -85,7 +85,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f8c1a852-d9f6-11eb-aa79-a0481ca055a9
+      - b43640b0-09ce-11ec-87fb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -103,7 +103,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searcha9211b9f.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -115,7 +115,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Wed, 30 Jun 2021 23:00:32 GMT
+      - Mon, 30 Aug 2021 20:13:13 GMT
       elapsed-time:
       - '4'
       expires:
@@ -123,7 +123,7 @@ interactions:
       pragma:
       - no-cache
       request-id:
-      - f8e52b16-d9f6-11eb-b459-a0481ca055a9
+      - b43db8ca-09ce-11ec-8009-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -139,7 +139,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searcha9211b9f.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -154,9 +154,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:32 GMT
+      - Mon, 30 Aug 2021 20:13:13 GMT
       elapsed-time:
-      - '11'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -166,7 +166,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f90a5b4d-d9f6-11eb-809f-a0481ca055a9
+      - b44557fc-09ce-11ec-90fa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml
index d1b49d1f4e96..a8f7ff0c7ee2 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche1101c6a.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:52 GMT
+      - Mon, 30 Aug 2021 20:13:26 GMT
       elapsed-time:
-      - '89'
+      - '104'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 048518c4-d9f7-11eb-8add-a0481ca055a9
+      - bbd69848-09ce-11ec-a6cd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -58,7 +58,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche1101c6a.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -72,9 +72,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Wed, 30 Jun 2021 23:00:55 GMT
+      - Mon, 30 Aug 2021 20:13:28 GMT
       elapsed-time:
-      - '5'
+      - '4'
       expires:
       - '-1'
       odata-version:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 06c1c205-d9f7-11eb-9909-a0481ca055a9
+      - bdcc2a16-09ce-11ec-a769-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -102,7 +102,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche1101c6a.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -116,9 +116,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:55 GMT
+      - Mon, 30 Aug 2021 20:13:28 GMT
       elapsed-time:
-      - '9'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -128,7 +128,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 06dcb711-d9f7-11eb-b1db-a0481ca055a9
+      - bdd3a579-09ce-11ec-b688-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -146,7 +146,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche1101c6a.search.windows.net/indexes('drgqefsg')/docs('4')?api-version=2021-04-30-Preview
   response:
@@ -161,7 +161,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:00:55 GMT
+      - Mon, 30 Aug 2021 20:13:28 GMT
       elapsed-time:
       - '7'
       expires:
@@ -173,7 +173,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 06f9b44d-d9f7-11eb-a2f9-a0481ca055a9
+      - bddb746f-09ce-11ec-9ab9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml
index 1d4346f7f0dd..44d85db4af4e 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml
@@ -15,7 +15,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche2c61c85.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -29,9 +29,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:01:13 GMT
+      - Mon, 30 Aug 2021 20:13:41 GMT
       elapsed-time:
-      - '21'
+      - '129'
       expires:
       - '-1'
       odata-version:
@@ -41,7 +41,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1175ff8d-d9f7-11eb-913a-a0481ca055a9
+      - c57b96dc-09ce-11ec-afa8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml
index bf5c18a692c3..4344cf597bed 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml
@@ -15,7 +15,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search585c1a64.search.windows.net/indexes('drgqefsg')/docs/search.index?api-version=2021-04-30-Preview
   response:
@@ -29,9 +29,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:16:25 GMT
+      - Mon, 30 Aug 2021 20:13:55 GMT
       elapsed-time:
-      - '113'
+      - '103'
       expires:
       - '-1'
       odata-version:
@@ -41,7 +41,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 92597477-da01-11eb-91fe-a0481ca055a9
+      - cd19365c-09ce-11ec-ac90-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -59,7 +59,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search585c1a64.search.windows.net/indexes('drgqefsg')/docs/$count?api-version=2021-04-30-Preview
   response:
@@ -73,9 +73,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Thu, 01 Jul 2021 00:16:28 GMT
+      - Mon, 30 Aug 2021 20:13:57 GMT
       elapsed-time:
-      - '25'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -85,7 +85,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9467ff34-da01-11eb-96bb-a0481ca055a9
+      - cf0d7af8-09ce-11ec-a7b5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -103,7 +103,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search585c1a64.search.windows.net/indexes('drgqefsg')/docs('1000')?api-version=2021-04-30-Preview
   response:
@@ -117,9 +117,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:16:28 GMT
+      - Mon, 30 Aug 2021 20:13:57 GMT
       elapsed-time:
-      - '37'
+      - '8'
       expires:
       - '-1'
       odata-version:
@@ -129,7 +129,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 947f19ab-da01-11eb-ad7f-a0481ca055a9
+      - cf1591a9-09ce-11ec-a4e9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -147,7 +147,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search585c1a64.search.windows.net/indexes('drgqefsg')/docs('1001')?api-version=2021-04-30-Preview
   response:
@@ -161,9 +161,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:16:28 GMT
+      - Mon, 30 Aug 2021 20:13:57 GMT
       elapsed-time:
-      - '5'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -173,7 +173,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9496a70b-da01-11eb-ab45-a0481ca055a9
+      - cf1db4f6-09ce-11ec-8f54-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml
index ae949dbf6b59..d2c2451c342d 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche2a413b7.search.windows.net/indexes('drgqefsg')/docs/search.post.autocomplete?api-version=2021-04-30-Preview
   response:
@@ -27,9 +27,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:01:47 GMT
+      - Mon, 30 Aug 2021 20:14:11 GMT
       elapsed-time:
-      - '247'
+      - '186'
       expires:
       - '-1'
       odata-version:
@@ -39,7 +39,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 25097358-d9f7-11eb-83a8-a0481ca055a9
+      - d6ee19d6-09ce-11ec-b372-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml
index 9c5d40021881..5cb93cea80ab 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search498015b5.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:02:07 GMT
+      - Mon, 30 Aug 2021 20:14:25 GMT
       elapsed-time:
-      - '47'
+      - '136'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 30d4ba28-d9f7-11eb-b049-a0481ca055a9
+      - df21584a-09ce-11ec-a351-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search498015b5.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -169,7 +169,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:02:07 GMT
+      - Mon, 30 Aug 2021 20:14:25 GMT
       elapsed-time:
       - '8'
       expires:
@@ -181,7 +181,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3156b609-d9f7-11eb-b642-a0481ca055a9
+      - df53b59b-09ce-11ec-8c6c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml
index 73de8dca82df..7cd1d8ae1e0c 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search75b81665.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:15:58 GMT
+      - Mon, 30 Aug 2021 20:14:37 GMT
       elapsed-time:
-      - '128'
+      - '125'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 82255f56-da01-11eb-810b-a0481ca055a9
+      - e7036bcc-09ce-11ec-9a40-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search75b81665.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -169,9 +169,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Thu, 01 Jul 2021 00:15:58 GMT
+      - Mon, 30 Aug 2021 20:14:38 GMT
       elapsed-time:
-      - '7'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -181,7 +181,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 827bc4b2-da01-11eb-a6d3-a0481ca055a9
+      - e73dde2b-09ce-11ec-aeb4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml
index 623d04c7c2ab..c78021149a8a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchbad5179e.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -37,9 +37,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:02:38 GMT
+      - Mon, 30 Aug 2021 20:14:52 GMT
       elapsed-time:
-      - '243'
+      - '105'
       expires:
       - '-1'
       odata-version:
@@ -49,7 +49,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 434e2bc3-d9f7-11eb-8019-a0481ca055a9
+      - ef2663f1-09ce-11ec-ac60-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml
index b5a40be706e3..430431084dac 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searcheb87188d.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -37,9 +37,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:02:58 GMT
+      - Mon, 30 Aug 2021 20:15:06 GMT
       elapsed-time:
-      - '113'
+      - '155'
       expires:
       - '-1'
       odata-version:
@@ -49,7 +49,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4f88835c-d9f7-11eb-a000-a0481ca055a9
+      - f78b6ffb-09ce-11ec-83b3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml
index 0d5091d8171e..6abeba9716c2 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search4943159f.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -34,9 +34,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:03:17 GMT
+      - Mon, 30 Aug 2021 20:15:18 GMT
       elapsed-time:
-      - '196'
+      - '115'
       expires:
       - '-1'
       odata-version:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5a853933-d9f7-11eb-b051-a0481ca055a9
+      - fe8709d3-09ce-11ec-bccd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml
index e19b25bd2b16..6aa8e3f4ff01 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml
@@ -14,7 +14,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd375181d.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -34,9 +34,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:03:35 GMT
+      - Mon, 30 Aug 2021 20:15:31 GMT
       elapsed-time:
-      - '102'
+      - '157'
       expires:
       - '-1'
       odata-version:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 655390d8-d9f7-11eb-bdfe-a0481ca055a9
+      - 06749ee6-09cf-11ec-a629-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml
index 122f49dc1d50..0208ae11f2c9 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search498a15a3.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:03:53 GMT
+      - Mon, 30 Aug 2021 20:15:44 GMT
       elapsed-time:
-      - '96'
+      - '149'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 70a0eb57-d9f7-11eb-b25d-a0481ca055a9
+      - 0e6fdc8f-09cf-11ec-b15b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search498a15a3.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -142,9 +142,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:03:53 GMT
+      - Mon, 30 Aug 2021 20:15:44 GMT
       elapsed-time:
-      - '7'
+      - '12'
       expires:
       - '-1'
       odata-version:
@@ -154,7 +154,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 70ea106e-d9f7-11eb-9c51-a0481ca055a9
+      - 0ea2f266-09cf-11ec-a140-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml
index 0903f9423c60..b5caebd4b0e7 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search1f281970.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -44,9 +44,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:04:09 GMT
+      - Mon, 30 Aug 2021 20:15:57 GMT
       elapsed-time:
-      - '28'
+      - '138'
       expires:
       - '-1'
       odata-version:
@@ -56,7 +56,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 79d01ad2-d9f7-11eb-b9f1-a0481ca055a9
+      - 16b3a623-09cf-11ec-a5d5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -78,7 +78,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search1f281970.search.windows.net/indexes('drgqefsg')/docs/search.post.search?api-version=2021-04-30-Preview
   response:
@@ -112,9 +112,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:04:09 GMT
+      - Mon, 30 Aug 2021 20:15:57 GMT
       elapsed-time:
-      - '7'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -124,7 +124,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7a1222f3-d9f7-11eb-b781-a0481ca055a9
+      - 16f32bcb-09cf-11ec-b1f5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml
index 2f67bc77e549..ecde302d77ae 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search846911a7.search.windows.net/indexes('drgqefsg')/docs/search.post.suggest?api-version=2021-04-30-Preview
   response:
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Wed, 30 Jun 2021 23:04:24 GMT
+      - Mon, 30 Aug 2021 20:16:11 GMT
       elapsed-time:
-      - '127'
+      - '270'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 82f0fc15-d9f7-11eb-8685-a0481ca055a9
+      - 1e490e22-09cf-11ec-b8ec-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
index 373510b3da2a..8e64ae3d3863 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search54bc1a2e.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54bc1a2e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B70C554D9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54bc1a2e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF30A349010\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:04:40 GMT
+      - Mon, 30 Aug 2021 20:16:24 GMT
       elapsed-time:
-      - '210'
+      - '162'
       etag:
-      - W/"0x8D93C1B70C554D9"
+      - W/"0x8D96BF30A349010"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8c44577f-d9f7-11eb-9f05-a0481ca055a9
+      - 25eec002-09cf-11ec-8032-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
index 9aac78916fe0..863622fad0a7 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B79BD63AF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF311FB6E49\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:04:55 GMT
+      - Mon, 30 Aug 2021 20:16:37 GMT
       elapsed-time:
-      - '45'
+      - '170'
       etag:
-      - W/"0x8D93C1B79BD63AF"
+      - W/"0x8D96BF311FB6E49"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 95584e54-d9f7-11eb-becf-a0481ca055a9
+      - 2db2db6a-09cf-11ec-b6da-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1B79BD63AF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF311FB6E49\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:04:55 GMT
+      - Mon, 30 Aug 2021 20:16:37 GMT
       elapsed-time:
-      - '58'
+      - '34'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9596aa9b-d9f7-11eb-83b8-a0481ca055a9
+      - 2deaf3e5-09cf-11ec-b71a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -113,12 +113,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search715d1e50.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B79EFA38A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF312187185\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -127,11 +127,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:04:55 GMT
+      - Mon, 30 Aug 2021 20:16:37 GMT
       elapsed-time:
-      - '45'
+      - '44'
       etag:
-      - W/"0x8D93C1B79EFA38A"
+      - W/"0x8D96BF312187185"
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 95b04dc8-d9f7-11eb-9a04-a0481ca055a9
+      - 2df6eb39-09cf-11ec-89d4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -159,12 +159,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1B79EFA38A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF312187185\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -173,9 +173,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:04:55 GMT
+      - Mon, 30 Aug 2021 20:16:37 GMT
       elapsed-time:
-      - '15'
+      - '14'
       expires:
       - '-1'
       odata-version:
@@ -185,7 +185,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 95c8e22b-d9f7-11eb-b61a-a0481ca055a9
+      - 2e064aa3-09cf-11ec-8d1c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -203,12 +203,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search715d1e50.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B79EFA38A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF312187185\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -217,11 +217,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:04:55 GMT
+      - Mon, 30 Aug 2021 20:16:37 GMT
       elapsed-time:
-      - '11'
+      - '9'
       etag:
-      - W/"0x8D93C1B79EFA38A"
+      - W/"0x8D96BF312187185"
       expires:
       - '-1'
       odata-version:
@@ -231,7 +231,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 95de348b-d9f7-11eb-a894-a0481ca055a9
+      - 2e0fde5a-09cf-11ec-b656-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
index 0f8ae6b1cb2f..fa5ab56e861a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search2014238a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B833D3A6A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3198F9AAA\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:11 GMT
+      - Mon, 30 Aug 2021 20:16:49 GMT
       elapsed-time:
-      - '147'
+      - '34'
       etag:
-      - W/"0x8D93C1B833D3A6A"
+      - W/"0x8D96BF3198F9AAA"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9ec49cc9-d9f7-11eb-b854-a0481ca055a9
+      - 355d4c5e-09cf-11ec-acb6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -69,12 +69,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search2014238a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B8357CDDE\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3199BAAD0\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:11 GMT
+      - Mon, 30 Aug 2021 20:16:49 GMT
       elapsed-time:
-      - '45'
+      - '29'
       etag:
-      - W/"0x8D93C1B8357CDDE"
+      - W/"0x8D96BF3199BAAD0"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9f17176b-d9f7-11eb-b1a1-a0481ca055a9
+      - 357d6ae7-09cf-11ec-a3fe-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
 - request:
     body: '{"name": "sample-datasource", "description": "changed", "type": "azureblob",
       "credentials": {"connectionString": "DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net"},
-      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D93C1B833D3A6A\""}'
+      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96BF3198F9AAA\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -121,11 +121,11 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D93C1B833D3A6A"'
+      - '"0x8D96BF3198F9AAA"'
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search2014238a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
@@ -143,9 +143,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:11 GMT
+      - Mon, 30 Aug 2021 20:16:49 GMT
       elapsed-time:
-      - '12'
+      - '11'
       expires:
       - '-1'
       odata-version:
@@ -155,7 +155,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9f319fd0-d9f7-11eb-9f93-a0481ca055a9
+      - 358943e6-09cf-11ec-b7ea-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
index 4ee94e1d7d0d..0da7d2de9314 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B8D5F939A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF321987043\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:28 GMT
+      - Mon, 30 Aug 2021 20:17:03 GMT
       elapsed-time:
-      - '49'
+      - '174'
       etag:
-      - W/"0x8D93C1B8D5F939A"
+      - W/"0x8D96BF321987043"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a8f60eb0-d9f7-11eb-b552-a0481ca055a9
+      - 3d4ffeca-09cf-11ec-8ea0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1B8D5F939A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF321987043\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:28 GMT
+      - Mon, 30 Aug 2021 20:17:03 GMT
       elapsed-time:
-      - '24'
+      - '29'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a938f04f-d9f7-11eb-b53e-a0481ca055a9
+      - 3d873659-09cf-11ec-8134-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -107,7 +107,7 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search549e1a2d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
@@ -117,15 +117,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Wed, 30 Jun 2021 23:05:28 GMT
+      - Mon, 30 Aug 2021 20:17:03 GMT
       elapsed-time:
-      - '25'
+      - '21'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - a94faf37-d9f7-11eb-ba23-a0481ca055a9
+      - 3d91f844-09cf-11ec-9c01-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,7 +141,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
@@ -155,9 +155,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:28 GMT
+      - Mon, 30 Aug 2021 20:17:03 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -167,7 +167,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a9641b69-d9f7-11eb-aa58-a0481ca055a9
+      - 3d9bc598-09cf-11ec-8445-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
index f930a307cfcb..7fe88c13f605 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchcd7f1f67.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B97583AA1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF32966C9E3\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:45 GMT
+      - Mon, 30 Aug 2021 20:17:16 GMT
       elapsed-time:
-      - '152'
+      - '53'
       etag:
-      - W/"0x8D93C1B97583AA1"
+      - W/"0x8D96BF32966C9E3"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b2e1cc3c-d9f7-11eb-88dd-a0481ca055a9
+      - 452219ea-09cf-11ec-91fb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -69,12 +69,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchcd7f1f67.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1B9772F51B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3297460F1\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:45 GMT
+      - Mon, 30 Aug 2021 20:17:16 GMT
       elapsed-time:
-      - '48'
+      - '39'
       etag:
-      - W/"0x8D93C1B9772F51B"
+      - W/"0x8D96BF3297460F1"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b3327dbe-d9f7-11eb-a0fa-a0481ca055a9
+      - 4554a531-09cf-11ec-942e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,9 +117,9 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D93C1B97583AA1"'
+      - '"0x8D96BF32966C9E3"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchcd7f1f67.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
@@ -137,9 +137,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:05:45 GMT
+      - Mon, 30 Aug 2021 20:17:16 GMT
       elapsed-time:
-      - '10'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -149,7 +149,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b34d4114-d9f7-11eb-84ff-a0481ca055a9
+      - 45627489-09cf-11ec-8e28-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
index 57075048ff13..fc831c68addb 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchb71c225d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1BA1998487\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF33114EBB8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:02 GMT
+      - Mon, 30 Aug 2021 20:17:28 GMT
       elapsed-time:
-      - '44'
+      - '41'
       etag:
-      - W/"0x8D93C1BA1998487"
+      - W/"0x8D96BF33114EBB8"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bd25c09c-d9f7-11eb-9a7f-a0481ca055a9
+      - 4cd536f5-09cf-11ec-845e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -69,12 +69,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchb71c225d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1BA1B63B57\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3311FEA3E\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:02 GMT
+      - Mon, 30 Aug 2021 20:17:29 GMT
       elapsed-time:
-      - '37'
+      - '28'
       etag:
-      - W/"0x8D93C1BA1B63B57"
+      - W/"0x8D96BF3311FEA3E"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bd72e17f-d9f7-11eb-b02b-a0481ca055a9
+      - 4d02a187-09cf-11ec-b289-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
index 853a5d3660ac..aa0f86b69528 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search7d318fa.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1BAB15FF44\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF338E541B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:18 GMT
+      - Mon, 30 Aug 2021 20:17:41 GMT
       elapsed-time:
-      - '44'
+      - '33'
       etag:
-      - W/"0x8D93C1BAB15FF44"
+      - W/"0x8D96BF338E541B5"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c6a8cce8-d9f7-11eb-8934-a0481ca055a9
+      - 54b36210-09cf-11ec-9c3c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search7d318fa.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1BAB15FF44\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF338E541B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -75,11 +75,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:18 GMT
+      - Mon, 30 Aug 2021 20:17:41 GMT
       elapsed-time:
-      - '10'
+      - '20'
       etag:
-      - W/"0x8D93C1BAB15FF44"
+      - W/"0x8D96BF338E541B5"
       expires:
       - '-1'
       odata-version:
@@ -89,7 +89,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c6ef1d7d-d9f7-11eb-ac63-a0481ca055a9
+      - 54d3172e-09cf-11ec-821e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
index 654dbc7ebc05..25c6a291e2fe 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1BB509E9EA\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3422B172D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:34 GMT
+      - Mon, 30 Aug 2021 20:17:58 GMT
       elapsed-time:
-      - '36'
+      - '47'
       etag:
-      - W/"0x8D93C1BB509E9EA"
+      - W/"0x8D96BF3422B172D"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d0a77db4-d9f7-11eb-88dd-a0481ca055a9
+      - 5df7d68f-09cf-11ec-b7d1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -67,12 +67,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1BB521E4AA\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF342379CA3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -81,11 +81,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:34 GMT
+      - Mon, 30 Aug 2021 20:17:58 GMT
       elapsed-time:
-      - '41'
+      - '35'
       etag:
-      - W/"0x8D93C1BB521E4AA"
+      - W/"0x8D96BF342379CA3"
       expires:
       - '-1'
       location:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d0e2682f-d9f7-11eb-8aa0-a0481ca055a9
+      - 5e18ca0f-09cf-11ec-8d29-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -113,12 +113,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D93C1BB521E4AA\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D93C1BB509E9EA\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF342379CA3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96BF3422B172D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -127,9 +127,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:34 GMT
+      - Mon, 30 Aug 2021 20:17:58 GMT
       elapsed-time:
-      - '20'
+      - '25'
       expires:
       - '-1'
       odata-version:
@@ -139,7 +139,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d0fad94e-d9f7-11eb-9e41-a0481ca055a9
+      - 5e255d13-09cf-11ec-ad4e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml
index ffe048ef7e49..31b81ee8eeaf 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml
@@ -13,7 +13,7 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchcf75135f.search.windows.net/indexes('drgqefsg')/search.analyze?api-version=2021-04-30-Preview
   response:
@@ -27,9 +27,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:06:51 GMT
+      - Mon, 30 Aug 2021 20:18:11 GMT
       elapsed-time:
-      - '788'
+      - '60'
       expires:
       - '-1'
       odata-version:
@@ -39,7 +39,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d9f8c1d7-d9f7-11eb-9f7e-a0481ca055a9
+      - 66271e92-09cf-11ec-acb9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml
index 6e9a0bd17164..f0e2c0fb01ca 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml
@@ -18,12 +18,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchce941332.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchce941332.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1BC98326DA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchce941332.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF3550E40BF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:07:09 GMT
+      - Mon, 30 Aug 2021 20:18:29 GMT
       elapsed-time:
-      - '1410'
+      - '952'
       etag:
-      - W/"0x8D93C1BC98326DA"
+      - W/"0x8D96BF3550E40BF"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e454cac9-d9f7-11eb-8777-a0481ca055a9
+      - 70507711-09cf-11ec-9677-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml
index ca93fd1f7a60..54ab42c0967f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml
@@ -20,12 +20,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searcha5711754.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C2309BFC7F2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF35E80D3C8\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -34,11 +34,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:59:03 GMT
+      - Mon, 30 Aug 2021 20:18:45 GMT
       elapsed-time:
-      - '802'
+      - '950'
       etag:
-      - W/"0x8D93C2309BFC7F2"
+      - W/"0x8D96BF35E80D3C8"
       expires:
       - '-1'
       location:
@@ -50,7 +50,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 24a48b92-d9ff-11eb-9b97-a0481ca055a9
+      - 79b29b15-09cf-11ec-b73d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -77,12 +77,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searcha5711754.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C2309FB31DA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF35EAAF8B7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -91,11 +91,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:59:03 GMT
+      - Mon, 30 Aug 2021 20:18:45 GMT
       elapsed-time:
-      - '173'
+      - '226'
       etag:
-      - W/"0x8D93C2309FB31DA"
+      - W/"0x8D96BF35EAAF8B7"
       expires:
       - '-1'
       odata-version:
@@ -105,7 +105,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 259ed793-d9ff-11eb-9297-a0481ca055a9
+      - 7a6f9dab-09cf-11ec-bc6a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml
index bd3b43728b05..d1111b8b8aa9 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml
@@ -16,12 +16,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search34391d66.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1BDE5EE74A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF370464B1A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:07:44 GMT
+      - Mon, 30 Aug 2021 20:19:14 GMT
       elapsed-time:
-      - '608'
+      - '545'
       etag:
-      - W/"0x8D93C1BDE5EE74A"
+      - W/"0x8D96BF370464B1A"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f9a1fe21-d9f7-11eb-82a0-a0481ca055a9
+      - 8bc68f30-09cf-11ec-9100-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -71,12 +71,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search34391d66.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1BDE90B1E5\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF37080EDF1\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -85,11 +85,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:07:44 GMT
+      - Mon, 30 Aug 2021 20:19:15 GMT
       elapsed-time:
-      - '187'
+      - '333'
       etag:
-      - W/"0x8D93C1BDE90B1E5"
+      - W/"0x8D96BF37080EDF1"
       expires:
       - '-1'
       odata-version:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - fa38478b-d9f7-11eb-bd3a-a0481ca055a9
+      - 8c3524c4-09cf-11ec-bc09-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -111,7 +111,7 @@ interactions:
     body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
       "key": true, "retrievable": true, "searchable": false}, {"name": "baseRate",
       "type": "Edm.Double", "retrievable": true}], "scoringProfiles": [], "corsOptions":
-      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D93C1BDE5EE74A\""}'
+      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D96BF370464B1A\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -124,11 +124,11 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D93C1BDE5EE74A"'
+      - '"0x8D96BF370464B1A"'
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search34391d66.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
@@ -146,9 +146,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:07:45 GMT
+      - Mon, 30 Aug 2021 20:19:15 GMT
       elapsed-time:
-      - '150'
+      - '20'
       expires:
       - '-1'
       odata-version:
@@ -158,7 +158,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - fa6a0555-d9f7-11eb-932d-a0481ca055a9
+      - 8c6f9baa-09cf-11ec-b7cd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml
index 07aa0b3a64a5..a8bf1569a53c 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml
@@ -11,7 +11,7 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchf61a1409.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
@@ -21,15 +21,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Thu, 01 Jul 2021 00:15:30 GMT
+      - Mon, 30 Aug 2021 20:19:31 GMT
       elapsed-time:
-      - '241'
+      - '167'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 71a8c971-da01-11eb-879b-a0481ca055a9
+      - 95a6ffa8-09cf-11ec-9ca8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -45,7 +45,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchf61a1409.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
@@ -59,9 +59,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Thu, 01 Jul 2021 00:15:35 GMT
+      - Mon, 30 Aug 2021 20:19:36 GMT
       elapsed-time:
-      - '34'
+      - '26'
       expires:
       - '-1'
       odata-version:
@@ -71,7 +71,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 75076d46-da01-11eb-959a-a0481ca055a9
+      - 98e5403d-09cf-11ec-95ce-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml
index 07ecb3c31fb3..e5cc47d3ca51 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml
@@ -16,12 +16,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search1f361943.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1BEEA6C4E2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF38510688D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:08:11 GMT
+      - Mon, 30 Aug 2021 20:19:49 GMT
       elapsed-time:
-      - '1106'
+      - '568'
       etag:
-      - W/"0x8D93C1BEEA6C4E2"
+      - W/"0x8D96BF38510688D"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 09a68bb8-d9f8-11eb-80b9-a0481ca055a9
+      - a08f8077-09cf-11ec-bca2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -71,12 +71,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search1f361943.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1BEEDEA7F7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF38555BBB7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -85,11 +85,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:08:11 GMT
+      - Mon, 30 Aug 2021 20:19:50 GMT
       elapsed-time:
-      - '242'
+      - '405'
       etag:
-      - W/"0x8D93C1BEEDEA7F7"
+      - W/"0x8D96BF38555BBB7"
       expires:
       - '-1'
       odata-version:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0a84fdde-d9f8-11eb-a9c7-a0481ca055a9
+      - a0ff7f26-09cf-11ec-a5cb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,9 +119,9 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D93C1BEEA6C4E2"'
+      - '"0x8D96BF38510688D"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search1f361943.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
@@ -139,9 +139,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:08:11 GMT
+      - Mon, 30 Aug 2021 20:19:50 GMT
       elapsed-time:
-      - '28'
+      - '20'
       expires:
       - '-1'
       odata-version:
@@ -151,7 +151,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0ab8b759-d9f8-11eb-aaed-a0481ca055a9
+      - a144539c-09cf-11ec-b203-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml
index 2a1ec66610e3..91ff01336dc4 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search966a11fe.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search966a11fe.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1BF6F7346C\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search966a11fe.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF38B42A0E6\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:08:30 GMT
+      - Mon, 30 Aug 2021 20:20:03 GMT
       elapsed-time:
-      - '908'
+      - '23'
       etag:
-      - W/"0x8D93C1BF6F7346C"
+      - W/"0x8D96BF38B42A0E6"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 150bfe7b-d9f8-11eb-8eaa-a0481ca055a9
+      - a92a13e1-09cf-11ec-bac4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml
index e0a42d70cab9..bcb35db18bf9 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search783716a8.search.windows.net/indexes('drgqefsg')/search.stats?api-version=2021-04-30-Preview
   response:
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:08:49 GMT
+      - Mon, 30 Aug 2021 20:20:17 GMT
       elapsed-time:
-      - '28'
+      - '44'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 211e5e17-d9f8-11eb-ab2a-a0481ca055a9
+      - b15321a8-09cf-11ec-92d1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml
index bd283e7f9605..b546a0aff640 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searcha71e1781.search.windows.net/servicestats?api-version=2021-04-30-Preview
   response:
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:09:02 GMT
+      - Mon, 30 Aug 2021 20:20:26 GMT
       elapsed-time:
-      - '64'
+      - '54'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 287166bd-d9f8-11eb-9ad1-a0481ca055a9
+      - b6043300-09cf-11ec-b6c6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml
index 3a444416d6b3..443b256b832a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml
@@ -9,12 +9,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchcf9c1352.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcf9c1352.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D93C1C142B4394\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
+      string: '{"@odata.context":"https://searchcf9c1352.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D96BF39F3BB389\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
     headers:
       cache-control:
       - no-cache
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:09:19 GMT
+      - Mon, 30 Aug 2021 20:20:37 GMT
       elapsed-time:
-      - '861'
+      - '53'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 321b8b6a-d9f8-11eb-8a86-a0481ca055a9
+      - bd27a3ae-09cf-11ec-9792-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml
index fbffcc29c80a..704c50ff3f88 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search4c2f15e0.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:09:31 GMT
+      - Mon, 30 Aug 2021 20:20:45 GMT
       elapsed-time:
-      - '35'
+      - '37'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 39aa4ecd-d9f8-11eb-9917-a0481ca055a9
+      - c1f9e651-09cf-11ec-8892-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
index a328d211f628..9eafa4e6cb02 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
@@ -18,12 +18,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C22E7192C12\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFA40248F2F\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:58:04 GMT
+      - Mon, 30 Aug 2021 21:08:01 GMT
       elapsed-time:
-      - '53'
+      - '36'
       etag:
-      - W/"0x8D93C22E7192C12"
+      - W/"0x8D96BFA40248F2F"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 027a3f68-d9ff-11eb-8b83-a0481ca055a9
+      - 5bf7bfd5-09d6-11ec-842d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -73,12 +73,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C22E73DACEC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFA4032E9BC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:58:05 GMT
+      - Mon, 30 Aug 2021 21:08:01 GMT
       elapsed-time:
-      - '46'
+      - '37'
       etag:
-      - W/"0x8D93C22E73DACEC"
+      - W/"0x8D96BFA4032E9BC"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 02f4866f-d9ff-11eb-8bfd-a0481ca055a9
+      - 5c1d498e-09d6-11ec-8489-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,12 +119,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche2bf1c71.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C22E73DACEC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFA4032E9BC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:58:05 GMT
+      - Mon, 30 Aug 2021 21:08:01 GMT
       elapsed-time:
-      - '19'
+      - '31'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0319c1b9-d9ff-11eb-9ebc-a0481ca055a9
+      - 5c2bc4bc-09d6-11ec-b780-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -163,12 +163,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C22E73DACEC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFA4032E9BC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -177,11 +177,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:58:05 GMT
+      - Mon, 30 Aug 2021 21:08:01 GMT
       elapsed-time:
-      - '19'
+      - '15'
       etag:
-      - W/"0x8D93C22E73DACEC"
+      - W/"0x8D96BFA4032E9BC"
       expires:
       - '-1'
       odata-version:
@@ -191,7 +191,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 034092bf-d9ff-11eb-a35d-a0481ca055a9
+      - 5c3a3a5f-09d6-11ec-b56c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
index 80b4484b2330..4977660d8bf6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
@@ -18,12 +18,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search792321ab.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C338DE85C\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF96B8C336D\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:06 GMT
+      - Mon, 30 Aug 2021 21:02:03 GMT
       elapsed-time:
-      - '69'
+      - '95'
       etag:
-      - W/"0x8D93C1C338DE85C"
+      - W/"0x8D96BF96B8C336D"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4f200803-d9f8-11eb-b7b9-a0481ca055a9
+      - 87406d57-09d5-11ec-8053-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -73,12 +73,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search792321ab.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C33A6CC31\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF96B9CB12F\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:07 GMT
+      - Mon, 30 Aug 2021 21:02:03 GMT
       elapsed-time:
-      - '43'
+      - '38'
       etag:
-      - W/"0x8D93C1C33A6CC31"
+      - W/"0x8D96BF96B9CB12F"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4f671bcc-d9f8-11eb-ae59-a0481ca055a9
+      - 8784a79f-09d5-11ec-8635-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,12 +119,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search792321ab.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C1C33A6CC31\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF96B9CB12F\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:07 GMT
+      - Mon, 30 Aug 2021 21:02:03 GMT
       elapsed-time:
-      - '16'
+      - '14'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4f7fc09f-d9f8-11eb-a1dc-a0481ca055a9
+      - 87947ebc-09d5-11ec-b060-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
index f9c4f0dad70e..ad1c2859fe70 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
@@ -18,12 +18,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C3E8456BA\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF975276429\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:25 GMT
+      - Mon, 30 Aug 2021 21:02:20 GMT
       elapsed-time:
-      - '1305'
+      - '43'
       etag:
-      - W/"0x8D93C1C3E8456BA"
+      - W/"0x8D96BF975276429"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 595dab5c-d9f8-11eb-8ac6-a0481ca055a9
+      - 90e81478-09d5-11ec-b3d1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -73,12 +73,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C3EA0213E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF975371E7E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:25 GMT
+      - Mon, 30 Aug 2021 21:02:20 GMT
       elapsed-time:
-      - '57'
+      - '37'
       etag:
-      - W/"0x8D93C1C3EA0213E"
+      - W/"0x8D96BF975371E7E"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5a5e80c2-d9f8-11eb-85b7-a0481ca055a9
+      - 911f62f0-09d5-11ec-9064-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,12 +119,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchd4ef1fac.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C1C3EA0213E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF975371E7E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:25 GMT
+      - Mon, 30 Aug 2021 21:02:20 GMT
       elapsed-time:
-      - '33'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5a7adf7b-d9f8-11eb-b82b-a0481ca055a9
+      - 912f00c9-09d5-11ec-b655-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -163,12 +163,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C3EA0213E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF975371E7E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -177,11 +177,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:25 GMT
+      - Mon, 30 Aug 2021 21:02:20 GMT
       elapsed-time:
-      - '14'
+      - '12'
       etag:
-      - W/"0x8D93C1C3EA0213E"
+      - W/"0x8D96BF975371E7E"
       expires:
       - '-1'
       odata-version:
@@ -191,7 +191,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5a93b5d6-d9f8-11eb-a191-a0481ca055a9
+      - 913ac541-09d5-11ec-b553-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
index be5a9ef88a02..be6f95d683a6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
@@ -2,7 +2,9 @@ interactions:
 - request:
     body: '{"name": "test-ss", "description": "desc", "skills": [{"@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill",
       "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
-      "organizations", "targetName": "organizations"}]}]}'
+      "organizations", "targetName": "organizationsV1"}]}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityRecognitionSkill",
+      "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
+      "organizations", "targetName": "organizationsV3"}]}]}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -11,29 +13,29 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '252'
+      - '457'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd998184f.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C4AB133FF\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF97DC89DCF\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '608'
+      - '967'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:45 GMT
+      - Mon, 30 Aug 2021 21:02:35 GMT
       elapsed-time:
-      - '2053'
+      - '73'
       etag:
-      - W/"0x8D93C1C4AB133FF"
+      - W/"0x8D96BF97DC89DCF"
       expires:
       - '-1'
       location:
@@ -45,7 +47,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 650b701a-d9f8-11eb-8385-a0481ca055a9
+      - 998f903e-09d5-11ec-9f5e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,23 +63,24 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchd998184f.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C1C4AB133FF\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF97DC89DCF\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
+        Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '689'
+      - '1202'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:10:45 GMT
+      - Mon, 30 Aug 2021 21:02:35 GMT
       elapsed-time:
-      - '55'
+      - '23'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +90,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 668a9e59-d9f8-11eb-969d-a0481ca055a9
+      - 99c0b254-09d5-11ec-881b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
index 2a1629672264..96d85681b9f8 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C54FD38EA\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF985E63753\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:03 GMT
+      - Mon, 30 Aug 2021 21:02:48 GMT
       elapsed-time:
       - '47'
       etag:
-      - W/"0x8D93C1C54FD38EA"
+      - W/"0x8D96BF985E63753"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7091c512-d9f8-11eb-bdef-a0481ca055a9
+      - a1b4ad91-09d5-11ec-b524-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C1C54FD38EA\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF985E63753\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:03 GMT
+      - Mon, 30 Aug 2021 21:02:48 GMT
       elapsed-time:
-      - '17'
+      - '18'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 70d718ee-d9f8-11eb-90d1-a0481ca055a9
+      - a1de0f9a-09d5-11ec-bb2b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -107,7 +107,7 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchd97c184e.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
@@ -117,15 +117,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Wed, 30 Jun 2021 23:11:03 GMT
+      - Mon, 30 Aug 2021 21:02:48 GMT
       elapsed-time:
-      - '31'
+      - '71'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 70e9e51a-d9f8-11eb-9d35-a0481ca055a9
+      - a1e9367d-09d5-11ec-a886-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,7 +141,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
@@ -155,9 +155,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:03 GMT
+      - Mon, 30 Aug 2021 21:02:48 GMT
       elapsed-time:
-      - '6'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -167,7 +167,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 70ff6b8a-d9f8-11eb-acd0-a0481ca055a9
+      - a1fb98ad-09d5-11ec-8638-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
index 3991297f2f2d..8d3ec18f56e8 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search3a191d88.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C5F5B6975\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF98F15E882\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:20 GMT
+      - Mon, 30 Aug 2021 21:03:03 GMT
       elapsed-time:
-      - '38'
+      - '45'
       etag:
-      - W/"0x8D93C1C5F5B6975"
+      - W/"0x8D96BF98F15E882"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7afd1c36-d9f8-11eb-8923-a0481ca055a9
+      - aae0f6a6-09d5-11ec-9d48-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,12 +70,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search3a191d88.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C5F711850\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF98F23F4C9\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -84,11 +84,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:20 GMT
+      - Mon, 30 Aug 2021 21:03:03 GMT
       elapsed-time:
-      - '41'
+      - '43'
       etag:
-      - W/"0x8D93C1C5F711850"
+      - W/"0x8D96BF98F23F4C9"
       expires:
       - '-1'
       odata-version:
@@ -98,7 +98,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7b33f08d-d9f8-11eb-86fd-a0481ca055a9
+      - ab0d93bb-09d5-11ec-b6b0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,9 +118,9 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D93C1C5F5B6975"'
+      - '"0x8D96BF98F15E882"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search3a191d88.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
@@ -138,9 +138,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:20 GMT
+      - Mon, 30 Aug 2021 21:03:03 GMT
       elapsed-time:
-      - '12'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -150,7 +150,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7b4abd06-d9f8-11eb-8729-a0481ca055a9
+      - ab1b94a0-09d5-11ec-8398-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
index 33c135379031..85ee57c0ad32 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
@@ -15,12 +15,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search9274171b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C6A0B99B8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF997B43B52\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:38 GMT
+      - Mon, 30 Aug 2021 21:03:18 GMT
       elapsed-time:
-      - '46'
+      - '35'
       etag:
-      - W/"0x8D93C1C6A0B99B8"
+      - W/"0x8D96BF997B43B52"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 859cf54c-d9f8-11eb-8247-a0481ca055a9
+      - b37f0868-09d5-11ec-9d7a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search9274171b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C1C6A0B99B8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF997B43B52\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:38 GMT
+      - Mon, 30 Aug 2021 21:03:18 GMT
       elapsed-time:
-      - '16'
+      - '17'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 85e56d97-d9f8-11eb-a345-a0481ca055a9
+      - b3ac5473-09d5-11ec-92b6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -105,12 +105,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search9274171b.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C1C6A0B99B8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF997B43B52\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -119,11 +119,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:11:38 GMT
+      - Mon, 30 Aug 2021 21:03:18 GMT
       elapsed-time:
-      - '11'
+      - '10'
       etag:
-      - W/"0x8D93C1C6A0B99B8"
+      - W/"0x8D96BF997B43B52"
       expires:
       - '-1'
       odata-version:
@@ -133,7 +133,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 85f88b39-d9f8-11eb-8333-a0481ca055a9
+      - b3b72705-09d5-11ec-8b14-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
index c0c561430bae..83ab8a82f4ff 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
@@ -16,12 +16,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C22CCBC5612\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF9A03ABC2D\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:57:20 GMT
+      - Mon, 30 Aug 2021 21:03:32 GMT
       elapsed-time:
-      - '49'
+      - '40'
       etag:
-      - W/"0x8D93C22CCBC5612"
+      - W/"0x8D96BF9A03ABC2D"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e8568c74-d9fe-11eb-818d-a0481ca055a9
+      - bbea1a58-09d5-11ec-b42e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -69,12 +69,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D93C22CCD64D03\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF9A0498BF7\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:57:20 GMT
+      - Mon, 30 Aug 2021 21:03:32 GMT
       elapsed-time:
-      - '43'
+      - '40'
       etag:
-      - W/"0x8D93C22CCD64D03"
+      - W/"0x8D96BF9A0498BF7"
       expires:
       - '-1'
       location:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e898a96c-d9fe-11eb-8d4c-a0481ca055a9
+      - bc331ca4-09d5-11ec-bde5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -115,12 +115,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D93C22CCBC5612\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D93C22CCD64D03\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF9A03ABC2D\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96BF9A0498BF7\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -129,9 +129,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:57:20 GMT
+      - Mon, 30 Aug 2021 21:03:32 GMT
       elapsed-time:
-      - '18'
+      - '19'
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e8b213a4-d9fe-11eb-ab86-a0481ca055a9
+      - bc41bea2-09d5-11ec-a814-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml
index 78c9f416bdaa..a452a0c8f80e 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search9ae91f0f.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1C7EAB45F1\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3EEF700D8\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:13 GMT
+      - Mon, 30 Aug 2021 20:22:48 GMT
       elapsed-time:
-      - '155'
+      - '103'
       etag:
-      - W/"0x8D93C1C7EAB45F1"
+      - W/"0x8D96BF3EEF700D8"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9a2ba533-d9f8-11eb-aae9-a0481ca055a9
+      - 0ab3905c-09d0-11ec-8abd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search9ae91f0f.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1C7EAB45F1\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF3EEF700D8\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:13 GMT
+      - Mon, 30 Aug 2021 20:22:48 GMT
       elapsed-time:
-      - '27'
+      - '22'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9a840068-d9f8-11eb-aa90-a0481ca055a9
+      - 0ae577c5-09d0-11ec-8d75-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -113,12 +113,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search9ae91f0f.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1C7ED93C30\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3EF100BBD\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -128,11 +128,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:13 GMT
+      - Mon, 30 Aug 2021 20:22:48 GMT
       elapsed-time:
-      - '37'
+      - '20'
       etag:
-      - W/"0x8D93C1C7ED93C30"
+      - W/"0x8D96BF3EF100BBD"
       expires:
       - '-1'
       odata-version:
@@ -142,7 +142,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9a99d022-d9f8-11eb-bf02-a0481ca055a9
+      - 0af21b19-09d0-11ec-a1f8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -160,12 +160,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search9ae91f0f.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1C7ED93C30\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF3EF100BBD\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -175,9 +175,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:13 GMT
+      - Mon, 30 Aug 2021 20:22:48 GMT
       elapsed-time:
-      - '15'
+      - '10'
       expires:
       - '-1'
       odata-version:
@@ -187,7 +187,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9ab2e697-d9f8-11eb-b569-a0481ca055a9
+      - 0afe063e-09d0-11ec-a8c7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -205,12 +205,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search9ae91f0f.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1C7ED93C30\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3EF100BBD\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -220,11 +220,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:13 GMT
+      - Mon, 30 Aug 2021 20:22:48 GMT
       elapsed-time:
-      - '10'
+      - '8'
       etag:
-      - W/"0x8D93C1C7ED93C30"
+      - W/"0x8D96BF3EF100BBD"
       expires:
       - '-1'
       odata-version:
@@ -234,7 +234,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9ac8251f-d9f8-11eb-9b8c-a0481ca055a9
+      - 0b072119-09d0-11ec-a681-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml
index 4e611e5981ed..d4a8ed35c2ef 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search53532449.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1C8942E0A2\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3F72DCC71\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:30 GMT
+      - Mon, 30 Aug 2021 20:23:01 GMT
       elapsed-time:
-      - '121'
+      - '113'
       etag:
-      - W/"0x8D93C1C8942E0A2"
+      - W/"0x8D96BF3F72DCC71"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a4d10ca6-d9f8-11eb-97be-a0481ca055a9
+      - 12e17e9a-09d0-11ec-896e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -68,12 +68,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search53532449.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1C895D9974\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3F738F219\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:30 GMT
+      - Mon, 30 Aug 2021 20:23:01 GMT
       elapsed-time:
       - '25'
       etag:
-      - W/"0x8D93C1C895D9974"
+      - W/"0x8D96BF3F738F219"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a51ad8ff-d9f8-11eb-b622-a0481ca055a9
+      - 131c03bb-09d0-11ec-aeaa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -107,7 +107,7 @@ interactions:
       message: OK
 - request:
     body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
-      United States of America\nWashington, Wash. => WA", "@odata.etag": "\"0x8D93C1C8942E0A2\""}'
+      United States of America\nWashington, Wash. => WA", "@odata.etag": "\"0x8D96BF3F72DCC71\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -120,11 +120,11 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D93C1C8942E0A2"'
+      - '"0x8D96BF3F72DCC71"'
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://search53532449.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
@@ -142,9 +142,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:12:30 GMT
+      - Mon, 30 Aug 2021 20:23:01 GMT
       elapsed-time:
-      - '9'
+      - '10'
       expires:
       - '-1'
       odata-version:
@@ -154,7 +154,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a5348c05-d9f8-11eb-a303-a0481ca055a9
+      - 13279971-09d0-11ec-893c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml
index 4c2079bfa30d..6169144e2131 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search78461aed.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C22BE4DDD9D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF401CE8F75\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:56:56 GMT
+      - Mon, 30 Aug 2021 20:23:19 GMT
       elapsed-time:
-      - '109'
+      - '202'
       etag:
-      - W/"0x8D93C22BE4DDD9D"
+      - W/"0x8D96BF401CE8F75"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d9d9353a-d9fe-11eb-9fe7-a0481ca055a9
+      - 1d71340c-09d0-11ec-a8c8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search78461aed.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C22BE4DDD9D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF401CE8F75\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:56:56 GMT
+      - Mon, 30 Aug 2021 20:23:19 GMT
       elapsed-time:
-      - '28'
+      - '70'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - da290302-d9fe-11eb-9945-a0481ca055a9
+      - 1dbda7af-09d0-11ec-b25d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml
index 770b9f7bcd69..c5754d98dc67 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search78271aec.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C22AF20A15F\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF4097731E6\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:56:31 GMT
+      - Mon, 30 Aug 2021 20:23:32 GMT
       elapsed-time:
-      - '132'
+      - '32'
       etag:
-      - W/"0x8D93C22AF20A15F"
+      - W/"0x8D96BF4097731E6"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - caba1879-d9fe-11eb-a979-a0481ca055a9
+      - 2541ef27-09d0-11ec-b53e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search78271aec.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C22AF20A15F\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF4097731E6\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:56:31 GMT
+      - Mon, 30 Aug 2021 20:23:32 GMT
       elapsed-time:
-      - '85'
+      - '17'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cafa2ee8-d9fe-11eb-a4cc-a0481ca055a9
+      - 256521fb-09d0-11ec-9cd1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
       Content-Length:
       - '0'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://search78271aec.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
@@ -118,15 +118,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Wed, 30 Jun 2021 23:56:31 GMT
+      - Mon, 30 Aug 2021 20:23:32 GMT
       elapsed-time:
-      - '18'
+      - '19'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - cb1927e1-d9fe-11eb-9d96-a0481ca055a9
+      - 256f587e-09d0-11ec-a921-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -142,7 +142,7 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search78271aec.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
@@ -156,9 +156,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:56:31 GMT
+      - Mon, 30 Aug 2021 20:23:32 GMT
       elapsed-time:
-      - '75'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -168,7 +168,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cb2d4c1f-d9fe-11eb-bc35-a0481ca055a9
+      - 25791a02-09d0-11ec-834b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml
index 0ec17016c9d2..b6b922579c19 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchfabb2026.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1CA8D3A2C7\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF4119A71FA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:23 GMT
+      - Mon, 30 Aug 2021 20:23:46 GMT
       elapsed-time:
-      - '29'
+      - '26'
       etag:
-      - W/"0x8D93C1CA8D3A2C7"
+      - W/"0x8D96BF4119A71FA"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c46b5d46-d9f8-11eb-8aa7-a0481ca055a9
+      - 2d60c9e6-09d0-11ec-9c10-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -68,12 +68,12 @@ interactions:
       Prefer:
       - return=representation
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: PUT
     uri: https://searchfabb2026.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1CA8E7F1D8\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
+      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF411AA7A7B\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
         \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA","encryptionKey":null}'
     headers:
       cache-control:
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:23 GMT
+      - Mon, 30 Aug 2021 20:23:46 GMT
       elapsed-time:
-      - '19'
+      - '59'
       etag:
-      - W/"0x8D93C1CA8E7F1D8"
+      - W/"0x8D96BF411AA7A7B"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c4aba58e-d9f8-11eb-b089-a0481ca055a9
+      - 2d8cc080-09d0-11ec-9314-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,9 +117,9 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D93C1CA8D3A2C7"'
+      - '"0x8D96BF4119A71FA"'
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
     uri: https://searchfabb2026.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
@@ -137,9 +137,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:23 GMT
+      - Mon, 30 Aug 2021 20:23:46 GMT
       elapsed-time:
-      - '6'
+      - '27'
       expires:
       - '-1'
       odata-version:
@@ -149,7 +149,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c4bf99cc-d9f8-11eb-b1f2-a0481ca055a9
+      - 2d9f343c-09d0-11ec-bcf2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml
index 4c44f7ec4ff7..eea0c0672e4e 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search299919b9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1CB34A690E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF41B32BC1A\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:40 GMT
+      - Mon, 30 Aug 2021 20:24:02 GMT
       elapsed-time:
-      - '20'
+      - '35'
       etag:
-      - W/"0x8D93C1CB34A690E"
+      - W/"0x8D96BF41B32BC1A"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cee0993b-d9f8-11eb-af84-a0481ca055a9
+      - 37018150-09d0-11ec-a85e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -61,12 +61,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search299919b9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1CB34A690E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF41B32BC1A\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:40 GMT
+      - Mon, 30 Aug 2021 20:24:02 GMT
       elapsed-time:
-      - '10'
+      - '24'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cf222637-d9f8-11eb-be20-a0481ca055a9
+      - 3720d336-09d0-11ec-90cc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -106,12 +106,12 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search299919b9.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1CB34A690E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF41B32BC1A\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -121,11 +121,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:40 GMT
+      - Mon, 30 Aug 2021 20:24:02 GMT
       elapsed-time:
-      - '6'
+      - '8'
       etag:
-      - W/"0x8D93C1CB34A690E"
+      - W/"0x8D96BF41B32BC1A"
       expires:
       - '-1'
       odata-version:
@@ -135,7 +135,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cf34ea5f-d9f8-11eb-bd40-a0481ca055a9
+      - 372af766-09d0-11ec-b4cc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml
index 3adf038cd0b6..f603725138c4 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml
@@ -14,12 +14,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search43c51a2c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1CBCF9C2E7\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF42355870E\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
         United States, United States of America","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:57 GMT
+      - Mon, 30 Aug 2021 20:24:15 GMT
       elapsed-time:
-      - '30'
+      - '31'
       etag:
-      - W/"0x8D93C1CBCF9C2E7"
+      - W/"0x8D96BF42355870E"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d8906a7e-d9f8-11eb-8d54-a0481ca055a9
+      - 3f15b7ff-09d0-11ec-986d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,12 +66,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search43c51a2c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D93C1CBD0E3909\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF42362339A\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -81,11 +81,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:57 GMT
+      - Mon, 30 Aug 2021 20:24:15 GMT
       elapsed-time:
-      - '21'
+      - '23'
       etag:
-      - W/"0x8D93C1CBD0E3909"
+      - W/"0x8D96BF42362339A"
       expires:
       - '-1'
       location:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d8d19244-d9f8-11eb-9acc-a0481ca055a9
+      - 3f443918-09d0-11ec-ade4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -113,13 +113,13 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: GET
     uri: https://search43c51a2c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D93C1CBCF9C2E7\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
-        United States, United States of America","encryptionKey":null},{"@odata.etag":"\"0x8D93C1CBD0E3909\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF42355870E\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+        United States, United States of America","encryptionKey":null},{"@odata.etag":"\"0x8D96BF42362339A\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -129,9 +129,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:13:57 GMT
+      - Mon, 30 Aug 2021 20:24:15 GMT
       elapsed-time:
-      - '25'
+      - '15'
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d8e56404-d9f8-11eb-90e3-a0481ca055a9
+      - 3f50a041-09d0-11ec-a790-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
index e466feef00ae..de7fbaae5289 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search207914e0.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1CC66B933C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C013DE3992F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:14:13 GMT
+      - Mon, 30 Aug 2021 21:58:03 GMT
       elapsed-time:
-      - '254'
+      - '39'
       etag:
-      - W/"0x8D93C1CC66B933C"
+      - W/"0x8D96C013DE3992F"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e1fab021-d9f8-11eb-930f-a0481ca055a9
+      - 59bdb75b-09dd-11ec-a807-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search207914e0.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1CC7653C80\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C013E9A1271\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:14:15 GMT
+      - Mon, 30 Aug 2021 21:58:04 GMT
       elapsed-time:
-      - '1125'
+      - '962'
       etag:
-      - W/"0x8D93C1CC7653C80"
+      - W/"0x8D96C013E9A1271"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e25724f4-d9f8-11eb-b350-a0481ca055a9
+      - 59e7512a-09dd-11ec-9208-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,29 +116,36 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search207914e0.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CD1351C9B\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '383'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:14:31 GMT
+      - Mon, 30 Aug 2021 21:58:05 GMT
       elapsed-time:
-      - '16218'
-      etag:
-      - W/"0x8D93C1CD1351C9B"
+      - '733'
       expires:
       - '-1'
-      location:
-      - https://search207914e0.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version:
       - '4.0'
       pragma:
@@ -146,10 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e3401365-d9f8-11eb-a931-a0481ca055a9
+      - 5aa07dd7-09dd-11ec-8a1d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
-      code: 201
-      message: Created
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
index 44ddf49ffe20..3d7217567716 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search8001902.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1CDAC8ABFF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C014798233A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:14:46 GMT
+      - Mon, 30 Aug 2021 21:58:20 GMT
       elapsed-time:
-      - '231'
+      - '35'
       etag:
-      - W/"0x8D93C1CDAC8ABFF"
+      - W/"0x8D96C014798233A"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f63c8c59-d9f8-11eb-901b-a0481ca055a9
+      - 637513d5-09dd-11ec-888d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search8001902.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1CDB86529F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0148510DB1\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:14:48 GMT
+      - Mon, 30 Aug 2021 21:58:20 GMT
       elapsed-time:
-      - '834'
+      - '932'
       etag:
-      - W/"0x8D93C1CDB86529F"
+      - W/"0x8D96C0148510DB1"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f6a2c40b-d9f8-11eb-9aaa-a0481ca055a9
+      - 639b6a71-09dd-11ec-b8a9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,212 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search8001902.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CE64B473E\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '382'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:06 GMT
+      - Mon, 30 Aug 2021 21:58:21 GMT
       elapsed-time:
-      - '17900'
-      etag:
-      - W/"0x8D93C1CE64B473E"
-      expires:
-      - '-1'
-      location:
-      - https://search8001902.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - f75ef20f-d9f8-11eb-abc2-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search8001902.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1CE64B473E\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '386'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:07 GMT
-      elapsed-time:
-      - '26'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 023aa666-d9f9-11eb-86aa-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '139'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search8001902.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CE6BC9472\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '387'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:07 GMT
-      elapsed-time:
-      - '340'
-      etag:
-      - W/"0x8D93C1CE6BC9472"
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 025058b6-d9f9-11eb-9346-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search8001902.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1CE6BC9472\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '391'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:07 GMT
-      elapsed-time:
-      - '11'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 0297fdfa-d9f9-11eb-bcaa-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search8001902.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CE6BC9472\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '387'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:07 GMT
-      elapsed-time:
-      - '8'
-      etag:
-      - W/"0x8D93C1CE6BC9472"
+      - '527'
       expires:
       - '-1'
       odata-version:
@@ -331,12 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 02abe95a-d9f9-11eb-8bc2-a0481ca055a9
+      - 6454332b-09dd-11ec-84de-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
index f0b310737b6e..f10eb016d3c1 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search71b21e3c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1CF082FD0E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C0151701A1E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:24 GMT
+      - Mon, 30 Aug 2021 21:58:36 GMT
       elapsed-time:
-      - '40'
+      - '31'
       etag:
-      - W/"0x8D93C1CF082FD0E"
+      - W/"0x8D96C0151701A1E"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0c1cf939-d9f9-11eb-841a-a0481ca055a9
+      - 6d3f9c05-09dd-11ec-9a94-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search71b21e3c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1CF145FBB1\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0151DD20CE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:25 GMT
+      - Mon, 30 Aug 2021 21:58:36 GMT
       elapsed-time:
-      - '882'
+      - '513'
       etag:
-      - W/"0x8D93C1CF145FBB1"
+      - W/"0x8D96C0151DD20CE"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0c5cac6d-d9f9-11eb-a3b2-a0481ca055a9
+      - 6d7317b2-09dd-11ec-8ab6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,136 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search71b21e3c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CF33BBF56\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '383'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:29 GMT
-      elapsed-time:
-      - '3257'
-      etag:
-      - W/"0x8D93C1CF33BBF56"
-      expires:
-      - '-1'
-      location:
-      - https://search71b21e3c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 0d1f6217-d9f9-11eb-b6db-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '139'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search71b21e3c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CF3A6F113\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '388'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:29 GMT
-      elapsed-time:
-      - '285'
-      etag:
-      - W/"0x8D93C1CF3A6F113"
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 0f4342fd-d9f9-11eb-9aeb-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false, "@odata.etag":
-      "\"0x8D93C1CF33BBF56\""}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '179'
-      Content-Type:
-      - application/json
-      If-Match:
-      - '"0x8D93C1CF33BBF56"'
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search71b21e3c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"The precondition given in one of the
-        request headers evaluated to false. No change was made to the resource from
-        this request."}}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
       content-language:
       - en
       content-length:
-      - '160'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:29 GMT
+      - Mon, 30 Aug 2021 21:58:38 GMT
       elapsed-time:
-      - '10'
+      - '770'
       expires:
       - '-1'
       odata-version:
@@ -255,10 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0f81c3b7-d9f9-11eb-91bb-a0481ca055a9
+      - 6de155df-09dd-11ec-9570-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
-      code: 412
-      message: Precondition Failed
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
index 10578f20aa05..2205d529348f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search205e14df.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1CFD018B7B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C015B14E9DF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:44 GMT
+      - Mon, 30 Aug 2021 21:58:52 GMT
       elapsed-time:
-      - '44'
+      - '30'
       etag:
-      - W/"0x8D93C1CFD018B7B"
+      - W/"0x8D96C015B14E9DF"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1891d6bf-d9f9-11eb-ad5f-a0481ca055a9
+      - 76f0777a-09dd-11ec-abca-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search205e14df.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1CFDAFED22\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C015BCC748B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:46 GMT
+      - Mon, 30 Aug 2021 21:58:54 GMT
       elapsed-time:
-      - '835'
+      - '966'
       etag:
-      - W/"0x8D93C1CFDAFED22"
+      - W/"0x8D96C015BCC748B"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 18db2535-d9f9-11eb-a9a3-a0481ca055a9
+      - 771802b7-09dd-11ec-8def-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,149 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search205e14df.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1CFE3F7647\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '383'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:15:47 GMT
+      - Mon, 30 Aug 2021 21:58:54 GMT
       elapsed-time:
-      - '729'
-      etag:
-      - W/"0x8D93C1CFE3F7647"
-      expires:
-      - '-1'
-      location:
-      - https://search205e14df.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 1989ba2f-d9f9-11eb-be1d-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search205e14df.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1CFE3F7647\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '387'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:47 GMT
-      elapsed-time:
-      - '11'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 1a3085dd-d9f9-11eb-b54c-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '0'
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: DELETE
-    uri: https://search205e14df.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control:
-      - no-cache
-      date:
-      - Wed, 30 Jun 2021 23:15:47 GMT
-      elapsed-time:
-      - '36'
-      expires:
-      - '-1'
-      pragma:
-      - no-cache
-      request-id:
-      - 1a4399ac-d9f9-11eb-aac8-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 204
-      message: No Content
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search205e14df.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexers","value":[]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '92'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:15:47 GMT
-      elapsed-time:
-      - '6'
+      - '523'
       expires:
       - '-1'
       odata-version:
@@ -268,12 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1a5a055e-d9f9-11eb-ab30-a0481ca055a9
+      - 77cff177-09dd-11ec-919f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
index 9c51c72d4ca0..c0c9f75cc36f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search54491a19.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1D086E77E7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C0164CA8559\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:04 GMT
+      - Mon, 30 Aug 2021 21:59:09 GMT
       elapsed-time:
-      - '191'
+      - '32'
       etag:
-      - W/"0x8D93C1D086E77E7"
+      - W/"0x8D96C0164CA8559"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 23eda2bc-d9f9-11eb-83c2-a0481ca055a9
+      - 80a614f8-09dd-11ec-9141-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search54491a19.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D09401F40\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C01658C243F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:05 GMT
+      - Mon, 30 Aug 2021 21:59:10 GMT
       elapsed-time:
-      - '1015'
+      - '946'
       etag:
-      - W/"0x8D93C1D09401F40"
+      - W/"0x8D96C01658C243F"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2449afb2-d9f9-11eb-812c-a0481ca055a9
+      - 80ce13fb-09dd-11ec-b3cd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,130 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search54491a19.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D09AA3F2C\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '383'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:16:06 GMT
-      elapsed-time:
-      - '495'
-      etag:
-      - W/"0x8D93C1D09AA3F2C"
-      expires:
-      - '-1'
-      location:
-      - https://search54491a19.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 251abbad-d9f9-11eb-931c-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
-      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '139'
-      Content-Type:
-      - application/json
-      Prefer:
-      - return=representation
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: PUT
-    uri: https://search54491a19.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D0A02CFAC\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '388'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:16:06 GMT
-      elapsed-time:
-      - '288'
-      etag:
-      - W/"0x8D93C1D0A02CFAC"
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 259f06f3-d9f9-11eb-aa9b-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '0'
-      If-Match:
-      - '"0x8D93C1D09AA3F2C"'
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: DELETE
-    uri: https://search54491a19.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"The precondition given in one of the
-        request headers evaluated to false. No change was made to the resource from
-        this request."}}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
       content-language:
       - en
       content-length:
-      - '160'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:06 GMT
+      - Mon, 30 Aug 2021 21:59:11 GMT
       elapsed-time:
-      - '15'
+      - '584'
       expires:
       - '-1'
       odata-version:
@@ -249,10 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 25dba7f9-d9f9-11eb-a823-a0481ca055a9
+      - 818fb488-09dd-11ec-b48d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
-      code: 412
-      message: Precondition Failed
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
index 332a079d737f..fac6ece31930 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche35313ac.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C226B586BD4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C016E913B3C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:54:37 GMT
+      - Mon, 30 Aug 2021 21:59:25 GMT
       elapsed-time:
-      - '128'
+      - '34'
       etag:
-      - W/"0x8D93C226B586BD4"
+      - W/"0x8D96C016E913B3C"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 86e0db17-d9fe-11eb-9d5b-a0481ca055a9
+      - 8a6ea5e6-09dd-11ec-8fb1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche35313ac.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C226C0C7E81\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C016F0AEE6A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:54:38 GMT
+      - Mon, 30 Aug 2021 21:59:25 GMT
       elapsed-time:
-      - '798'
+      - '593'
       etag:
-      - W/"0x8D93C226C0C7E81"
+      - W/"0x8D96C016F0AEE6A"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 873584ae-d9fe-11eb-a9ae-a0481ca055a9
+      - 8a94b796-09dd-11ec-a1df-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,71 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche35313ac.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C227E7E8F04\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '383'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:55:10 GMT
+      - Mon, 30 Aug 2021 21:59:27 GMT
       elapsed-time:
-      - '30730'
-      etag:
-      - W/"0x8D93C227E7E8F04"
-      expires:
-      - '-1'
-      location:
-      - https://searche35313ac.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 87e98093-d9fe-11eb-9b21-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searche35313ac.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C227E7E8F04\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '383'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:55:10 GMT
-      elapsed-time:
-      - '23'
-      etag:
-      - W/"0x8D93C227E7E8F04"
+      - '730'
       expires:
       - '-1'
       odata-version:
@@ -190,12 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9a78c967-d9fe-11eb-bfe7-a0481ca055a9
+      - 8b0e5456-09dd-11ec-967e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
index 8fa65a9b09d1..866a7bd8957e 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search78e216af.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1D1E0C72D0\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C01781C8AA4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:40 GMT
+      - Mon, 30 Aug 2021 21:59:40 GMT
       elapsed-time:
-      - '82'
+      - '39'
       etag:
-      - W/"0x8D93C1D1E0C72D0"
+      - W/"0x8D96C01781C8AA4"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 399b028c-d9f9-11eb-ad1d-a0481ca055a9
+      - 93ea0672-09dd-11ec-9deb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search78e216af.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D1E914B96\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0178CC9A0F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:41 GMT
+      - Mon, 30 Aug 2021 21:59:42 GMT
       elapsed-time:
-      - '451'
+      - '935'
       etag:
-      - W/"0x8D93C1D1E914B96"
+      - W/"0x8D96C0178CC9A0F"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 39e8b65c-d9f9-11eb-ac52-a0481ca055a9
+      - 941fdea1-09dd-11ec-ad47-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,69 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://search78e216af.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D1EEE49B4\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '383'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:42 GMT
+      - Mon, 30 Aug 2021 21:59:43 GMT
       elapsed-time:
-      - '369'
-      etag:
-      - W/"0x8D93C1D1EEE49B4"
-      expires:
-      - '-1'
-      location:
-      - https://search78e216af.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 3a6ac9f4-d9f9-11eb-8189-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://search78e216af.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '527'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:16:42 GMT
-      elapsed-time:
-      - '19'
+      - '510'
       expires:
       - '-1'
       odata-version:
@@ -188,12 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3ad9bb05-d9f9-11eb-8c80-a0481ca055a9
+      - 94cfd3b3-09dd-11ec-98ad-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
index ebb442da71a1..68a7ac5d99aa 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1D289564C3\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C0182423AC5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:58 GMT
+      - Mon, 30 Aug 2021 21:59:58 GMT
       elapsed-time:
-      - '43'
+      - '72'
       etag:
-      - W/"0x8D93C1D289564C3"
+      - W/"0x8D96C0182423AC5"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 442ec2d5-d9f9-11eb-833f-a0481ca055a9
+      - 9e224b57-09dd-11ec-90fc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D290BBBF1\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0182F7A23C\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:59 GMT
+      - Mon, 30 Aug 2021 21:59:59 GMT
       elapsed-time:
-      - '448'
+      - '913'
       etag:
-      - W/"0x8D93C1D290BBBF1"
+      - W/"0x8D96C0182F7A23C"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 446f0c47-d9f9-11eb-888f-a0481ca055a9
+      - 9e4c1a64-09dd-11ec-b67c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -112,16 +112,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '326'
+      - '320'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1D2946ACEE\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C018322B1C8\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -130,11 +130,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:59 GMT
+      - Mon, 30 Aug 2021 22:00:00 GMT
       elapsed-time:
-      - '31'
+      - '32'
       etag:
-      - W/"0x8D93C1D2946ACEE"
+      - W/"0x8D96C018322B1C8"
       expires:
       - '-1'
       location:
@@ -146,7 +146,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 44e597f5-d9f9-11eb-b8d7-a0481ca055a9
+      - 9efb67d0-09dd-11ec-bd62-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -167,12 +167,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D29C2836B\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0183D30F6B\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -181,11 +181,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:16:59 GMT
+      - Mon, 30 Aug 2021 22:00:01 GMT
       elapsed-time:
-      - '451'
+      - '949'
       etag:
-      - W/"0x8D93C1D29C2836B"
+      - W/"0x8D96C0183D30F6B"
       expires:
       - '-1'
       location:
@@ -197,7 +197,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 451feed0-d9f9-11eb-8709-a0481ca055a9
+      - 9f26025f-09dd-11ec-937f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -218,120 +218,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchf8231428.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D2A23EF54\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '383'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:00 GMT
+      - Mon, 30 Aug 2021 22:00:01 GMT
       elapsed-time:
-      - '417'
-      etag:
-      - W/"0x8D93C1D2A23EF54"
-      expires:
-      - '-1'
-      location:
-      - https://searchf8231428.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 459c6a37-d9f9-11eb-a6b4-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "another-indexer", "dataSourceName": "another-datasource", "targetIndexName":
-      "another-index", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '122'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searchf8231428.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D2A732F5B\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '392'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:17:00 GMT
-      elapsed-time:
-      - '392'
-      etag:
-      - W/"0x8D93C1D2A732F5B"
-      expires:
-      - '-1'
-      location:
-      - https://searchf8231428.search.windows.net/indexers('another-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 4612ad2a-d9f9-11eb-8364-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searchf8231428.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1D2A732F5B\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null},{"@odata.etag":"\"0x8D93C1D2A23EF54\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '692'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:17:00 GMT
-      elapsed-time:
-      - '14'
+      - '522'
       expires:
       - '-1'
       odata-version:
@@ -341,12 +255,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 46603c45-d9f9-11eb-a7b0-a0481ca055a9
+      - 9fd72d7b-09dd-11ec-a94d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
index d37b41db63cf..aa76527f625b 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchca8148f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1D3436B133\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C018D6FA042\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:17 GMT
+      - Mon, 30 Aug 2021 22:00:17 GMT
       elapsed-time:
-      - '41'
+      - '34'
       etag:
-      - W/"0x8D93C1D3436B133"
+      - W/"0x8D96C018D6FA042"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4fcfd969-d9f9-11eb-a9af-a0481ca055a9
+      - a93e8aed-09dd-11ec-8ebb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchca8148f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D34B5BC96\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C018DF2F1F8\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:18 GMT
+      - Mon, 30 Aug 2021 22:00:18 GMT
       elapsed-time:
-      - '436'
+      - '625'
       etag:
-      - W/"0x8D93C1D34B5BC96"
+      - W/"0x8D96C018DF2F1F8"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 500fb944-d9f9-11eb-8969-a0481ca055a9
+      - a973d839-09dd-11ec-9ce0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,149 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searchca8148f.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D35AD425F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '382'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:20 GMT
+      - Mon, 30 Aug 2021 22:00:18 GMT
       elapsed-time:
-      - '1395'
-      etag:
-      - W/"0x8D93C1D35AD425F"
-      expires:
-      - '-1'
-      location:
-      - https://searchca8148f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 508f8ba7-d9f9-11eb-8f2e-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searchca8148f.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1D35AD425F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '386'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:17:20 GMT
-      elapsed-time:
-      - '12'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 519a0a28-d9f9-11eb-b7d9-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '0'
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searchca8148f.search.windows.net/indexers('sample-indexer')/search.reset?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control:
-      - no-cache
-      date:
-      - Wed, 30 Jun 2021 23:17:20 GMT
-      elapsed-time:
-      - '304'
-      expires:
-      - '-1'
-      pragma:
-      - no-cache
-      request-id:
-      - 51aea5a8-d9f9-11eb-b6c9-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 204
-      message: No Content
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searchca8148f.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":{"status":"reset","statusDetail":null,"errorMessage":null,"startTime":"2021-06-30T23:17:20.622Z","endTime":"2021-06-30T23:17:20.622Z","itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null},"executionHistory":[{"status":"reset","statusDetail":null,"errorMessage":null,"startTime":"2021-06-30T23:17:20.622Z","endTime":"2021-06-30T23:17:20.622Z","itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null}],"limits":null,"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '1011'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:17:20 GMT
-      elapsed-time:
-      - '16'
+      - '522'
       expires:
       - '-1'
       odata-version:
@@ -268,12 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 51ef5444-d9f9-11eb-bab6-a0481ca055a9
+      - a9f6b09d-09dd-11ec-aafb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
index e888accaf1ee..82d7d2643722 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
@@ -10,16 +10,16 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '325'
+      - '319'
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche43613c1.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D93C1D40015F0C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C01972031D8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:37 GMT
+      - Mon, 30 Aug 2021 22:00:33 GMT
       elapsed-time:
-      - '35'
+      - '38'
       etag:
-      - W/"0x8D93C1D40015F0C"
+      - W/"0x8D96C01972031D8"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5ba4a24d-d9f9-11eb-91f2-a0481ca055a9
+      - b2fb55fb-09dd-11ec-ab40-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -65,12 +65,12 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche43613c1.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D93C1D408DDA55\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0197F0040E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:38 GMT
+      - Mon, 30 Aug 2021 22:00:34 GMT
       elapsed-time:
-      - '549'
+      - '1127'
       etag:
-      - W/"0x8D93C1D408DDA55"
+      - W/"0x8D96C0197F0040E"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5bdafe39-d9f9-11eb-b6ce-a0481ca055a9
+      - b323574c-09dd-11ec-9741-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -116,151 +116,34 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: POST
     uri: https://searche43613c1.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D93C1D40F69A72\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+      string: '{"error":{"code":"","message":"Error with data source: Credentials
+        provided in the connection string are invalid or have expired.\r\nAs a result
+        of a one-time maintenance activity, your search service went through a change
+        of the IP address for its API endpoint. This caused indexers that depend on
+        network access rules on the data source to stop working. In order to address
+        this issue, please update the network access rules in your data source to
+        use the new IP address. We apologize for the inconvenience.\r\nFor more information
+        on troubleshooting connection issues to Azure Storage accounts, please see
+        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
+        definition in order to proceed."}}'
     headers:
       cache-control:
       - no-cache
+      content-language:
+      - en
       content-length:
-      - '383'
+      - '723'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Wed, 30 Jun 2021 23:17:39 GMT
+      - Mon, 30 Aug 2021 22:00:35 GMT
       elapsed-time:
-      - '416'
-      etag:
-      - W/"0x8D93C1D40F69A72"
-      expires:
-      - '-1'
-      location:
-      - https://searche43613c1.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 5c67b792-d9f9-11eb-8dfe-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searche43613c1.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D93C1D40F69A72\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '387'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:17:39 GMT
-      elapsed-time:
-      - '10'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 5ce2a7ec-d9f9-11eb-a005-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '0'
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searche43613c1.search.windows.net/indexers('sample-indexer')/search.run?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: ''
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '0'
-      date:
-      - Wed, 30 Jun 2021 23:17:39 GMT
-      elapsed-time:
-      - '56'
-      expires:
-      - '-1'
-      pragma:
-      - no-cache
-      request-id:
-      - 5cf0d921-d9f9-11eb-ae07-a0481ca055a9
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 202
-      message: Accepted
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b1 Python/3.8.6 (Windows-10-10.0.19041-SP0)
-    method: GET
-    uri: https://searche43613c1.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '527'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Wed, 30 Jun 2021 23:17:39 GMT
-      elapsed-time:
-      - '13'
+      - '552'
       expires:
       - '-1'
       odata-version:
@@ -270,12 +153,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5d0b44a3-d9f9-11eb-99ab-a0481ca055a9
+      - b3f4e05b-09dd-11ec-ad39-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
-      vary:
-      - Accept-Encoding
     status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
index 422ab9896fd3..f9de06bb28d4 100644
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
@@ -17,6 +17,7 @@
 from azure.core.exceptions import HttpResponseError
 from azure.search.documents.indexes.models import(
     EntityRecognitionSkill,
+    EntityRecognitionSkillVersion,
     InputFieldMappingEntry,
     OutputFieldMappingEntry,
     SearchIndexerSkillset,
@@ -39,19 +40,28 @@ class SearchSkillsetClientTest(AzureMgmtTestCase):
     @SearchServicePreparer(schema=SCHEMA, index_batch=BATCH)
     def test_create_skillset(self, api_key, endpoint, index_name, **kwargs):
         client = SearchIndexerClient(endpoint, AzureKeyCredential(api_key))
+        name = "test-ss"
 
-        s = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                   outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizations")])
+        s1 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")])
 
-        skillset = SearchIndexerSkillset(name='test-ss', skills=list([s]), description="desc")
+        s2 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV3")],
+                                    skill_version=EntityRecognitionSkillVersion.V3)
+
+        skillset = SearchIndexerSkillset(name=name, skills=list([s1, s2]), description="desc")
 
         result = client.create_skillset(skillset)
+
         assert isinstance(result, SearchIndexerSkillset)
-        assert result.name == "test-ss"
+        assert result.name == name
         assert result.description == "desc"
         assert result.e_tag
-        assert len(result.skills) == 1
+        assert len(result.skills) == 2
         assert isinstance(result.skills[0], EntityRecognitionSkill)
+        assert result.skills[0].skill_version == EntityRecognitionSkillVersion.V1
+        assert isinstance(result.skills[1], EntityRecognitionSkill)
+        assert result.skills[1].skill_version == EntityRecognitionSkillVersion.V3
 
         assert len(client.get_skillsets()) == 1
 

From ab4c5fcb542e652909b877b2b734fb2810a3815d Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Mon, 30 Aug 2021 15:47:04 -0700
Subject: [PATCH 05/17] Fix async skillsets and tests.

---
 .../indexes/aio/_search_indexer_client.py     |  15 +-
 ...ve_async.test_create_datasource_async.yaml |  10 +-
 ...est_create_or_update_datasource_async.yaml |  48 +++---
 ...ate_or_update_datasource_if_unchanged.yaml |  30 ++--
 ...ve_async.test_delete_datasource_async.yaml |  28 ++--
 ...c.test_delete_datasource_if_unchanged.yaml |  28 ++--
 ..._live_async.test_get_datasource_async.yaml |  18 +--
 ...live_async.test_list_datasource_async.yaml |  30 ++--
 ..._async.test_create_or_update_skillset.yaml |  38 ++---
 ...reate_or_update_skillset_if_unchanged.yaml | 109 ++++++++++++++
 ...est_create_or_update_skillset_inplace.yaml | 139 ++++++++++++++++++
 ...llset_live_async.test_create_skillset.yaml |  40 ++++-
 ...llset_live_async.test_delete_skillset.yaml |  28 ++--
 ...ync.test_delete_skillset_if_unchanged.yaml |  28 ++--
 ...skillset_live_async.test_get_skillset.yaml |  30 ++--
 ...killset_live_async.test_get_skillsets.yaml |  26 ++--
 ...ync.test_create_or_update_synonym_map.yaml |  50 +++----
 ...ap_live_async.test_create_synonym_map.yaml |  20 +--
 ...ap_live_async.test_delete_synonym_map.yaml | 121 +++++++++++++++
 ....test_delete_synonym_map_if_unchanged.yaml | 109 ++++++++++++++
 ...m_map_live_async.test_get_synonym_map.yaml |  99 +++++++++++++
 ..._map_live_async.test_get_synonym_maps.yaml |  32 ++--
 ...rch_index_client_data_source_live_async.py |   3 +-
 .../test_search_index_client_live_async.py    |   1 -
 ...search_index_client_skillset_live_async.py |   1 -
 ...rch_index_client_synonym_map_live_async.py |   1 -
 .../test_search_indexer_client_live_async.py  |   1 -
 ...ta_source_live.test_create_datasource.yaml |  10 +-
 ...live.test_create_or_update_datasource.yaml |  46 +++---
 ...ate_or_update_datasource_if_unchanged.yaml |  30 ++--
 ...ta_source_live.test_delete_datasource.yaml |  30 ++--
 ...e.test_delete_datasource_if_unchanged.yaml |  28 ++--
 ...delete_datasource_string_if_unchanged.yaml |  20 +--
 ..._data_source_live.test_get_datasource.yaml |  20 +--
 ...data_source_live.test_list_datasource.yaml |  28 ++--
 ...dexer_client_live.test_create_indexer.yaml |  26 ++--
 ...nt_live.test_create_or_update_indexer.yaml |  26 ++--
 ...create_or_update_indexer_if_unchanged.yaml |  26 ++--
 ...dexer_client_live.test_delete_indexer.yaml |  26 ++--
 ...live.test_delete_indexer_if_unchanged.yaml |  26 ++--
 ..._indexer_client_live.test_get_indexer.yaml |  26 ++--
 ...r_client_live.test_get_indexer_status.yaml |  26 ++--
 ...indexer_client_live.test_list_indexer.yaml |  46 +++---
 ...ndexer_client_live.test_reset_indexer.yaml |  26 ++--
 ..._indexer_client_live.test_run_indexer.yaml |  26 ++--
 ...st_search_index_client_data_source_live.py |   3 +-
 .../tests/test_search_index_client_live.py    |   1 -
 .../test_search_index_client_skillset_live.py |   1 -
 ...st_search_index_client_synonym_map_live.py |   1 -
 .../tests/test_search_indexer_client_live.py  |   1 -
 50 files changed, 1091 insertions(+), 491 deletions(-)
 create mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
 create mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
 create mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
 create mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
 create mode 100644 sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
index 01c4e139db4d..9494b4e9d1c2 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
@@ -10,7 +10,7 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from .._generated.aio import SearchClient as _SearchServiceClient
-from .._generated.models import SearchIndexerSkillset
+from ..models import SearchIndexerSkillset
 from .._utils import (
     get_access_conditions,
     normalize_endpoint,
@@ -462,7 +462,7 @@ async def get_skillsets(self, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
         result = await self._client.skillsets.list(**kwargs)
-        return result.skillsets
+        return [SearchIndexerSkillset._from_generated(skillset) for skillset in result.skillsets]
 
     @distributed_trace_async
     async def get_skillset_names(self, **kwargs):
@@ -500,7 +500,8 @@ async def get_skillset(self, name, **kwargs):
 
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
-        return await self._client.skillsets.get(name, **kwargs)
+        result = await self._client.skillsets.get(name, **kwargs)
+        return SearchIndexerSkillset._from_generated(result)
 
     @distributed_trace_async
     async def delete_skillset(self, skillset, **kwargs):
@@ -557,7 +558,8 @@ async def create_skillset(self, skillset, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
 
-        return await self._client.skillsets.create(skillset, **kwargs)
+        result = await self._client.skillsets.create(skillset, **kwargs)
+        return SearchIndexerSkillset._from_generated(result)
 
     @distributed_trace_async
     async def create_or_update_skillset(self, skillset, **kwargs):
@@ -579,9 +581,10 @@ async def create_or_update_skillset(self, skillset, **kwargs):
         )
         kwargs.update(access_condition)
 
-        return await self._client.skillsets.create_or_update(
+        result = await self._client.skillsets.create_or_update(
             skillset_name=skillset.name,
-            skillset=skillset,
+            skillset=skillset._to_generated(),
             error_map=error_map,
             **kwargs
         )
+        return SearchIndexerSkillset._from_generated(result)
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
index 59acd531f736..f7736cc84f6d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchb0841f28.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0841f28.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF57A989E13\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb0841f28.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C11145E4933\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:33:51 GMT
-      elapsed-time: '29'
-      etag: W/"0x8D96BF57A989E13"
+      date: Mon, 30 Aug 2021 23:51:26 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96C11145E4933"
       expires: '-1'
       location: https://searchb0841f28.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 96622fa7-09d1-11ec-9207-74c63bed1137
+      request-id: 304be049-09ed-11ec-befa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
index 7e8aa4cade1f..7591ad67d6fe 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF582A7B647\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C111C67DE89\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:04 GMT
-      elapsed-time: '41'
-      etag: W/"0x8D96BF582A7B647"
+      date: Mon, 30 Aug 2021 23:51:39 GMT
+      elapsed-time: '45'
+      etag: W/"0x8D96C111C67DE89"
       expires: '-1'
       location: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9e78ed6b-09d1-11ec-a239-74c63bed1137
+      request-id: 3860df85-09ed-11ec-9fb5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF582A7B647\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C111C67DE89\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '381'
+      content-length: '380'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:05 GMT
-      elapsed-time: '11'
+      date: Mon, 30 Aug 2021 23:51:39 GMT
+      elapsed-time: '14'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9e995b62-09d1-11ec-b276-74c63bed1137
+      request-id: 38818982-09ed-11ec-b2d2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -83,19 +83,19 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF582BD8C2B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C111C7BDF60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:05 GMT
-      elapsed-time: '38'
-      etag: W/"0x8D96BF582BD8C2B"
+      date: Mon, 30 Aug 2021 23:51:39 GMT
+      elapsed-time: '35'
+      etag: W/"0x8D96C111C7BDF60"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9ea2dcda-09d1-11ec-93b6-74c63bed1137
+      request-id: 38899e47-09ed-11ec-bf11-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -113,18 +113,18 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF582BD8C2B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C111C7BDF60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
       content-length: '387'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:05 GMT
-      elapsed-time: '13'
+      date: Mon, 30 Aug 2021 23:51:39 GMT
+      elapsed-time: '12'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9eafba33-09d1-11ec-9f62-74c63bed1137
+      request-id: 3895c7dc-09ed-11ec-b1fa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -142,19 +142,19 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF582BD8C2B\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C111C7BDF60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:05 GMT
-      elapsed-time: '7'
-      etag: W/"0x8D96BF582BD8C2B"
+      date: Mon, 30 Aug 2021 23:51:39 GMT
+      elapsed-time: '12'
+      etag: W/"0x8D96C111C7BDF60"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9ebb53e8-09d1-11ec-ae88-74c63bed1137
+      request-id: 389e0d3f-09ed-11ec-aa9e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
index 99547761cc66..073256cc7ee1 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search802607.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF58A87ED88\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1124D59F12\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '405'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:18 GMT
-      elapsed-time: '33'
-      etag: W/"0x8D96BF58A87ED88"
+      date: Mon, 30 Aug 2021 23:51:53 GMT
+      elapsed-time: '67'
+      etag: W/"0x8D96C1124D59F12"
       expires: '-1'
       location: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a6446d65-09d1-11ec-a1f8-74c63bed1137
+      request-id: 40b90ae1-09ed-11ec-bbdd-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,19 +54,19 @@ interactions:
     uri: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF58A93D69D\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1124E8B556\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
-      content-length: '381'
+      content-length: '380'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:18 GMT
-      elapsed-time: '28'
-      etag: W/"0x8D96BF58A93D69D"
+      date: Mon, 30 Aug 2021 23:51:53 GMT
+      elapsed-time: '54'
+      etag: W/"0x8D96C1124E8B556"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a679522d-09d1-11ec-95d8-74c63bed1137
+      request-id: 40f3abd9-09ed-11ec-a8aa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -76,7 +76,7 @@ interactions:
 - request:
     body: '{"name": "sample-datasource", "description": "changed", "type": "azureblob",
       "credentials": {"connectionString": "DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net"},
-      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96BF58A87ED88\""}'
+      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96C1124D59F12\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -85,7 +85,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96BF58A87ED88"'
+      - '"0x8D96C1124D59F12"'
       Prefer:
       - return=representation
       User-Agent:
@@ -102,13 +102,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:18 GMT
+      date: Mon, 30 Aug 2021 23:51:53 GMT
       elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a68535e8-09d1-11ec-aef7-74c63bed1137
+      request-id: 4103dd21-09ed-11ec-824e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
index 5c8849c135e3..2ab2f66af30d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF59301C1E9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C112CFB25F0\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:32 GMT
-      elapsed-time: '45'
-      etag: W/"0x8D96BF59301C1E9"
+      date: Mon, 30 Aug 2021 23:52:06 GMT
+      elapsed-time: '38'
+      etag: W/"0x8D96C112CFB25F0"
       expires: '-1'
       location: https://searchb0601f27.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aec40ded-09d1-11ec-a0bd-74c63bed1137
+      request-id: 48f6391c-09ed-11ec-bb8c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF59301C1E9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C112CFB25F0\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
       content-length: '381'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:32 GMT
-      elapsed-time: '12'
+      date: Mon, 30 Aug 2021 23:52:06 GMT
+      elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aef38c44-09d1-11ec-880f-74c63bed1137
+      request-id: 491580ea-09ed-11ec-b0d5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,11 +78,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Mon, 30 Aug 2021 20:34:32 GMT
+      date: Mon, 30 Aug 2021 23:52:06 GMT
       elapsed-time: '24'
       expires: '-1'
       pragma: no-cache
-      request-id: aefbbaa2-09d1-11ec-baa1-74c63bed1137
+      request-id: 491da631-09ed-11ec-9bbc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -104,13 +104,13 @@ interactions:
       cache-control: no-cache
       content-length: '202'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:32 GMT
-      elapsed-time: '5'
+      date: Mon, 30 Aug 2021 23:52:06 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: af067898-09d1-11ec-b6b4-74c63bed1137
+      request-id: 4927d09e-09ed-11ec-a1cd-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
index 0b215ae4b60b..3971efae5d0d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search950921e4.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF59ADD647F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C11355A3DF5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:45 GMT
-      elapsed-time: '39'
-      etag: W/"0x8D96BF59ADD647F"
+      date: Mon, 30 Aug 2021 23:52:21 GMT
+      elapsed-time: '50'
+      etag: W/"0x8D96C11355A3DF5"
       expires: '-1'
       location: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b6afe41c-09d1-11ec-a75f-74c63bed1137
+      request-id: 5140d4f4-09ed-11ec-bf1d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,19 +54,19 @@ interactions:
     uri: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF59AE8FF4F\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C11356CB7EC\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:45 GMT
-      elapsed-time: '33'
-      etag: W/"0x8D96BF59AE8FF4F"
+      date: Mon, 30 Aug 2021 23:52:21 GMT
+      elapsed-time: '80'
+      etag: W/"0x8D96C11356CB7EC"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b6cefca6-09d1-11ec-bdfe-74c63bed1137
+      request-id: 5175acfe-09ed-11ec-8265-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,7 +79,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96BF59ADD647F"'
+      - '"0x8D96C11355A3DF5"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -94,13 +94,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:45 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 23:52:21 GMT
+      elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b6da925e-09d1-11ec-bc74-74c63bed1137
+      request-id: 5188074d-09ed-11ec-8d8e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
index ef0f06582f75..a5905dcab960 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search54ec1df4.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5A2FFE0FF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C113D930248\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:59 GMT
-      elapsed-time: '34'
-      etag: W/"0x8D96BF5A2FFE0FF"
+      date: Mon, 30 Aug 2021 23:52:35 GMT
+      elapsed-time: '42'
+      etag: W/"0x8D96C113D930248"
       expires: '-1'
       location: https://search54ec1df4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: bed0d507-09d1-11ec-b06b-74c63bed1137
+      request-id: 598f80a2-09ed-11ec-8898-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search54ec1df4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5A2FFE0FF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C113D930248\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '375'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:34:59 GMT
+      date: Mon, 30 Aug 2021 23:52:35 GMT
       elapsed-time: '9'
-      etag: W/"0x8D96BF5A2FFE0FF"
+      etag: W/"0x8D96C113D930248"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: bef1def9-09d1-11ec-847b-74c63bed1137
+      request-id: 59ad2531-09ed-11ec-8a91-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
index 4aeb7cf3bc56..412cd36c5702 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5AAE4FB33\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1145D42C78\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:35:12 GMT
-      elapsed-time: '32'
-      etag: W/"0x8D96BF5AAE4FB33"
+      date: Mon, 30 Aug 2021 23:52:49 GMT
+      elapsed-time: '41'
+      etag: W/"0x8D96C1145D42C78"
       expires: '-1'
       location: https://search74a71e70.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c6af06c7-09d1-11ec-8381-74c63bed1137
+      request-id: 61c56094-09ed-11ec-a2ef-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -52,20 +52,20 @@ interactions:
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF5AAF15987\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1145E08AC3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '404'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:35:12 GMT
-      elapsed-time: '31'
-      etag: W/"0x8D96BF5AAF15987"
+      date: Mon, 30 Aug 2021 23:52:49 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96C1145E08AC3"
       expires: '-1'
       location: https://search74a71e70.search.windows.net/datasources('another-sample')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c6d6e822-09d1-11ec-9293-74c63bed1137
+      request-id: 61eea0f6-09ed-11ec-afd1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -82,18 +82,18 @@ interactions:
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF5AAF15987\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96BF5AAE4FB33\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C1145E08AC3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96C1145D42C78\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '406'
+      content-length: '405'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:35:12 GMT
-      elapsed-time: '18'
+      date: Mon, 30 Aug 2021 23:52:49 GMT
+      elapsed-time: '44'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c6e2de9f-09d1-11ec-be4d-74c63bed1137
+      request-id: 61faaaf6-09ed-11ec-becb-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
index afaa439e2595..9b494788d26a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAB9EB6622\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07B2C8CD44\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:11:25 GMT
-      elapsed-time: '41'
-      etag: W/"0x8D96BFAB9EB6622"
+      date: Mon, 30 Aug 2021 22:44:16 GMT
+      elapsed-time: '43'
+      etag: W/"0x8D96C07B2C8CD44"
       expires: '-1'
       location: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d5baa84d-09d6-11ec-8ac9-74c63bed1137
+      request-id: ceb4c684-09e3-11ec-be62-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAB9F860D4\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07B2D61631\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '476'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:11:25 GMT
-      elapsed-time: '39'
-      etag: W/"0x8D96BFAB9F860D4"
+      date: Mon, 30 Aug 2021 22:44:16 GMT
+      elapsed-time: '38'
+      etag: W/"0x8D96C07B2D61631"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d5e50ffc-09d6-11ec-a830-74c63bed1137
+      request-id: ced4cdf2-09e3-11ec-b1c2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAB9F860D4\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07B2D61631\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:11:25 GMT
-      elapsed-time: '15'
+      date: Mon, 30 Aug 2021 22:44:16 GMT
+      elapsed-time: '36'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d5f180dd-09d6-11ec-b1df-74c63bed1137
+      request-id: cee1eedd-09e3-11ec-8bc6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -117,19 +117,19 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAB9F860D4\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07B2D61631\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:11:25 GMT
-      elapsed-time: '14'
-      etag: W/"0x8D96BFAB9F860D4"
+      date: Mon, 30 Aug 2021 22:44:16 GMT
+      elapsed-time: '11'
+      etag: W/"0x8D96C07B2D61631"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d5f9d4a9-09d6-11ec-ad7c-74c63bed1137
+      request-id: ceed77eb-09e3-11ec-a263-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
new file mode 100644
index 000000000000..e6d6966d72dd
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
@@ -0,0 +1,109 @@
+interactions:
+- request:
+    body: '{"name": "test-ss", "description": "desc1", "skills": [{"@odata.type":
+      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
+      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
+      "organizations"}]}]}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '253'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07BAC8EE72\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '609'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:30 GMT
+      elapsed-time: '34'
+      etag: W/"0x8D96C07BAC8EE72"
+      expires: '-1'
+      location: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: d6a7d023-09e3-11ec-913e-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+    url: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "test-ss", "description": "desc2", "skills": [{"@odata.type":
+      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
+      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
+      "organizations"}]}]}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '253'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07BAD59AF5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '476'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:30 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96C07BAD59AF5"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: d6d503b3-09e3-11ec-ae8e-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search4ddb2428.search.windows.net/skillsets?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07BAD59AF5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '533'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:30 GMT
+      elapsed-time: '15'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: d6e33420-09e3-11ec-96d4-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search4ddb2428.search.windows.net/skillsets?api-version=2021-04-30-Preview
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
new file mode 100644
index 000000000000..67f6a6430ec0
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
@@ -0,0 +1,139 @@
+interactions:
+- request:
+    body: '{"name": "test-ss", "description": "desc1", "skills": [{"@odata.type":
+      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
+      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
+      "organizations"}]}]}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '253'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07C2CE19BB\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '609'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:43 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96C07C2CE19BB"
+      expires: '-1'
+      location: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: debb3cb9-09e3-11ec-b405-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+    url: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "test-ss", "description": "desc2", "skills": [{"@odata.type":
+      "#Microsoft.Skills.Text.EntityRecognitionSkill", "inputs": [{"name": "text",
+      "source": "/document/content"}], "outputs": [{"name": "organizations", "targetName":
+      "organizations"}]}]}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '253'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07C2DA7801\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '476'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:43 GMT
+      elapsed-time: '37'
+      etag: W/"0x8D96C07C2DA7801"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: ded9dabd-09e3-11ec-aa9f-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search9d362229.search.windows.net/skillsets?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07C2DA7801\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '533'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:43 GMT
+      elapsed-time: '14'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: dee67008-09e3-11ec-94b1-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search9d362229.search.windows.net/skillsets?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07C2DA7801\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '531'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:43 GMT
+      elapsed-time: '9'
+      etag: W/"0x8D96C07C2DA7801"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: deee85e5-09e3-11ec-a1a9-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
index d517effc26ed..892609e9e939 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
@@ -18,23 +18,53 @@ interactions:
     uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAC98F6DA8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07CA25CE1F\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '967'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:11:51 GMT
-      elapsed-time: '42'
-      etag: W/"0x8D96BFAC98F6DA8"
+      date: Mon, 30 Aug 2021 22:44:56 GMT
+      elapsed-time: '63'
+      etag: W/"0x8D96C07CA25CE1F"
       expires: '-1'
       location: https://search75151acc.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e569dc27-09d6-11ec-9f98-74c63bed1137
+      request-id: e6101112-09e3-11ec-91d1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
       message: Created
     url: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07CA25CE1F\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
+        Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '633'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:44:56 GMT
+      elapsed-time: '21'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: e6327fe2-09e3-11ec-a6d7-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
index 04410b066cdf..841b77d7a235 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAD184DE5E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07D20F7CFE\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:05 GMT
-      elapsed-time: '72'
-      etag: W/"0x8D96BFAD184DE5E"
+      date: Mon, 30 Aug 2021 22:45:08 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96C07D20F7CFE"
       expires: '-1'
       location: https://search74f91acb.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ed5a4b8f-09d6-11ec-9720-74c63bed1137
+      request-id: edf6339d-09e3-11ec-bc2b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAD184DE5E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07D20F7CFE\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '532'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:05 GMT
-      elapsed-time: '21'
+      date: Mon, 30 Aug 2021 22:45:08 GMT
+      elapsed-time: '15'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ed7ea889-09d6-11ec-840e-74c63bed1137
+      request-id: ee1bb265-09e3-11ec-a263-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,11 +78,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Mon, 30 Aug 2021 21:12:05 GMT
-      elapsed-time: '25'
+      date: Mon, 30 Aug 2021 22:45:09 GMT
+      elapsed-time: '21'
       expires: '-1'
       pragma: no-cache
-      request-id: ed88b3f4-09d6-11ec-995f-74c63bed1137
+      request-id: ee23c804-09e3-11ec-9f66-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -104,13 +104,13 @@ interactions:
       cache-control: no-cache
       content-length: '201'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:10 GMT
+      date: Mon, 30 Aug 2021 22:45:14 GMT
       elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f08e1514-09d6-11ec-8403-74c63bed1137
+      request-id: f128bc97-09e3-11ec-b221-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
index 600ca2028768..07cabca76a1b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchf5e02005.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFADCC8409E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07DCD6E1E8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:23 GMT
-      elapsed-time: '38'
-      etag: W/"0x8D96BFADCC8409E"
+      date: Mon, 30 Aug 2021 22:45:27 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96C07DCD6E1E8"
       expires: '-1'
       location: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f8a3779b-09d6-11ec-85b9-74c63bed1137
+      request-id: f8b38231-09e3-11ec-ad4a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -55,19 +55,19 @@ interactions:
     uri: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFADCD5B091\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07DCE22E8E\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '478'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:23 GMT
-      elapsed-time: '36'
-      etag: W/"0x8D96BFADCD5B091"
+      date: Mon, 30 Aug 2021 22:45:27 GMT
+      elapsed-time: '34'
+      etag: W/"0x8D96C07DCE22E8E"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f8c22ab9-09d6-11ec-bcd1-74c63bed1137
+      request-id: f8e329b4-09e3-11ec-b1ba-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -80,7 +80,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96BFADCC8409E"'
+      - '"0x8D96C07DCD6E1E8"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -95,13 +95,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:23 GMT
-      elapsed-time: '6'
+      date: Mon, 30 Aug 2021 22:45:27 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f8cf5623-09d6-11ec-b51d-74c63bed1137
+      request-id: f8ee715f-09e3-11ec-ae65-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
index 2a1f0434d25e..de8fd5a448cc 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAE51FB90D\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07E4AC9028\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:37 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D96BFAE51FB90D"
+      date: Mon, 30 Aug 2021 22:45:40 GMT
+      elapsed-time: '66'
+      etag: W/"0x8D96C07E4AC9028"
       expires: '-1'
       location: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 00f9ce8e-09d7-11ec-855e-74c63bed1137
+      request-id: 0097c52e-09e4-11ec-9041-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAE51FB90D\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07E4AC9028\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '533'
+      content-length: '532'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:37 GMT
-      elapsed-time: '16'
+      date: Mon, 30 Aug 2021 22:45:40 GMT
+      elapsed-time: '14'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0119faea-09d7-11ec-be47-74c63bed1137
+      request-id: 00b90c10-09e4-11ec-88a2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -75,19 +75,19 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAE51FB90D\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07E4AC9028\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:37 GMT
-      elapsed-time: '11'
-      etag: W/"0x8D96BFAE51FB90D"
+      date: Mon, 30 Aug 2021 22:45:40 GMT
+      elapsed-time: '9'
+      etag: W/"0x8D96C07E4AC9028"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 01232a93-09d7-11ec-ae8b-74c63bed1137
+      request-id: 00c0fbd9-09e4-11ec-9e87-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
index 0aa22d89f66f..01b72aae2dde 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
@@ -17,20 +17,20 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAEDCCB208\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07ECBDF28C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:52 GMT
-      elapsed-time: '41'
-      etag: W/"0x8D96BFAEDCCB208"
+      date: Mon, 30 Aug 2021 22:45:53 GMT
+      elapsed-time: '44'
+      etag: W/"0x8D96C07ECBDF28C"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0993c682-09d7-11ec-b1d4-74c63bed1137
+      request-id: 089e9eb2-09e4-11ec-bba1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,20 +54,20 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFAEDDFC850\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07ECC98D6F\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:52 GMT
-      elapsed-time: '81'
-      etag: W/"0x8D96BFAEDDFC850"
+      date: Mon, 30 Aug 2021 22:45:53 GMT
+      elapsed-time: '43'
+      etag: W/"0x8D96C07ECC98D6F"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 09c63636-09d7-11ec-8771-74c63bed1137
+      request-id: 08ca14f4-09e4-11ec-8e02-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -84,18 +84,18 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFAEDCCB208\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96BFAEDDFC850\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07ECBDF28C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96C07ECC98D6F\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '564'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 21:12:52 GMT
+      date: Mon, 30 Aug 2021 22:45:53 GMT
       elapsed-time: '18'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 09d9b91a-09d7-11ec-bf0d-74c63bed1137
+      request-id: 08d845ee-09e4-11ec-8769-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
index 87d583183449..8d5ef66d141d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF65648856E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C085AAF5F14\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:00 GMT
-      elapsed-time: '28'
-      etag: W/"0x8D96BF65648856E"
+      date: Mon, 30 Aug 2021 22:48:58 GMT
+      elapsed-time: '21'
+      etag: W/"0x8D96C085AAF5F14"
       expires: '-1'
       location: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 721586a0-09d2-11ec-902b-74c63bed1137
+      request-id: 7680ae32-09e4-11ec-b431-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF65648856E\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C085AAF5F14\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '337'
+      content-length: '336'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:00 GMT
-      elapsed-time: '10'
+      date: Mon, 30 Aug 2021 22:48:58 GMT
+      elapsed-time: '12'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7239cdef-09d2-11ec-8f33-74c63bed1137
+      request-id: 76bb7a96-09e4-11ec-a151-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -83,20 +83,20 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF6565A14D8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C085AC2273F\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '303'
+      content-length: '302'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:00 GMT
-      elapsed-time: '16'
-      etag: W/"0x8D96BF6565A14D8"
+      date: Mon, 30 Aug 2021 22:48:58 GMT
+      elapsed-time: '17'
+      etag: W/"0x8D96C085AC2273F"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72419417-09d2-11ec-ab7c-74c63bed1137
+      request-id: 76c3bdf4-09e4-11ec-8128-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -114,19 +114,19 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF6565A14D8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C085AC2273F\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '308'
+      content-length: '307'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:00 GMT
+      date: Mon, 30 Aug 2021 22:48:58 GMT
       elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 724b2e7e-09d2-11ec-9ed8-74c63bed1137
+      request-id: 76ce3f69-09e4-11ec-936d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -144,20 +144,20 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF6565A14D8\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C085AC2273F\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '303'
+      content-length: '302'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:00 GMT
+      date: Mon, 30 Aug 2021 22:48:58 GMT
       elapsed-time: '5'
-      etag: W/"0x8D96BF6565A14D8"
+      etag: W/"0x8D96C085AC2273F"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 72531bab-09d2-11ec-b6d4-74c63bed1137
+      request-id: 76d69356-09e4-11ec-af3b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
index fe7a24995d00..b685e63b408d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://search23141d6a.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF65E6C61D9\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C08634328E0\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:13 GMT
-      elapsed-time: '29'
-      etag: W/"0x8D96BF65E6C61D9"
+      date: Mon, 30 Aug 2021 22:49:13 GMT
+      elapsed-time: '34'
+      etag: W/"0x8D96C08634328E0"
       expires: '-1'
       location: https://search23141d6a.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7a410bad-09d2-11ec-8251-74c63bed1137
+      request-id: 7f318a84-09e4-11ec-b3ff-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search23141d6a.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF65E6C61D9\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C08634328E0\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '337'
+      content-length: '336'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:40:13 GMT
-      elapsed-time: '15'
+      date: Mon, 30 Aug 2021 22:49:13 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7a5e41fd-09d2-11ec-a800-74c63bed1137
+      request-id: 7f4f7d30-09e4-11ec-8022-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
new file mode 100644
index 000000000000..4d177acb9fb6
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
@@ -0,0 +1,121 @@
+interactions:
+- request:
+    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
+      United States of America\nWashington, Wash. => WA"}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '127'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C086DCBF2A5\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '272'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:30 GMT
+      elapsed-time: '20'
+      etag: W/"0x8D96C086DCBF2A5"
+      expires: '-1'
+      location: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 89b8c267-09e4-11ec-9961-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+    url: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C086DCBF2A5\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '337'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:30 GMT
+      elapsed-time: '16'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 89d7fc2e-09e4-11ec-a6cf-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control: no-cache
+      date: Mon, 30 Aug 2021 22:49:30 GMT
+      elapsed-time: '11'
+      expires: '-1'
+      pragma: no-cache
+      request-id: 89e11ce0-09e4-11ec-ab39-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 204
+      message: No Content
+    url: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps","value":[]}'
+    headers:
+      cache-control: no-cache
+      content-length: '204'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:30 GMT
+      elapsed-time: '6'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 89eaa5b7-09e4-11ec-8e87-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
new file mode 100644
index 000000000000..8bff1b55df9a
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
@@ -0,0 +1,109 @@
+interactions:
+- request:
+    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
+      United States of America\nWashington, Wash. => WA"}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '127'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searchc5e222a3.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0875DE3FA1\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '272'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:43 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96C0875DE3FA1"
+      expires: '-1'
+      location: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 91cc3947-09e4-11ec-908b-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+    url: https://searchc5e222a3.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
+      \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA"}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '125'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0875E79026\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
+        \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA","encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '334'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:43 GMT
+      elapsed-time: '17'
+      etag: W/"0x8D96C0875E79026"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 91ea793b-09e4-11ec-849e-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      If-Match:
+      - '"0x8D96C0875DE3FA1"'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"error":{"code":"","message":"The precondition given in one of the
+        request headers evaluated to false. No change was made to the resource from
+        this request."}}'
+    headers:
+      cache-control: no-cache
+      content-language: en
+      content-length: '160'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:43 GMT
+      elapsed-time: '10'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 91f3c6fa-09e4-11ec-a200-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 412
+      message: Precondition Failed
+    url: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
new file mode 100644
index 000000000000..575f2266f3e6
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
@@ -0,0 +1,99 @@
+interactions:
+- request:
+    body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
+      United States of America\nWashington, Wash. => WA"}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '127'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C087D6C9E4D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '272'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:56 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96C087D6C9E4D"
+      expires: '-1'
+      location: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 995b4729-09e4-11ec-ba23-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+    url: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C087D6C9E4D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '336'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:56 GMT
+      elapsed-time: '10'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 9978c386-09e4-11ec-95d6-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C087D6C9E4D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '331'
+      content-type: application/json; odata.metadata=minimal
+      date: Mon, 30 Aug 2021 22:49:56 GMT
+      elapsed-time: '8'
+      etag: W/"0x8D96C087D6C9E4D"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: 9980f42f-09e4-11ec-9b71-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
index ca0b866e1452..95644ce508ad 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF72682570D\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0885DC85C8\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '274'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:45:49 GMT
-      elapsed-time: '54'
-      etag: W/"0x8D96BF72682570D"
+      date: Mon, 30 Aug 2021 22:50:11 GMT
+      elapsed-time: '22'
+      etag: W/"0x8D96C0885DC85C8"
       expires: '-1'
       location: https://searche98a1ca9.search.windows.net/synonymmaps('test-syn-map-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 42540565-09d3-11ec-9c63-74c63bed1137
+      request-id: a1cb69fb-09e4-11ec-829a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -51,21 +51,21 @@ interactions:
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF7268CB93F\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0885E75D35\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '228'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:45:49 GMT
-      elapsed-time: '29'
-      etag: W/"0x8D96BF7268CB93F"
+      date: Mon, 30 Aug 2021 22:50:11 GMT
+      elapsed-time: '20'
+      etag: W/"0x8D96C0885E75D35"
       expires: '-1'
       location: https://searche98a1ca9.search.windows.net/synonymmaps('test-syn-map-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4274977b-09d3-11ec-b0f9-74c63bed1137
+      request-id: a1e89c4a-09e4-11ec-b1b0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -82,20 +82,20 @@ interactions:
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF72682570D\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null},{"@odata.etag":"\"0x8D96BF7268CB93F\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C0885DC85C8\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null},{"@odata.etag":"\"0x8D96C0885E75D35\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '358'
+      content-length: '359'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:45:49 GMT
-      elapsed-time: '34'
+      date: Mon, 30 Aug 2021 22:50:11 GMT
+      elapsed-time: '17'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 427f6cc4-09d3-11ec-849a-74c63bed1137
+      request-id: a1f392a1-09e4-11ec-9ed7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_data_source_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_data_source_live_async.py
index 05304b660c9e..784386ba90f6 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_data_source_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_data_source_live_async.py
@@ -29,7 +29,6 @@
 SCHEMA = open(join(CWD, "..", "hotel_schema.json")).read()
 BATCH = json.load(open(join(CWD, "..", "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 def await_prepared_test(test_fn):
     """Synchronous wrapper for async test methods. Used to avoid making changes
@@ -52,7 +51,7 @@ def _create_data_source_connection(self, name="sample-datasource"):
         data_source_connection = SearchIndexerDataSourceConnection(
             name=name,
             type="azureblob",
-            connection_string=CONNECTION_STRING,
+            connection_string=self.settings.AZURE_STORAGE_CONNECTION_STRING,
             container=container
         )
         return data_source_connection
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_live_async.py
index 9b6627ceb09e..404d20110e85 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_live_async.py
@@ -33,7 +33,6 @@
 SCHEMA = open(join(CWD, "..", "hotel_schema.json")).read()
 BATCH = json.load(open(join(CWD, "..", "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 def await_prepared_test(test_fn):
     """Synchronous wrapper for async test methods. Used to avoid making changes
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
index 6320c485d25d..c0609371ea46 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
@@ -33,7 +33,6 @@
 SCHEMA = open(join(CWD, "..", "hotel_schema.json")).read()
 BATCH = json.load(open(join(CWD, "..", "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 def await_prepared_test(test_fn):
     """Synchronous wrapper for async test methods. Used to avoid making changes
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_synonym_map_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_synonym_map_live_async.py
index e44c61373368..7585acd01701 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_synonym_map_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_synonym_map_live_async.py
@@ -28,7 +28,6 @@
 SCHEMA = open(join(CWD, "..", "hotel_schema.json")).read()
 BATCH = json.load(open(join(CWD, "..", "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 def await_prepared_test(test_fn):
     """Synchronous wrapper for async test methods. Used to avoid making changes
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_indexer_client_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_indexer_client_live_async.py
index 51b4d80e0887..0ba36d6d3780 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_indexer_client_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_indexer_client_live_async.py
@@ -32,7 +32,6 @@
 SCHEMA = open(join(CWD, "..", "hotel_schema.json")).read()
 BATCH = json.load(open(join(CWD, "..", "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 def await_prepared_test(test_fn):
     """Synchronous wrapper for async test methods. Used to avoid making changes
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
index 8e64ae3d3863..3b95c7ac25d4 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search54bc1a2e.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54bc1a2e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF30A349010\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54bc1a2e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10C99585E8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:24 GMT
+      - Mon, 30 Aug 2021 23:49:20 GMT
       elapsed-time:
-      - '162'
+      - '48'
       etag:
-      - W/"0x8D96BF30A349010"
+      - W/"0x8D96C10C99585E8"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 25eec002-09cf-11ec-8032-74c63bed1137
+      - e573d7be-09ec-11ec-805f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
index 863622fad0a7..682c7e4d6470 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF311FB6E49\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10D1F476B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:37 GMT
+      - Mon, 30 Aug 2021 23:49:34 GMT
       elapsed-time:
-      - '170'
+      - '51'
       etag:
-      - W/"0x8D96BF311FB6E49"
+      - W/"0x8D96C10D1F476B5"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2db2db6a-09cf-11ec-b6da-74c63bed1137
+      - edd7e25f-09ec-11ec-ac26-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF311FB6E49\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C10D1F476B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:37 GMT
+      - Mon, 30 Aug 2021 23:49:34 GMT
       elapsed-time:
-      - '34'
+      - '12'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2deaf3e5-09cf-11ec-b71a-74c63bed1137
+      - ee0e52c8-09ec-11ec-853b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,7 +118,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF312187185\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10D20CBE0A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -127,11 +127,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:37 GMT
+      - Mon, 30 Aug 2021 23:49:34 GMT
       elapsed-time:
-      - '44'
+      - '38'
       etag:
-      - W/"0x8D96BF312187185"
+      - W/"0x8D96C10D20CBE0A"
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2df6eb39-09cf-11ec-89d4-74c63bed1137
+      - ee1913ed-09ec-11ec-b213-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -164,7 +164,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF312187185\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C10D20CBE0A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -173,9 +173,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:37 GMT
+      - Mon, 30 Aug 2021 23:49:34 GMT
       elapsed-time:
-      - '14'
+      - '13'
       expires:
       - '-1'
       odata-version:
@@ -185,7 +185,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2e064aa3-09cf-11ec-8d1c-74c63bed1137
+      - ee27842c-09ec-11ec-a81d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -208,7 +208,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF312187185\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10D20CBE0A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -217,11 +217,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:37 GMT
+      - Mon, 30 Aug 2021 23:49:34 GMT
       elapsed-time:
-      - '9'
+      - '7'
       etag:
-      - W/"0x8D96BF312187185"
+      - W/"0x8D96C10D20CBE0A"
       expires:
       - '-1'
       odata-version:
@@ -231,7 +231,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2e0fde5a-09cf-11ec-b656-74c63bed1137
+      - ee32b51f-09ec-11ec-b2a5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
index fa5ab56e861a..885bca3cb639 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search2014238a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3198F9AAA\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10DACF64C1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:49 GMT
+      - Mon, 30 Aug 2021 23:49:49 GMT
       elapsed-time:
-      - '34'
+      - '48'
       etag:
-      - W/"0x8D96BF3198F9AAA"
+      - W/"0x8D96C10DACF64C1"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 355d4c5e-09cf-11ec-acb6-74c63bed1137
+      - f6b2d364-09ec-11ec-9a7a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://search2014238a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3199BAAD0\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10DAE057C5\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:49 GMT
+      - Mon, 30 Aug 2021 23:49:49 GMT
       elapsed-time:
-      - '29'
+      - '45'
       etag:
-      - W/"0x8D96BF3199BAAD0"
+      - W/"0x8D96C10DAE057C5"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 357d6ae7-09cf-11ec-a3fe-74c63bed1137
+      - f6e9b8ba-09ec-11ec-9ee4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
 - request:
     body: '{"name": "sample-datasource", "description": "changed", "type": "azureblob",
       "credentials": {"connectionString": "DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net"},
-      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96BF3198F9AAA\""}'
+      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96C10DACF64C1\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -121,7 +121,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96BF3198F9AAA"'
+      - '"0x8D96C10DACF64C1"'
       Prefer:
       - return=representation
       User-Agent:
@@ -143,9 +143,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:16:49 GMT
+      - Mon, 30 Aug 2021 23:49:49 GMT
       elapsed-time:
-      - '11'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -155,7 +155,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 358943e6-09cf-11ec-b7ea-74c63bed1137
+      - f6fa5c2a-09ec-11ec-92b8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
index 0da7d2de9314..5cbd5541fac1 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF321987043\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10E2D24222\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:03 GMT
+      - Mon, 30 Aug 2021 23:50:03 GMT
       elapsed-time:
-      - '174'
+      - '43'
       etag:
-      - W/"0x8D96BF321987043"
+      - W/"0x8D96C10E2D24222"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3d4ffeca-09cf-11ec-8ea0-74c63bed1137
+      - fec46198-09ec-11ec-b57b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF321987043\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C10E2D24222\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:03 GMT
+      - Mon, 30 Aug 2021 23:50:03 GMT
       elapsed-time:
-      - '29'
+      - '18'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3d873659-09cf-11ec-8134-74c63bed1137
+      - feecf14b-09ec-11ec-91fa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,15 +117,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Mon, 30 Aug 2021 20:17:03 GMT
+      - Mon, 30 Aug 2021 23:50:03 GMT
       elapsed-time:
-      - '21'
+      - '24'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 3d91f844-09cf-11ec-9c01-74c63bed1137
+      - fef8b689-09ec-11ec-949e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -155,9 +155,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:03 GMT
+      - Mon, 30 Aug 2021 23:50:03 GMT
       elapsed-time:
-      - '5'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -167,7 +167,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3d9bc598-09cf-11ec-8445-74c63bed1137
+      - ff04c563-09ec-11ec-ae44-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
index 7fe88c13f605..8d68052d2f61 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://searchcd7f1f67.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF32966C9E3\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10EB723F58\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:16 GMT
+      - Mon, 30 Aug 2021 23:50:17 GMT
       elapsed-time:
-      - '53'
+      - '106'
       etag:
-      - W/"0x8D96BF32966C9E3"
+      - W/"0x8D96C10EB723F58"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 452219ea-09cf-11ec-91fb-74c63bed1137
+      - 074f0cd3-09ed-11ec-9027-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://searchcd7f1f67.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3297460F1\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10EB81845A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:16 GMT
+      - Mon, 30 Aug 2021 23:50:17 GMT
       elapsed-time:
-      - '39'
+      - '49'
       etag:
-      - W/"0x8D96BF3297460F1"
+      - W/"0x8D96C10EB81845A"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4554a531-09cf-11ec-942e-74c63bed1137
+      - 078c8ff2-09ed-11ec-8747-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,7 +117,7 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D96BF32966C9E3"'
+      - '"0x8D96C10EB723F58"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -137,9 +137,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:16 GMT
+      - Mon, 30 Aug 2021 23:50:17 GMT
       elapsed-time:
-      - '9'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -149,7 +149,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 45627489-09cf-11ec-8e28-74c63bed1137
+      - 079d78db-09ed-11ec-bb40-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
index fc831c68addb..834bbb486c29 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://searchb71c225d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF33114EBB8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10F3B4F073\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:28 GMT
+      - Mon, 30 Aug 2021 23:50:30 GMT
       elapsed-time:
-      - '41'
+      - '37'
       etag:
-      - W/"0x8D96BF33114EBB8"
+      - W/"0x8D96C10F3B4F073"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4cd536f5-09cf-11ec-845e-74c63bed1137
+      - 0fa7a6e3-09ed-11ec-8621-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://searchb71c225d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3311FEA3E\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10F3C4839E\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:29 GMT
+      - Mon, 30 Aug 2021 23:50:30 GMT
       elapsed-time:
-      - '28'
+      - '40'
       etag:
-      - W/"0x8D96BF3311FEA3E"
+      - W/"0x8D96C10F3C4839E"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4d02a187-09cf-11ec-b289-74c63bed1137
+      - 0fcf71cd-09ed-11ec-a48c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
index aa0f86b69528..6ab37a63bd49 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search7d318fa.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF338E541B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10FBFE0B4F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:41 GMT
+      - Mon, 30 Aug 2021 23:50:45 GMT
       elapsed-time:
-      - '33'
+      - '45'
       etag:
-      - W/"0x8D96BF338E541B5"
+      - W/"0x8D96C10FBFE0B4F"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 54b36210-09cf-11ec-9c3c-74c63bed1137
+      - 17e236a0-09ed-11ec-a106-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search7d318fa.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF338E541B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10FBFE0B4F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -75,11 +75,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:41 GMT
+      - Mon, 30 Aug 2021 23:50:45 GMT
       elapsed-time:
-      - '20'
+      - '10'
       etag:
-      - W/"0x8D96BF338E541B5"
+      - W/"0x8D96C10FBFE0B4F"
       expires:
       - '-1'
       odata-version:
@@ -89,7 +89,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 54d3172e-09cf-11ec-821e-74c63bed1137
+      - 1819746f-09ed-11ec-8d87-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
index 25c6a291e2fe..4123d99effcc 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF3422B172D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1105768E82\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:58 GMT
+      - Mon, 30 Aug 2021 23:51:01 GMT
       elapsed-time:
-      - '47'
+      - '35'
       etag:
-      - W/"0x8D96BF3422B172D"
+      - W/"0x8D96C1105768E82"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5df7d68f-09cf-11ec-b7d1-74c63bed1137
+      - 21615943-09ed-11ec-8689-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -72,7 +72,7 @@ interactions:
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF342379CA3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C110584E8FD\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -81,11 +81,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:58 GMT
+      - Mon, 30 Aug 2021 23:51:01 GMT
       elapsed-time:
-      - '35'
+      - '39'
       etag:
-      - W/"0x8D96BF342379CA3"
+      - W/"0x8D96C110584E8FD"
       expires:
       - '-1'
       location:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5e18ca0f-09cf-11ec-8d29-74c63bed1137
+      - 2190a8a4-09ed-11ec-a8b9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -118,7 +118,7 @@ interactions:
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96BF342379CA3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96BF3422B172D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C110584E8FD\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96C1105768E82\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -127,9 +127,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:17:58 GMT
+      - Mon, 30 Aug 2021 23:51:01 GMT
       elapsed-time:
-      - '25'
+      - '19'
       expires:
       - '-1'
       odata-version:
@@ -139,7 +139,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5e255d13-09cf-11ec-ad4e-74c63bed1137
+      - 219f706f-09ed-11ec-ad42-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
index de7fbaae5289..9d079ecc9e11 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search207914e0.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C013DE3992F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C102F526DA9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:03 GMT
+      - Mon, 30 Aug 2021 23:45:01 GMT
       elapsed-time:
-      - '39'
+      - '58'
       etag:
-      - W/"0x8D96C013DE3992F"
+      - W/"0x8D96C102F526DA9"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 59bdb75b-09dd-11ec-a807-74c63bed1137
+      - 4b428a3d-09ec-11ec-be11-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search207914e0.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C013E9A1271\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C102FF1B0C9\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:04 GMT
+      - Mon, 30 Aug 2021 23:45:02 GMT
       elapsed-time:
-      - '962'
+      - '798'
       etag:
-      - W/"0x8D96C013E9A1271"
+      - W/"0x8D96C102FF1B0C9"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 59e7512a-09dd-11ec-9208-74c63bed1137
+      - 4b6e7523-09ec-11ec-963d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:05 GMT
+      - Mon, 30 Aug 2021 23:45:03 GMT
       elapsed-time:
-      - '733'
+      - '827'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5aa07dd7-09dd-11ec-8a1d-74c63bed1137
+      - 4c0b4f5a-09ec-11ec-8832-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
index 3d7217567716..d9b5f8b95751 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search8001902.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C014798233A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C103958F2CA\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:20 GMT
+      - Mon, 30 Aug 2021 23:45:18 GMT
       elapsed-time:
-      - '35'
+      - '53'
       etag:
-      - W/"0x8D96C014798233A"
+      - W/"0x8D96C103958F2CA"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 637513d5-09dd-11ec-888d-74c63bed1137
+      - 554e7a2a-09ec-11ec-9e4e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search8001902.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0148510DB1\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C103A35E67E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:20 GMT
+      - Mon, 30 Aug 2021 23:45:20 GMT
       elapsed-time:
-      - '932'
+      - '1175'
       etag:
-      - W/"0x8D96C0148510DB1"
+      - W/"0x8D96C103A35E67E"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 639b6a71-09dd-11ec-b8a9-74c63bed1137
+      - 5574e3cb-09ec-11ec-8683-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:21 GMT
+      - Mon, 30 Aug 2021 23:45:21 GMT
       elapsed-time:
-      - '527'
+      - '1213'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6454332b-09dd-11ec-84de-74c63bed1137
+      - 564f1dde-09ec-11ec-917b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
index f10eb016d3c1..b22bbe3b3164 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C0151701A1E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1043CC5783\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:36 GMT
+      - Mon, 30 Aug 2021 23:45:36 GMT
       elapsed-time:
-      - '31'
+      - '51'
       etag:
-      - W/"0x8D96C0151701A1E"
+      - W/"0x8D96C1043CC5783"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6d3f9c05-09dd-11ec-9a94-74c63bed1137
+      - 5fb7459e-09ec-11ec-a8b5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0151DD20CE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C10444D5EC6\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:36 GMT
+      - Mon, 30 Aug 2021 23:45:37 GMT
       elapsed-time:
-      - '513'
+      - '603'
       etag:
-      - W/"0x8D96C0151DD20CE"
+      - W/"0x8D96C10444D5EC6"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6d7317b2-09dd-11ec-8ab6-74c63bed1137
+      - 5fe5d088-09ec-11ec-bb5b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:38 GMT
+      - Mon, 30 Aug 2021 23:45:38 GMT
       elapsed-time:
-      - '770'
+      - '1162'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6de155df-09dd-11ec-9570-74c63bed1137
+      - 60676b01-09ec-11ec-8ac1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
index 2205d529348f..43bfd37d0ff6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search205e14df.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C015B14E9DF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C104DB89927\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:52 GMT
+      - Mon, 30 Aug 2021 23:45:52 GMT
       elapsed-time:
-      - '30'
+      - '61'
       etag:
-      - W/"0x8D96C015B14E9DF"
+      - W/"0x8D96C104DB89927"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 76f0777a-09dd-11ec-abca-74c63bed1137
+      - 69abb2a0-09ec-11ec-a986-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search205e14df.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C015BCC748B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C104E7E08CF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:54 GMT
+      - Mon, 30 Aug 2021 23:45:54 GMT
       elapsed-time:
-      - '966'
+      - '999'
       etag:
-      - W/"0x8D96C015BCC748B"
+      - W/"0x8D96C104E7E08CF"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 771802b7-09dd-11ec-8def-74c63bed1137
+      - 69d5a399-09ec-11ec-af0a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:58:54 GMT
+      - Mon, 30 Aug 2021 23:45:55 GMT
       elapsed-time:
-      - '523'
+      - '554'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 77cff177-09dd-11ec-919f-74c63bed1137
+      - 6a9a586d-09ec-11ec-9115-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
index c0c9f75cc36f..f51656b2d781 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search54491a19.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C0164CA8559\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10573031CB\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:09 GMT
+      - Mon, 30 Aug 2021 23:46:08 GMT
       elapsed-time:
-      - '32'
+      - '44'
       etag:
-      - W/"0x8D96C0164CA8559"
+      - W/"0x8D96C10573031CB"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 80a614f8-09dd-11ec-9141-74c63bed1137
+      - 73205fb3-09ec-11ec-9967-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search54491a19.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C01658C243F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C1057B1AE4F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:10 GMT
+      - Mon, 30 Aug 2021 23:46:09 GMT
       elapsed-time:
-      - '946'
+      - '602'
       etag:
-      - W/"0x8D96C01658C243F"
+      - W/"0x8D96C1057B1AE4F"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 80ce13fb-09dd-11ec-b3cd-74c63bed1137
+      - 734a9db8-09ec-11ec-84e1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:11 GMT
+      - Mon, 30 Aug 2021 23:46:10 GMT
       elapsed-time:
-      - '584'
+      - '521'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 818fb488-09dd-11ec-b48d-74c63bed1137
+      - 73cb498f-09ec-11ec-98cc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
index fac6ece31930..b8e22b22fc1c 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searche35313ac.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C016E913B3C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C106464962D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:25 GMT
+      - Mon, 30 Aug 2021 23:46:30 GMT
       elapsed-time:
-      - '34'
+      - '36'
       etag:
-      - W/"0x8D96C016E913B3C"
+      - W/"0x8D96C106464962D"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8a6ea5e6-09dd-11ec-8fb1-74c63bed1137
+      - 8058b3bb-09ec-11ec-84bd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searche35313ac.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C016F0AEE6A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C10652CC57D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:25 GMT
+      - Mon, 30 Aug 2021 23:46:31 GMT
       elapsed-time:
-      - '593'
+      - '1033'
       etag:
-      - W/"0x8D96C016F0AEE6A"
+      - W/"0x8D96C10652CC57D"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8a94b796-09dd-11ec-a1df-74c63bed1137
+      - 807e202e-09ec-11ec-8209-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:27 GMT
+      - Mon, 30 Aug 2021 23:46:33 GMT
       elapsed-time:
-      - '730'
+      - '552'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8b0e5456-09dd-11ec-967e-74c63bed1137
+      - 81481695-09ec-11ec-a2e5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
index 866a7bd8957e..f57dce9e6c59 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search78e216af.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C01781C8AA4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C106E051B05\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:40 GMT
+      - Mon, 30 Aug 2021 23:46:47 GMT
       elapsed-time:
-      - '39'
+      - '37'
       etag:
-      - W/"0x8D96C01781C8AA4"
+      - W/"0x8D96C106E051B05"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 93ea0672-09dd-11ec-9deb-74c63bed1137
+      - 89f58bbb-09ec-11ec-b56c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search78e216af.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0178CC9A0F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C106E939238\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:42 GMT
+      - Mon, 30 Aug 2021 23:46:48 GMT
       elapsed-time:
-      - '935'
+      - '585'
       etag:
-      - W/"0x8D96C0178CC9A0F"
+      - W/"0x8D96C106E939238"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 941fdea1-09dd-11ec-ad47-74c63bed1137
+      - 8a1f1fd8-09ec-11ec-8ee9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:43 GMT
+      - Mon, 30 Aug 2021 23:46:48 GMT
       elapsed-time:
-      - '510'
+      - '542'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 94cfd3b3-09dd-11ec-98ad-74c63bed1137
+      - 8aad551f-09ec-11ec-9305-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
index 68a7ac5d99aa..bf63e9019a52 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C0182423AC5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10779CEBB4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:58 GMT
+      - Mon, 30 Aug 2021 23:47:03 GMT
       elapsed-time:
-      - '72'
+      - '49'
       etag:
-      - W/"0x8D96C0182423AC5"
+      - W/"0x8D96C10779CEBB4"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9e224b57-09dd-11ec-90fc-74c63bed1137
+      - 9384a8df-09ec-11ec-9cd7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0182F7A23C\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C1078189AD2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:59:59 GMT
+      - Mon, 30 Aug 2021 23:47:03 GMT
       elapsed-time:
-      - '913'
+      - '600'
       etag:
-      - W/"0x8D96C0182F7A23C"
+      - W/"0x8D96C1078189AD2"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9e4c1a64-09dd-11ec-b67c-74c63bed1137
+      - 93b62cb4-09ec-11ec-8100-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,7 +121,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C018322B1C8\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10783F8AD5\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -130,11 +130,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:00 GMT
+      - Mon, 30 Aug 2021 23:47:04 GMT
       elapsed-time:
-      - '32'
+      - '45'
       etag:
-      - W/"0x8D96C018322B1C8"
+      - W/"0x8D96C10783F8AD5"
       expires:
       - '-1'
       location:
@@ -146,7 +146,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9efb67d0-09dd-11ec-bd62-74c63bed1137
+      - 94335dcf-09ec-11ec-93aa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -172,7 +172,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0183D30F6B\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C107908F31A\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -181,11 +181,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:01 GMT
+      - Mon, 30 Aug 2021 23:47:05 GMT
       elapsed-time:
-      - '949'
+      - '1103'
       etag:
-      - W/"0x8D96C0183D30F6B"
+      - W/"0x8D96C107908F31A"
       expires:
       - '-1'
       location:
@@ -197,7 +197,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9f26025f-09dd-11ec-937f-74c63bed1137
+      - 9459b615-09ec-11ec-abc6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -243,9 +243,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:01 GMT
+      - Mon, 30 Aug 2021 23:47:06 GMT
       elapsed-time:
-      - '522'
+      - '765'
       expires:
       - '-1'
       odata-version:
@@ -255,7 +255,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9fd72d7b-09dd-11ec-a94d-74c63bed1137
+      - 9523f20a-09ec-11ec-abf7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
index aa76527f625b..e0658e21d5e4 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchca8148f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C018D6FA042\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1082074E23\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:17 GMT
+      - Mon, 30 Aug 2021 23:47:20 GMT
       elapsed-time:
-      - '34'
+      - '37'
       etag:
-      - W/"0x8D96C018D6FA042"
+      - W/"0x8D96C1082074E23"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a93e8aed-09dd-11ec-8ebb-74c63bed1137
+      - 9df86018-09ec-11ec-b821-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searchca8148f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C018DF2F1F8\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C1082C71779\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:18 GMT
+      - Mon, 30 Aug 2021 23:47:21 GMT
       elapsed-time:
-      - '625'
+      - '1033'
       etag:
-      - W/"0x8D96C018DF2F1F8"
+      - W/"0x8D96C1082C71779"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a973d839-09dd-11ec-9ce0-74c63bed1137
+      - 9e21025f-09ec-11ec-96b2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:18 GMT
+      - Mon, 30 Aug 2021 23:47:21 GMT
       elapsed-time:
-      - '522'
+      - '511'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a9f6b09d-09dd-11ec-aafb-74c63bed1137
+      - 9ee127d9-09ec-11ec-8e15-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
index 82d7d2643722..11c140803946 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searche43613c1.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C01972031D8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C108B3CA19C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:33 GMT
+      - Mon, 30 Aug 2021 23:47:35 GMT
       elapsed-time:
-      - '38'
+      - '44'
       etag:
-      - W/"0x8D96C01972031D8"
+      - W/"0x8D96C108B3CA19C"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b2fb55fb-09dd-11ec-ab40-74c63bed1137
+      - a72b8ca9-09ec-11ec-8061-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searche43613c1.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C0197F0040E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C108C01C31F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:34 GMT
+      - Mon, 30 Aug 2021 23:47:37 GMT
       elapsed-time:
-      - '1127'
+      - '1020'
       etag:
-      - W/"0x8D96C0197F0040E"
+      - W/"0x8D96C108C01C31F"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b323574c-09dd-11ec-9741-74c63bed1137
+      - a7570df1-09ec-11ec-afb8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 22:00:35 GMT
+      - Mon, 30 Aug 2021 23:47:38 GMT
       elapsed-time:
-      - '552'
+      - '531'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b3f4e05b-09dd-11ec-ad39-74c63bed1137
+      - a81c2a9e-09ec-11ec-ba8d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_data_source_live.py b/sdk/search/azure-search-documents/tests/test_search_index_client_data_source_live.py
index 16edcbc18fe3..ba7c4d610f7d 100644
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_data_source_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_data_source_live.py
@@ -29,7 +29,6 @@
 except UnicodeDecodeError:
     BATCH = json.load(open(join(CWD, "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 class SearchDataSourcesClientTest(AzureMgmtTestCase):
     FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['api-key']
@@ -39,7 +38,7 @@ def _create_data_source_connection(self, name="sample-datasource"):
         data_source_connection = SearchIndexerDataSourceConnection(
             name=name,
             type="azureblob",
-            connection_string=CONNECTION_STRING,
+            connection_string=self.settings.AZURE_STORAGE_CONNECTION_STRING,
             container=container
         )
         return data_source_connection
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_live.py b/sdk/search/azure-search-documents/tests/test_search_index_client_live.py
index 00f50f101100..c9cf9b2235cf 100644
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_live.py
@@ -32,7 +32,6 @@
 except UnicodeDecodeError:
     BATCH = json.load(open(join(CWD, "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 class SearchIndexClientTest(AzureMgmtTestCase):
     FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['api-key']
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
index f9de06bb28d4..61f5ca9e2afd 100644
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
@@ -31,7 +31,6 @@
 except UnicodeDecodeError:
     BATCH = json.load(open(join(CWD, "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 class SearchSkillsetClientTest(AzureMgmtTestCase):
     FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['api-key']
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_synonym_map_live.py b/sdk/search/azure-search-documents/tests/test_search_index_client_synonym_map_live.py
index 69abe69dd42f..e2fe730c044d 100644
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_synonym_map_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_synonym_map_live.py
@@ -27,7 +27,6 @@
 except UnicodeDecodeError:
     BATCH = json.load(open(join(CWD, "hotel_small.json"), encoding='utf-8'))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 class SearchSynonymMapsClientTest(AzureMgmtTestCase):
     FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['api-key']
diff --git a/sdk/search/azure-search-documents/tests/test_search_indexer_client_live.py b/sdk/search/azure-search-documents/tests/test_search_indexer_client_live.py
index 039742c79b73..bcb046b2c664 100644
--- a/sdk/search/azure-search-documents/tests/test_search_indexer_client_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_indexer_client_live.py
@@ -31,7 +31,6 @@
 except UnicodeDecodeError:
     BATCH = json.load(open(join(CWD, "hotel_small.json"), encoding="utf-8"))
 TIME_TO_SLEEP = 5
-CONNECTION_STRING = 'DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net'
 
 class SearchIndexersClientTest(AzureMgmtTestCase):
     FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['api-key']

From 7bba36eae0b743e6375ecb68b309b987ac73d030 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Tue, 31 Aug 2021 10:01:20 -0700
Subject: [PATCH 06/17] Add client-side validation and tests for model
 properties.

---
 .../documents/indexes/models/_models.py       | 34 ++++++++++++++--
 ...search_index_client_skillset_validation.py | 40 +++++++++++++++++++
 2 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index 898babbea19a..0480da841f71 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -149,7 +149,7 @@ class EntityRecognitionSkill(SearchIndexerSkill):
     :param include_typeless_entities: Determines whether or not to include entities which are well
      known but don't conform to a pre-defined type. If this configuration is not set (default), set
      to null or set to false, entities which don't conform to one of the pre-defined types will not
-     be surfaced.
+     be surfaced. Only valid for skill version 1.
     :type include_typeless_entities: bool
     :param minimum_precision: A value between 0 and 1 that be used to only include entities whose
      confidence score is greater than the value specified. If not set (default), or if explicitly
@@ -157,7 +157,7 @@ class EntityRecognitionSkill(SearchIndexerSkill):
     :type minimum_precision: float
     :param model_version: The version of the model to use when calling the Text Analytics service.
      It will default to the latest available when not specified. We recommend you do not specify
-     this value unless absolutely necessary.
+     this value unless absolutely necessary. Only valid from skill version 3.
     :type model_version: str
     :param skill_version: The version of the skill to use when calling the Text Analytics service.
      It will default to V1 when not specified.
@@ -189,15 +189,24 @@ def __init__(
         self,
         **kwargs
     ):
+        # pop skill_version from kwargs to avoid warning in msrest
+        skill_version = kwargs.pop('skill_version', EntityRecognitionSkillVersion.V1)
+        # client-side validation
+        if skill_version == EntityRecognitionSkillVersion.V1:
+            validate(kwargs, '1', 'model_version')
+        if skill_version in [EntityRecognitionSkillVersion.V3, EntityRecognitionSkillVersion.LATEST]:
+            validate(kwargs, '3', 'include_typeless_entities')
+
         super(EntityRecognitionSkill, self).__init__(**kwargs)
-        self.skill_version = kwargs.get('skill_version', EntityRecognitionSkillVersion.V1)
+        self.skill_version = skill_version
         self.odata_type = self.skill_version  # type: str
         self.categories = kwargs.get('categories', None)
         self.default_language_code = kwargs.get('default_language_code', None)
-        self.include_typeless_entities = kwargs.get('include_typeless_entities', None)
         self.minimum_precision = kwargs.get('minimum_precision', None)
+        self.include_typeless_entities = kwargs.get('include_typeless_entities', None)
         self.model_version = kwargs.get('model_version', None)
 
+
     def _to_generated(self):
         if self.skill_version == EntityRecognitionSkillVersion.V1:
             return _EntityRecognitionSkillV1(
@@ -317,6 +326,13 @@ def __init__(
         self,
         **kwargs
     ):
+        # pop skill_version from kwargs to avoid warning in msrest
+        skill_version = kwargs.pop('skill_version', SentimentSkillVersion.V1)
+
+        # client-side validation
+        if skill_version == SentimentSkillVersion.V1:
+            validate(kwargs, '1', ['include_opinion_mining', 'model_version'])
+
         super(SentimentSkill, self).__init__(**kwargs)
         self.skill_version = kwargs.get('skill_version', SentimentSkillVersion.V1)
         self.odata_type = self.skill_version  # type: str
@@ -931,3 +947,13 @@ def unpack_analyzer(analyzer):
             analyzer
         )
     return analyzer
+
+
+def validate(kwargs, version, unsupported):
+    unsupported = [unsupported] if isinstance(unsupported, str) else unsupported
+    errors = []
+    for param in unsupported:
+        if param in kwargs:
+            errors.append(param)
+    if errors:
+        raise ValueError("Unsupported parameters for skill version {}: {}".format(version, ', '.join(errors)))
\ No newline at end of file
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py
new file mode 100644
index 000000000000..3eb6f91ebdd5
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+
+import pytest
+
+from azure.search.documents.indexes.models import(
+    EntityRecognitionSkill,
+    EntityRecognitionSkillVersion,
+    SentimentSkill,
+    InputFieldMappingEntry,
+    OutputFieldMappingEntry,
+)
+
+
+def test_entity_recogntion_skill_validation():
+    with pytest.raises(ValueError) as err:
+        s1 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")],
+                                    model_version="1")
+    assert 'model_version' in str(err)
+
+    with pytest.raises(ValueError) as err:
+        s2 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV3")],
+                                    skill_version=EntityRecognitionSkillVersion.V3,
+                                    include_typeless_entities=True)
+    assert 'include_typeless_entities' in str(err)
+
+
+def test_sentiment_skill_validation():
+    with pytest.raises(ValueError) as err:
+        skill = SentimentSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                               outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")],
+                               include_opinion_mining=True,
+                               model_version="1")
+    assert 'model_version' in str(err)
+    assert 'include_opinion_mining' in str(err)

From 0b590acf581b87f34481449e5508460b3840523f Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Tue, 31 Aug 2021 11:09:56 -0700
Subject: [PATCH 07/17] Re-record tests.

---
 ...e_async.test_async_get_document_count.yaml |   6 +-
 ...nt_basic_live_async.test_get_document.yaml |  60 +++----
 ..._live_async.test_get_document_missing.yaml |   6 +-
 ..._async.test_delete_documents_existing.yaml |  30 ++--
 ...e_async.test_delete_documents_missing.yaml |  34 ++--
 ...e_async.test_merge_documents_existing.yaml |  34 ++--
 ...ve_async.test_merge_documents_missing.yaml |  36 ++--
 ..._async.test_merge_or_upload_documents.yaml |  34 ++--
 ..._async.test_upload_documents_existing.yaml |  20 +--
 ..._live_async.test_upload_documents_new.yaml |  32 ++--
 ..._async.test_delete_documents_existing.yaml |  24 +--
 ...e_async.test_delete_documents_missing.yaml |  24 +--
 ...e_async.test_merge_documents_existing.yaml |  22 +--
 ...ve_async.test_merge_documents_missing.yaml |  24 +--
 ..._async.test_merge_or_upload_documents.yaml |  24 +--
 ..._async.test_upload_documents_existing.yaml |   6 +-
 ..._live_async.test_upload_documents_new.yaml |  24 +--
 ...t_search_live_async.test_autocomplete.yaml |   6 +-
 ...rch_live_async.test_get_search_counts.yaml |  12 +-
 ...h_live_async.test_get_search_coverage.yaml |  12 +-
 ...ive_async.test_get_search_facets_none.yaml |   6 +-
 ...e_async.test_get_search_facets_result.yaml |   6 +-
 ...rch_live_async.test_get_search_filter.yaml |   6 +-
 ...ve_async.test_get_search_filter_array.yaml |   6 +-
 ...rch_live_async.test_get_search_simple.yaml |  12 +-
 ...async.test_get_search_simple_with_top.yaml |  12 +-
 ...client_search_live_async.test_suggest.yaml |   6 +-
 ...ve_async.test_create_datasource_async.yaml |  10 +-
 ...est_create_or_update_datasource_async.yaml |  46 ++---
 ...ate_or_update_datasource_if_unchanged.yaml |  30 ++--
 ...ve_async.test_delete_datasource_async.yaml |  28 +--
 ...c.test_delete_datasource_if_unchanged.yaml |  28 +--
 ..._live_async.test_get_datasource_async.yaml |  20 +--
 ...live_async.test_list_datasource_async.yaml |  28 +--
 ...x_client_live_async.test_analyze_text.yaml |   6 +-
 ...x_client_live_async.test_create_index.yaml |  10 +-
 ...ive_async.test_create_or_update_index.yaml |  22 +--
 ...create_or_update_indexes_if_unchanged.yaml |  30 ++--
 ...client_live_async.test_delete_indexes.yaml |  12 +-
 ...sync.test_delete_indexes_if_unchanged.yaml |  26 +--
 ...ndex_client_live_async.test_get_index.yaml |  10 +-
 ..._live_async.test_get_index_statistics.yaml |   6 +-
 ...ive_async.test_get_service_statistics.yaml |   6 +-
 ...x_client_live_async.test_list_indexes.yaml |  10 +-
 ...nt_live_async.test_list_indexes_empty.yaml |   6 +-
 ..._async.test_create_or_update_skillset.yaml |  42 ++---
 ...reate_or_update_skillset_if_unchanged.yaml |  28 +--
 ...est_create_or_update_skillset_inplace.yaml |  42 ++---
 ...llset_live_async.test_create_skillset.yaml |  18 +-
 ...llset_live_async.test_delete_skillset.yaml |  36 ++--
 ...ync.test_delete_skillset_if_unchanged.yaml |  31 ++--
 ...skillset_live_async.test_get_skillset.yaml |  30 ++--
 ...killset_live_async.test_get_skillsets.yaml |  28 +--
 ...ync.test_create_or_update_synonym_map.yaml |  46 ++---
 ...ap_live_async.test_create_synonym_map.yaml |  18 +-
 ...ap_live_async.test_delete_synonym_map.yaml |  32 ++--
 ....test_delete_synonym_map_if_unchanged.yaml |  28 +--
 ...m_map_live_async.test_get_synonym_map.yaml |  28 +--
 ..._map_live_async.test_get_synonym_maps.yaml |  30 ++--
 ...client_live_async.test_create_indexer.yaml |  26 +--
 ...e_async.test_create_or_update_indexer.yaml |  26 +--
 ...create_or_update_indexer_if_unchanged.yaml |  26 +--
 ...client_live_async.test_delete_indexer.yaml |  26 +--
 ...sync.test_delete_indexer_if_unchanged.yaml |  26 +--
 ...er_client_live_async.test_get_indexer.yaml |  26 +--
 ...nt_live_async.test_get_indexer_status.yaml |  26 +--
 ...r_client_live_async.test_list_indexer.yaml |  46 ++---
 ..._client_live_async.test_reset_indexer.yaml |  26 +--
 ...er_client_live_async.test_run_indexer.yaml |  26 +--
 ...h_client_basic_live.test_get_document.yaml |  60 +++----
 ...nt_basic_live.test_get_document_count.yaml |   6 +-
 ..._basic_live.test_get_document_missing.yaml |   6 +-
 ...r_live.test_delete_documents_existing.yaml |  34 ++--
 ...er_live.test_delete_documents_missing.yaml |  30 ++--
 ...er_live.test_merge_documents_existing.yaml |  34 ++--
 ...der_live.test_merge_documents_missing.yaml |  34 ++--
 ...r_live.test_merge_or_upload_documents.yaml |  34 ++--
 ...r_live.test_upload_documents_existing.yaml |  22 +--
 ...sender_live.test_upload_documents_new.yaml |  34 ++--
 ...t_live.test_delete_documents_existing.yaml |  24 +--
 ...nt_live.test_delete_documents_missing.yaml |  22 +--
 ...nt_live.test_merge_documents_existing.yaml |  20 +--
 ...ent_live.test_merge_documents_missing.yaml |  24 +--
 ...t_live.test_merge_or_upload_documents.yaml |  24 +--
 ...t_live.test_upload_documents_existing.yaml |   4 +-
 ...cument_live.test_upload_documents_new.yaml |  24 +--
 ..._client_search_live.test_autocomplete.yaml |   6 +-
 ...nt_search_live.test_get_search_counts.yaml |  12 +-
 ..._search_live.test_get_search_coverage.yaml |  10 +-
 ...arch_live.test_get_search_facets_none.yaml |   6 +-
 ...ch_live.test_get_search_facets_result.yaml |   6 +-
 ...nt_search_live.test_get_search_filter.yaml |   6 +-
 ...rch_live.test_get_search_filter_array.yaml |   6 +-
 ...nt_search_live.test_get_search_simple.yaml |  12 +-
 ..._live.test_get_search_simple_with_top.yaml |  12 +-
 ...earch_client_search_live.test_suggest.yaml |   6 +-
 ...ta_source_live.test_create_datasource.yaml |  10 +-
 ...live.test_create_or_update_datasource.yaml |  46 ++---
 ...ate_or_update_datasource_if_unchanged.yaml |  30 ++--
 ...ta_source_live.test_delete_datasource.yaml |  28 +--
 ...e.test_delete_datasource_if_unchanged.yaml |  28 +--
 ...delete_datasource_string_if_unchanged.yaml |  20 +--
 ..._data_source_live.test_get_datasource.yaml |  20 +--
 ...data_source_live.test_list_datasource.yaml |  28 +--
 ...h_index_client_live.test_analyze_text.yaml |   6 +-
 ...h_index_client_live.test_create_index.yaml |  10 +-
 ...ient_live.test_create_or_update_index.yaml |  20 +--
 ...create_or_update_indexes_if_unchanged.yaml |  30 ++--
 ...index_client_live.test_delete_indexes.yaml |  12 +-
 ...live.test_delete_indexes_if_unchanged.yaml |  28 +--
 ...arch_index_client_live.test_get_index.yaml |  10 +-
 ...client_live.test_get_index_statistics.yaml |   6 +-
 ...ient_live.test_get_service_statistics.yaml |   6 +-
 ...h_index_client_live.test_list_indexes.yaml |   8 +-
 ...x_client_live.test_list_indexes_empty.yaml |   6 +-
 ...t_live.test_create_or_update_skillset.yaml |  38 ++--
 ...reate_or_update_skillset_if_unchanged.yaml |  28 +--
 ...est_create_or_update_skillset_inplace.yaml |  38 ++--
 ...nt_skillset_live.test_create_skillset.yaml |  16 +-
 ...nt_skillset_live.test_delete_skillset.yaml |  28 +--
 ...ive.test_delete_skillset_if_unchanged.yaml |  26 +--
 ...lient_skillset_live.test_get_skillset.yaml |  28 +--
 ...ient_skillset_live.test_get_skillsets.yaml |  28 +--
 ...ive.test_create_or_update_synonym_map.yaml |  44 ++---
 ...te_or_update_synonym_map_if_unchanged.yaml |  30 ++--
 ...onym_map_live.test_create_synonym_map.yaml |  18 +-
 ...onym_map_live.test_delete_synonym_map.yaml |  30 ++--
 ....test_delete_synonym_map_if_unchanged.yaml |  28 +--
 ...synonym_map_live.test_get_synonym_map.yaml |  28 +--
 ...ynonym_map_live.test_get_synonym_maps.yaml |  30 ++--
 ...dexer_client_live.test_create_indexer.yaml | 162 ------------------
 ...nt_live.test_create_or_update_indexer.yaml |  26 +--
 ...create_or_update_indexer_if_unchanged.yaml |  26 +--
 ...dexer_client_live.test_delete_indexer.yaml |  26 +--
 ...live.test_delete_indexer_if_unchanged.yaml |  26 +--
 ..._indexer_client_live.test_get_indexer.yaml | 162 ------------------
 ...r_client_live.test_get_indexer_status.yaml |  26 +--
 ...indexer_client_live.test_list_indexer.yaml |  46 ++---
 ...ndexer_client_live.test_reset_indexer.yaml |  26 +--
 ..._indexer_client_live.test_run_indexer.yaml |  26 +--
 140 files changed, 1554 insertions(+), 1881 deletions(-)
 delete mode 100644 sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
 delete mode 100644 sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml

diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml
index e535fef7b563..cb97aec0b41a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_async_get_document_count.yaml
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:26:59 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:24:25 GMT
+      elapsed-time: '3'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a1675905-09d0-11ec-979d-74c63bed1137
+      request-id: 4ba7b53c-0a80-11ec-9a00-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml
index 0b5f8fc0533b..3a3accf5274a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document.yaml
@@ -22,13 +22,13 @@ interactions:
       cache-control: no-cache
       content-length: '748'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '91'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '88'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a9dd7b3a-09d0-11ec-b994-74c63bed1137
+      request-id: 5365491a-0a80-11ec-8853-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -53,13 +53,13 @@ interactions:
       cache-control: no-cache
       content-length: '449'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa0661d1-09d0-11ec-aa48-74c63bed1137
+      request-id: 538b2d9f-0a80-11ec-9e90-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -83,13 +83,13 @@ interactions:
       cache-control: no-cache
       content-length: '438'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa0e4995-09d0-11ec-a343-74c63bed1137
+      request-id: 5391c3fe-0a80-11ec-b2bf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -113,13 +113,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa156b1b-09d0-11ec-a1a1-74c63bed1137
+      request-id: 5398b074-0a80-11ec-af29-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -143,13 +143,13 @@ interactions:
       cache-control: no-cache
       content-length: '424'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa1d3e77-09d0-11ec-8fda-74c63bed1137
+      request-id: 53a1ac97-0a80-11ec-96b4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -173,13 +173,13 @@ interactions:
       cache-control: no-cache
       content-length: '301'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa24bf02-09d0-11ec-a46b-74c63bed1137
+      request-id: 53a8edac-0a80-11ec-91aa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -204,13 +204,13 @@ interactions:
       cache-control: no-cache
       content-length: '357'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa2cd2a2-09d0-11ec-a8b7-74c63bed1137
+      request-id: 53b0436a-0a80-11ec-a764-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -236,13 +236,13 @@ interactions:
       cache-control: no-cache
       content-length: '411'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa3404e3-09d0-11ec-b50f-74c63bed1137
+      request-id: 53b7414b-0a80-11ec-bf95-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -282,13 +282,13 @@ interactions:
       cache-control: no-cache
       content-length: '1061'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '8'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa3cdc29-09d0-11ec-acef-74c63bed1137
+      request-id: 53bf0a95-0a80-11ec-a45a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -324,13 +324,13 @@ interactions:
       cache-control: no-cache
       content-length: '938'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:14 GMT
-      elapsed-time: '7'
+      date: Tue, 31 Aug 2021 17:24:39 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: aa45a33d-09d0-11ec-8ed8-74c63bed1137
+      request-id: 53c6f174-0a80-11ec-b849-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml
index d6c36dc5c542..5b77395d383d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_basic_live_async.test_get_document_missing.yaml
@@ -14,11 +14,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:27:28 GMT
-      elapsed-time: '88'
+      date: Tue, 31 Aug 2021 17:24:52 GMT
+      elapsed-time: '93'
       expires: '-1'
       pragma: no-cache
-      request-id: b1c169fd-09d0-11ec-b98d-74c63bed1137
+      request-id: 5aef8164-0a80-11ec-a188-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml
index 22c133b935e1..df2835d46a55 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_existing.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://searchaf051f3d.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaf051f3d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF49B268E93\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchaf051f3d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA442FD08AD\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:27:40 GMT
+      date: Tue, 31 Aug 2021 17:25:04 GMT
       elapsed-time: '28'
-      etag: W/"0x8D96BF49B268E93"
+      etag: W/"0x8D96CA442FD08AD"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b90df38b-09d0-11ec-88f3-74c63bed1137
+      request-id: 6210346e-0a80-11ec-b615-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:40 GMT
-      elapsed-time: '25'
+      date: Tue, 31 Aug 2021 17:25:04 GMT
+      elapsed-time: '122'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b92ba6dc-09d0-11ec-9fac-74c63bed1137
+      request-id: 623b3bba-0a80-11ec-89fc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:27:43 GMT
-      elapsed-time: '105'
+      date: Tue, 31 Aug 2021 17:25:07 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: bb13ed34-09d0-11ec-a3d9-74c63bed1137
+      request-id: 64315bbc-0a80-11ec-8a7a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -107,11 +107,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:27:43 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:25:07 GMT
+      elapsed-time: '3'
       expires: '-1'
       pragma: no-cache
-      request-id: bb43b340-09d0-11ec-bd3b-74c63bed1137
+      request-id: 6448b1e9-0a80-11ec-9865-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -132,11 +132,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:27:43 GMT
+      date: Tue, 31 Aug 2021 17:25:07 GMT
       elapsed-time: '3'
       expires: '-1'
       pragma: no-cache
-      request-id: bb4b2d88-09d0-11ec-ad94-74c63bed1137
+      request-id: 644f8deb-0a80-11ec-bdaa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml
index 94c15df25990..b047edb4259b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_delete_documents_missing.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://search8fba1ecc.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8fba1ecc.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4A4A706BF\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search8fba1ecc.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA44CC84FD8\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
-      content-length: '1180'
+      content-length: '1181'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:27:56 GMT
-      elapsed-time: '21'
-      etag: W/"0x8D96BF4A4A706BF"
+      date: Tue, 31 Aug 2021 17:25:20 GMT
+      elapsed-time: '52'
+      etag: W/"0x8D96CA44CC84FD8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c2925b1a-09d0-11ec-8a47-74c63bed1137
+      request-id: 6bdd4477-0a80-11ec-8ce3-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:27:56 GMT
-      elapsed-time: '104'
+      date: Tue, 31 Aug 2021 17:25:20 GMT
+      elapsed-time: '259'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c2b7afd6-09d0-11ec-b357-74c63bed1137
+      request-id: 6bfdf019-0a80-11ec-b4ef-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:27:59 GMT
-      elapsed-time: '81'
+      date: Tue, 31 Aug 2021 17:25:24 GMT
+      elapsed-time: '93'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: c4ac3462-09d0-11ec-9c34-74c63bed1137
+      request-id: 6e112b06-0a80-11ec-9a47-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -107,11 +107,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:27:59 GMT
+      date: Tue, 31 Aug 2021 17:25:24 GMT
       elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: c4d286e1-09d0-11ec-aed7-74c63bed1137
+      request-id: 6e395100-0a80-11ec-b072-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -132,11 +132,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:27:59 GMT
-      elapsed-time: '7'
+      date: Tue, 31 Aug 2021 17:25:24 GMT
+      elapsed-time: '4'
       expires: '-1'
       pragma: no-cache
-      request-id: c4d93d8a-09d0-11ec-a821-74c63bed1137
+      request-id: 6e418372-0a80-11ec-bdf2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml
index 225a94be532d..405f36f61bee 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_existing.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://search909e1eda.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search909e1eda.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4AE04D532\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search909e1eda.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA456EA2AFB\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1181'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:28:11 GMT
-      elapsed-time: '21'
-      etag: W/"0x8D96BF4AE04D532"
+      date: Tue, 31 Aug 2021 17:25:37 GMT
+      elapsed-time: '43'
+      etag: W/"0x8D96CA456EA2AFB"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cbef67b8-09d0-11ec-b03e-74c63bed1137
+      request-id: 7619bc79-0a80-11ec-8147-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:12 GMT
-      elapsed-time: '112'
+      date: Tue, 31 Aug 2021 17:25:38 GMT
+      elapsed-time: '123'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cc0a126c-09d0-11ec-ac43-74c63bed1137
+      request-id: 763ed7c2-0a80-11ec-9f98-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:28:15 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:25:40 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cdfecf44-09d0-11ec-bf29-74c63bed1137
+      request-id: 7833e283-0a80-11ec-af69-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -109,13 +109,13 @@ interactions:
       cache-control: no-cache
       content-length: '438'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:15 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:25:40 GMT
+      elapsed-time: '16'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ce21fdd8-09d0-11ec-b174-74c63bed1137
+      request-id: 784e2b2f-0a80-11ec-ae9d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -139,13 +139,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:15 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:25:40 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ce2954ef-09d0-11ec-a6df-74c63bed1137
+      request-id: 78575ee8-0a80-11ec-945c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml
index b51dc6900608..f48dcb365f27 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_documents_missing.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://search71b61e69.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b61e69.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4B7CB63ED\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search71b61e69.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA4606E4A17\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
-      content-length: '1183'
+      content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:28:28 GMT
-      elapsed-time: '29'
-      etag: W/"0x8D96BF4B7CB63ED"
+      date: Tue, 31 Aug 2021 17:25:54 GMT
+      elapsed-time: '425'
+      etag: W/"0x8D96CA4606E4A17"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d5b3c7e2-09d0-11ec-9ff9-74c63bed1137
+      request-id: 7fb58efa-0a80-11ec-9522-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -51,13 +51,13 @@ interactions:
       cache-control: no-cache
       content-length: '225'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:28 GMT
-      elapsed-time: '94'
+      date: Tue, 31 Aug 2021 17:25:54 GMT
+      elapsed-time: '102'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d5dd5e1c-09d0-11ec-a273-74c63bed1137
+      request-id: 801b3381-0a80-11ec-a0be-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -80,13 +80,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:28:31 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:25:57 GMT
+      elapsed-time: '91'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d7ce20df-09d0-11ec-bfca-74c63bed1137
+      request-id: 820cf909-0a80-11ec-afc7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -108,11 +108,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:28:31 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:25:57 GMT
+      elapsed-time: '6'
       expires: '-1'
       pragma: no-cache
-      request-id: d7e7407a-09d0-11ec-bcc6-74c63bed1137
+      request-id: 8231facb-0a80-11ec-a438-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -135,13 +135,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:31 GMT
-      elapsed-time: '10'
+      date: Tue, 31 Aug 2021 17:25:57 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d7ed82a5-09d0-11ec-ada8-74c63bed1137
+      request-id: 82393852-0a80-11ec-b2bd-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml
index f5b17fcaaaec..7b1d2382cc56 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_merge_or_upload_documents.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://searchaf391f34.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaf391f34.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4C1552CA1\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchaf391f34.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA46A9E0A71\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:28:44 GMT
-      elapsed-time: '18'
-      etag: W/"0x8D96BF4C1552CA1"
+      date: Tue, 31 Aug 2021 17:26:10 GMT
+      elapsed-time: '31'
+      etag: W/"0x8D96CA46A9E0A71"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: df3d436c-09d0-11ec-96be-74c63bed1137
+      request-id: 89b47dcb-0a80-11ec-b1f1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:44 GMT
-      elapsed-time: '151'
+      date: Tue, 31 Aug 2021 17:26:10 GMT
+      elapsed-time: '139'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: df5faeaf-09d0-11ec-b02b-74c63bed1137
+      request-id: 89d25e31-0a80-11ec-aca6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:28:47 GMT
-      elapsed-time: '6'
+      date: Tue, 31 Aug 2021 17:26:14 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e15b1963-09d0-11ec-99ef-74c63bed1137
+      request-id: 8bcb7942-0a80-11ec-9670-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -108,13 +108,13 @@ interactions:
       cache-control: no-cache
       content-length: '257'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:47 GMT
-      elapsed-time: '15'
+      date: Tue, 31 Aug 2021 17:26:14 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e173a9dd-09d0-11ec-9249-74c63bed1137
+      request-id: 8be3401f-0a80-11ec-863f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:28:47 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:26:14 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e17c2767-09d0-11ec-9855-74c63bed1137
+      request-id: 8beaff76-0a80-11ec-a22c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml
index 25f0537f606a..baeab8f8bc4a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_existing.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://searchb0ef1f4f.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0ef1f4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4CAB9B311\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchb0ef1f4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA474B0C7E3\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:29:00 GMT
-      elapsed-time: '19'
-      etag: W/"0x8D96BF4CAB9B311"
+      date: Tue, 31 Aug 2021 17:26:27 GMT
+      elapsed-time: '29'
+      etag: W/"0x8D96CA474B0C7E3"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e8a5dcff-09d0-11ec-80d1-74c63bed1137
+      request-id: 93b3e27b-0a80-11ec-baf2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -51,13 +51,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:29:00 GMT
-      elapsed-time: '119'
+      date: Tue, 31 Aug 2021 17:26:27 GMT
+      elapsed-time: '141'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e8c051d9-09d0-11ec-bad6-74c63bed1137
+      request-id: 93d47474-0a80-11ec-a9f5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -80,13 +80,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:29:03 GMT
+      date: Tue, 31 Aug 2021 17:26:30 GMT
       elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: eac6005a-09d0-11ec-9a03-74c63bed1137
+      request-id: 95dc9ed2-0a80-11ec-a05b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml
index 5361981802e6..36efece0ef04 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_buffered_sender_live_async.test_upload_documents_new.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://search18931d2e.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search18931d2e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF4D40CF868\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search18931d2e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA47F29AC95\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1182'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:29:15 GMT
-      elapsed-time: '27'
-      etag: W/"0x8D96BF4D40CF868"
+      date: Tue, 31 Aug 2021 17:26:45 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96CA47F29AC95"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f1fa10c2-09d0-11ec-824b-74c63bed1137
+      request-id: 9e57b0ba-0a80-11ec-af45-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -51,13 +51,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:29:15 GMT
-      elapsed-time: '102'
+      date: Tue, 31 Aug 2021 17:26:45 GMT
+      elapsed-time: '121'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f2188973-09d0-11ec-bedb-74c63bed1137
+      request-id: 9e77751e-0a80-11ec-b59c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -80,13 +80,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:29:19 GMT
-      elapsed-time: '6'
+      date: Tue, 31 Aug 2021 17:26:49 GMT
+      elapsed-time: '164'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f40b09f2-09d0-11ec-906f-74c63bed1137
+      request-id: a06e4101-0a80-11ec-b9af-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -109,13 +109,13 @@ interactions:
       cache-control: no-cache
       content-length: '267'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:29:19 GMT
+      date: Tue, 31 Aug 2021 17:26:49 GMT
       elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f42da44a-09d0-11ec-8ce4-74c63bed1137
+      request-id: a0afdedd-0a80-11ec-9ffd-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '268'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:29:19 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:26:49 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f43639b1-09d0-11ec-b93a-74c63bed1137
+      request-id: a0b836d0-0a80-11ec-a4ed-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml
index 0e72dfcef568..568cccab28e9 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_existing.yaml
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:29:32 GMT
-      elapsed-time: '112'
+      date: Tue, 31 Aug 2021 17:27:02 GMT
+      elapsed-time: '105'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fbb71f2d-09d0-11ec-94ef-74c63bed1137
+      request-id: a8621f01-0a80-11ec-93ca-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:29:35 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:27:05 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fdab6122-09d0-11ec-b9f0-74c63bed1137
+      request-id: aa64caed-0a80-11ec-9426-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -77,11 +77,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:29:35 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:27:05 GMT
+      elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: fdb2e83e-09d0-11ec-9270-74c63bed1137
+      request-id: aa6c8200-0a80-11ec-842d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -102,11 +102,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:29:35 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:27:05 GMT
+      elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: fdb9d41d-09d0-11ec-a4b9-74c63bed1137
+      request-id: aa732497-0a80-11ec-9e2b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml
index e20618921f19..f81bd50ffefe 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_delete_documents_missing.yaml
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:29:48 GMT
-      elapsed-time: '105'
+      date: Tue, 31 Aug 2021 17:27:19 GMT
+      elapsed-time: '129'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 057cd58e-09d1-11ec-b000-74c63bed1137
+      request-id: b2e24ca8-0a80-11ec-825e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '126'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:29:51 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:27:22 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0774d741-09d1-11ec-bc2f-74c63bed1137
+      request-id: b4e69876-0a80-11ec-83a8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -77,11 +77,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:29:51 GMT
-      elapsed-time: '3'
+      date: Tue, 31 Aug 2021 17:27:22 GMT
+      elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: 077b8c28-09d1-11ec-9855-74c63bed1137
+      request-id: b4ed279e-0a80-11ec-b5ae-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -102,11 +102,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:29:51 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:27:22 GMT
+      elapsed-time: '4'
       expires: '-1'
       pragma: no-cache
-      request-id: 0781f577-09d1-11ec-9fb2-74c63bed1137
+      request-id: b4f38c4d-0a80-11ec-86a2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml
index aa13186ca3a8..bd38c27dd3a6 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_existing.yaml
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '190'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:05 GMT
-      elapsed-time: '21'
+      date: Tue, 31 Aug 2021 17:27:37 GMT
+      elapsed-time: '125'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0fcb593c-09d1-11ec-9423-74c63bed1137
+      request-id: bd3fad91-0a80-11ec-bbb4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:30:08 GMT
+      date: Tue, 31 Aug 2021 17:27:40 GMT
       elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 11b576b9-09d1-11ec-aa3b-74c63bed1137
+      request-id: bf4576ec-0a80-11ec-a696-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '438'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:08 GMT
-      elapsed-time: '10'
+      date: Tue, 31 Aug 2021 17:27:40 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 11bc52c6-09d1-11ec-a093-74c63bed1137
+      request-id: bf4cb0e5-0a80-11ec-a2ae-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -109,13 +109,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:08 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:27:40 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 11c3f1d6-09d1-11ec-9218-74c63bed1137
+      request-id: bf56213e-0a80-11ec-9fa0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml
index 68a3ee05ff59..beb45008661a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_documents_missing.yaml
@@ -21,13 +21,13 @@ interactions:
       cache-control: no-cache
       content-length: '225'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:21 GMT
-      elapsed-time: '26'
+      date: Tue, 31 Aug 2021 17:27:53 GMT
+      elapsed-time: '127'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 195aab78-09d1-11ec-92e1-74c63bed1137
+      request-id: c709129c-0a80-11ec-b22b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:30:24 GMT
-      elapsed-time: '6'
+      date: Tue, 31 Aug 2021 17:27:56 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1b41e979-09d1-11ec-af87-74c63bed1137
+      request-id: c9005099-0a80-11ec-9984-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,11 +78,11 @@ interactions:
     headers:
       cache-control: no-cache
       content-length: '0'
-      date: Mon, 30 Aug 2021 20:30:24 GMT
-      elapsed-time: '4'
+      date: Tue, 31 Aug 2021 17:27:56 GMT
+      elapsed-time: '5'
       expires: '-1'
       pragma: no-cache
-      request-id: 1b49b761-09d1-11ec-9350-74c63bed1137
+      request-id: c9071e84-0a80-11ec-a0b4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 404
@@ -105,13 +105,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:24 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:27:56 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1b50bb4a-09d1-11ec-a692-74c63bed1137
+      request-id: c90e613a-0a80-11ec-8c34-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml
index c0d43bfc5083..40baad25c1be 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_merge_or_upload_documents.yaml
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:41 GMT
-      elapsed-time: '43'
+      date: Tue, 31 Aug 2021 17:28:10 GMT
+      elapsed-time: '124'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 25117279-09d1-11ec-a1c1-74c63bed1137
+      request-id: d10d54c7-0a80-11ec-95fa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -49,13 +49,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:30:44 GMT
-      elapsed-time: '14'
+      date: Tue, 31 Aug 2021 17:28:13 GMT
+      elapsed-time: '4'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 270837ba-09d1-11ec-9d29-74c63bed1137
+      request-id: d302681e-0a80-11ec-ae66-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,13 +78,13 @@ interactions:
       cache-control: no-cache
       content-length: '257'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:44 GMT
-      elapsed-time: '21'
+      date: Tue, 31 Aug 2021 17:28:13 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 27106eae-09d1-11ec-912c-74c63bed1137
+      request-id: d308abc2-0a80-11ec-b02c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -108,13 +108,13 @@ interactions:
       cache-control: no-cache
       content-length: '422'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:30:44 GMT
-      elapsed-time: '11'
+      date: Tue, 31 Aug 2021 17:28:13 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 271a1366-09d1-11ec-89f0-74c63bed1137
+      request-id: d30f6034-0a80-11ec-8905-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml
index 70bb4bd98cfa..bc102ae50da3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_existing.yaml
@@ -21,13 +21,13 @@ interactions:
       cache-control: no-cache
       content-length: '196'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:00 GMT
-      elapsed-time: '131'
+      date: Tue, 31 Aug 2021 17:28:25 GMT
+      elapsed-time: '123'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 302226c4-09d1-11ec-a993-74c63bed1137
+      request-id: dab3d0ff-0a80-11ec-9330-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml
index 91eaf00da4af..9d1c7a7be0fb 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_index_document_live_async.test_upload_documents_new.yaml
@@ -21,13 +21,13 @@ interactions:
       cache-control: no-cache
       content-length: '193'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:14 GMT
-      elapsed-time: '186'
+      date: Tue, 31 Aug 2021 17:28:40 GMT
+      elapsed-time: '131'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 389345d5-09d1-11ec-b127-74c63bed1137
+      request-id: e312976c-0a80-11ec-b01b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -50,13 +50,13 @@ interactions:
       cache-control: no-cache
       content-length: '127'
       content-type: text/plain
-      date: Mon, 30 Aug 2021 20:31:17 GMT
-      elapsed-time: '12'
+      date: Tue, 31 Aug 2021 17:28:43 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3a9fc944-09d1-11ec-85f6-74c63bed1137
+      request-id: e508d8c8-0a80-11ec-b49e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,13 +79,13 @@ interactions:
       cache-control: no-cache
       content-length: '267'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:17 GMT
-      elapsed-time: '20'
+      date: Tue, 31 Aug 2021 17:28:43 GMT
+      elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3aa9db94-09d1-11ec-ba6e-74c63bed1137
+      request-id: e51095be-0a80-11ec-b2bf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -108,13 +108,13 @@ interactions:
       cache-control: no-cache
       content-length: '268'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:17 GMT
-      elapsed-time: '11'
+      date: Tue, 31 Aug 2021 17:28:43 GMT
+      elapsed-time: '5'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3ab3ed0b-09d1-11ec-a5ac-74c63bed1137
+      request-id: e519fb52-0a80-11ec-9a63-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml
index 4be2dbdb2756..fde6efc8f8df 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_autocomplete.yaml
@@ -19,13 +19,13 @@ interactions:
       cache-control: no-cache
       content-length: '163'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:30 GMT
-      elapsed-time: '192'
+      date: Tue, 31 Aug 2021 17:28:57 GMT
+      elapsed-time: '167'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 425e600d-09d1-11ec-8135-74c63bed1137
+      request-id: ed35860a-0a80-11ec-ad09-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml
index 4df9a7fb1651..c82be458d381 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_counts.yaml
@@ -62,13 +62,13 @@ interactions:
       cache-control: no-cache
       content-length: '2378'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:45 GMT
-      elapsed-time: '180'
+      date: Tue, 31 Aug 2021 17:29:12 GMT
+      elapsed-time: '77'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4acd7a6f-09d1-11ec-8ad2-74c63bed1137
+      request-id: f5ea01aa-0a80-11ec-98a3-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '2387'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:45 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:29:12 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4b03a7c1-09d1-11ec-9361-74c63bed1137
+      request-id: f61028b1-0a80-11ec-96c2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml
index 011427ec7108..fd2817baf984 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_coverage.yaml
@@ -62,13 +62,13 @@ interactions:
       cache-control: no-cache
       content-length: '2378'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:58 GMT
-      elapsed-time: '22'
+      date: Tue, 31 Aug 2021 17:29:25 GMT
+      elapsed-time: '24'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 531cb46c-09d1-11ec-b225-74c63bed1137
+      request-id: fe0980ac-0a80-11ec-b00c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -138,13 +138,13 @@ interactions:
       cache-control: no-cache
       content-length: '2391'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:31:58 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:29:25 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 53518606-09d1-11ec-a501-74c63bed1137
+      request-id: fe375ce0-0a80-11ec-9039-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml
index e30e25aa53e8..5c65e9c4eba4 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_none.yaml
@@ -29,13 +29,13 @@ interactions:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:32:12 GMT
-      elapsed-time: '18'
+      date: Tue, 31 Aug 2021 17:29:44 GMT
+      elapsed-time: '356'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5b3f137b-09d1-11ec-957d-74c63bed1137
+      request-id: 0910f289-0a81-11ec-8b42-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml
index ec19bafbeb5e..85b2377cf2b3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_facets_result.yaml
@@ -29,13 +29,13 @@ interactions:
       cache-control: no-cache
       content-length: '646'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:32:25 GMT
-      elapsed-time: '154'
+      date: Tue, 31 Aug 2021 17:30:00 GMT
+      elapsed-time: '225'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 63481cae-09d1-11ec-a72a-74c63bed1137
+      request-id: 12e721c5-0a81-11ec-9993-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml
index afc252355415..aa53aa78b384 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter.yaml
@@ -26,13 +26,13 @@ interactions:
       cache-control: no-cache
       content-length: '442'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:32:39 GMT
-      elapsed-time: '94'
+      date: Tue, 31 Aug 2021 17:30:14 GMT
+      elapsed-time: '333'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6b49803b-09d1-11ec-8837-74c63bed1137
+      request-id: 1b66ba12-0a81-11ec-bbeb-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml
index 6131641f11c1..4cf952b7a611 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_filter_array.yaml
@@ -26,13 +26,13 @@ interactions:
       cache-control: no-cache
       content-length: '442'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:32:53 GMT
-      elapsed-time: '94'
+      date: Tue, 31 Aug 2021 17:30:29 GMT
+      elapsed-time: '156'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7372be5b-09d1-11ec-a36c-74c63bed1137
+      request-id: 24456c7e-0a81-11ec-83ec-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml
index 7c934ab4e7e0..7643f3a5073c 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple.yaml
@@ -62,13 +62,13 @@ interactions:
       cache-control: no-cache
       content-length: '2378'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:33:07 GMT
-      elapsed-time: '130'
+      date: Tue, 31 Aug 2021 17:30:45 GMT
+      elapsed-time: '145'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7c20428a-09d1-11ec-8d30-74c63bed1137
+      request-id: 2d499c69-0a81-11ec-9c7b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -114,13 +114,13 @@ interactions:
       cache-control: no-cache
       content-length: '1269'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:33:07 GMT
-      elapsed-time: '7'
+      date: Tue, 31 Aug 2021 17:30:45 GMT
+      elapsed-time: '9'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7c5123e1-09d1-11ec-9009-74c63bed1137
+      request-id: 2d8777e9-0a81-11ec-8d65-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml
index 26587362c2a3..984d86707e10 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_get_search_simple_with_top.yaml
@@ -34,13 +34,13 @@ interactions:
       cache-control: no-cache
       content-length: '1174'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:33:23 GMT
-      elapsed-time: '181'
+      date: Tue, 31 Aug 2021 17:30:59 GMT
+      elapsed-time: '144'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8574de1a-09d1-11ec-bf8c-74c63bed1137
+      request-id: 35a13007-0a81-11ec-bb27-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -86,13 +86,13 @@ interactions:
       cache-control: no-cache
       content-length: '1269'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:33:23 GMT
-      elapsed-time: '8'
+      date: Tue, 31 Aug 2021 17:30:59 GMT
+      elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 85b9110c-09d1-11ec-a987-74c63bed1137
+      request-id: 35de9c68-0a81-11ec-a576-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml
index 7d6a95413415..78e19e3b67ec 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_client_search_live_async.test_suggest.yaml
@@ -20,13 +20,13 @@ interactions:
       cache-control: no-cache
       content-length: '216'
       content-type: application/json; odata.metadata=none
-      date: Mon, 30 Aug 2021 20:33:37 GMT
-      elapsed-time: '137'
+      date: Tue, 31 Aug 2021 17:31:12 GMT
+      elapsed-time: '319'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8e2017db-09d1-11ec-a442-74c63bed1137
+      request-id: 3d8de36f-0a81-11ec-beb5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
index f7736cc84f6d..58f13b6ececb 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchb0841f28.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0841f28.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C11145E4933\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb0841f28.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA5290F357E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:26 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D96C11145E4933"
+      date: Tue, 31 Aug 2021 17:31:26 GMT
+      elapsed-time: '261'
+      etag: W/"0x8D96CA5290F357E"
       expires: '-1'
       location: https://searchb0841f28.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 304be049-09ed-11ec-befa-74c63bed1137
+      request-id: 45b6e68d-0a81-11ec-879f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
index 7591ad67d6fe..3d4227be7a30 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C111C67DE89\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA531E114EC\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:39 GMT
-      elapsed-time: '45'
-      etag: W/"0x8D96C111C67DE89"
+      date: Tue, 31 Aug 2021 17:31:41 GMT
+      elapsed-time: '69'
+      etag: W/"0x8D96CA531E114EC"
       expires: '-1'
       location: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3860df85-09ed-11ec-9fb5-74c63bed1137
+      request-id: 4eb1b67f-0a81-11ec-a63a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C111C67DE89\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA531E114EC\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
       content-length: '380'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:39 GMT
-      elapsed-time: '14'
+      date: Tue, 31 Aug 2021 17:31:41 GMT
+      elapsed-time: '89'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 38818982-09ed-11ec-b2d2-74c63bed1137
+      request-id: 4ed93a40-0a81-11ec-95cc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -83,19 +83,19 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C111C7BDF60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA53203E7B9\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:39 GMT
-      elapsed-time: '35'
-      etag: W/"0x8D96C111C7BDF60"
+      date: Tue, 31 Aug 2021 17:31:41 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96CA53203E7B9"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 38899e47-09ed-11ec-bf11-74c63bed1137
+      request-id: 4eed8a3e-0a81-11ec-a4c4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -113,18 +113,18 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C111C7BDF60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA53203E7B9\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
       content-length: '387'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:39 GMT
-      elapsed-time: '12'
+      date: Tue, 31 Aug 2021 17:31:41 GMT
+      elapsed-time: '15'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 3895c7dc-09ed-11ec-b1fa-74c63bed1137
+      request-id: 4efba3bb-0a81-11ec-9958-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -142,19 +142,19 @@ interactions:
     uri: https://searchfed3234a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C111C7BDF60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfed3234a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA53203E7B9\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:39 GMT
-      elapsed-time: '12'
-      etag: W/"0x8D96C111C7BDF60"
+      date: Tue, 31 Aug 2021 17:31:41 GMT
+      elapsed-time: '11'
+      etag: W/"0x8D96CA53203E7B9"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 389e0d3f-09ed-11ec-aa9e-74c63bed1137
+      request-id: 4f044989-0a81-11ec-9678-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
index 073256cc7ee1..ce82378e5e74 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_create_or_update_datasource_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search802607.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1124D59F12\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA53A6C3D08\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '405'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:53 GMT
-      elapsed-time: '67'
-      etag: W/"0x8D96C1124D59F12"
+      date: Tue, 31 Aug 2021 17:31:55 GMT
+      elapsed-time: '163'
+      etag: W/"0x8D96CA53A6C3D08"
       expires: '-1'
       location: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 40b90ae1-09ed-11ec-bbdd-74c63bed1137
+      request-id: 57292ef7-0a81-11ec-b719-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,19 +54,19 @@ interactions:
     uri: https://search802607.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1124E8B556\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search802607.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA53A7D3123\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '380'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:53 GMT
-      elapsed-time: '54'
-      etag: W/"0x8D96C1124E8B556"
+      date: Tue, 31 Aug 2021 17:31:55 GMT
+      elapsed-time: '57'
+      etag: W/"0x8D96CA53A7D3123"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 40f3abd9-09ed-11ec-a8aa-74c63bed1137
+      request-id: 576402d3-0a81-11ec-9cda-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -76,7 +76,7 @@ interactions:
 - request:
     body: '{"name": "sample-datasource", "description": "changed", "type": "azureblob",
       "credentials": {"connectionString": "DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net"},
-      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96C1124D59F12\""}'
+      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96CA53A6C3D08\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -85,7 +85,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96C1124D59F12"'
+      - '"0x8D96CA53A6C3D08"'
       Prefer:
       - return=representation
       User-Agent:
@@ -102,13 +102,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:51:53 GMT
-      elapsed-time: '7'
+      date: Tue, 31 Aug 2021 17:31:55 GMT
+      elapsed-time: '17'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4103dd21-09ed-11ec-824e-74c63bed1137
+      request-id: 57757755-0a81-11ec-867a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
index 2ab2f66af30d..b5776e283956 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C112CFB25F0\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA54234F69F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:06 GMT
-      elapsed-time: '38'
-      etag: W/"0x8D96C112CFB25F0"
+      date: Tue, 31 Aug 2021 17:32:07 GMT
+      elapsed-time: '171'
+      etag: W/"0x8D96CA54234F69F"
       expires: '-1'
       location: https://searchb0601f27.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 48f6391c-09ed-11ec-bb8c-74c63bed1137
+      request-id: 5efa0da2-0a81-11ec-9ddb-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://searchb0601f27.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C112CFB25F0\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://searchb0601f27.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA54234F69F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
       content-length: '381'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:06 GMT
-      elapsed-time: '13'
+      date: Tue, 31 Aug 2021 17:32:07 GMT
+      elapsed-time: '75'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 491580ea-09ed-11ec-b0d5-74c63bed1137
+      request-id: 5f2d933a-0a81-11ec-9a5d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -78,11 +78,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Mon, 30 Aug 2021 23:52:06 GMT
-      elapsed-time: '24'
+      date: Tue, 31 Aug 2021 17:32:07 GMT
+      elapsed-time: '35'
       expires: '-1'
       pragma: no-cache
-      request-id: 491da631-09ed-11ec-9bbc-74c63bed1137
+      request-id: 5f3f68d6-0a81-11ec-a81c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -104,13 +104,13 @@ interactions:
       cache-control: no-cache
       content-length: '202'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:06 GMT
+      date: Tue, 31 Aug 2021 17:32:08 GMT
       elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4927d09e-09ed-11ec-a1cd-74c63bed1137
+      request-id: 5f4b9aa9-0a81-11ec-8c7f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
index 3971efae5d0d..e0ca2b14e56a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_delete_datasource_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search950921e4.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C11355A3DF5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA54AC921A7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:21 GMT
-      elapsed-time: '50'
-      etag: W/"0x8D96C11355A3DF5"
+      date: Tue, 31 Aug 2021 17:32:22 GMT
+      elapsed-time: '54'
+      etag: W/"0x8D96CA54AC921A7"
       expires: '-1'
       location: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5140d4f4-09ed-11ec-bf1d-74c63bed1137
+      request-id: 67920c33-0a81-11ec-92d7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,19 +54,19 @@ interactions:
     uri: https://search950921e4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C11356CB7EC\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search950921e4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA54AD7F258\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:21 GMT
-      elapsed-time: '80'
-      etag: W/"0x8D96C11356CB7EC"
+      date: Tue, 31 Aug 2021 17:32:22 GMT
+      elapsed-time: '55'
+      etag: W/"0x8D96CA54AD7F258"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5175acfe-09ed-11ec-8265-74c63bed1137
+      request-id: 67c0d4c5-0a81-11ec-8866-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,7 +79,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96C11355A3DF5"'
+      - '"0x8D96CA54AC921A7"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -94,13 +94,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:21 GMT
-      elapsed-time: '9'
+      date: Tue, 31 Aug 2021 17:32:22 GMT
+      elapsed-time: '10'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5188074d-09ed-11ec-8d8e-74c63bed1137
+      request-id: 67d025da-0a81-11ec-af61-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
index a5905dcab960..a6c498230ead 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_get_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search54ec1df4.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C113D930248\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA5527C7946\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:35 GMT
-      elapsed-time: '42'
-      etag: W/"0x8D96C113D930248"
+      date: Tue, 31 Aug 2021 17:32:35 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96CA5527C7946"
       expires: '-1'
       location: https://search54ec1df4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 598f80a2-09ed-11ec-8898-74c63bed1137
+      request-id: 6f54cc44-0a81-11ec-bfde-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search54ec1df4.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C113D930248\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54ec1df4.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA5527C7946\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '375'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:35 GMT
-      elapsed-time: '9'
-      etag: W/"0x8D96C113D930248"
+      date: Tue, 31 Aug 2021 17:32:35 GMT
+      elapsed-time: '20'
+      etag: W/"0x8D96CA5527C7946"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 59ad2531-09ed-11ec-8a91-74c63bed1137
+      request-id: 6f73c020-0a81-11ec-957b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
index 412cd36c5702..3c1aaf4c7ce0 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_data_source_live_async.test_list_datasource_async.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1145D42C78\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA55ADB082C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:49 GMT
+      date: Tue, 31 Aug 2021 17:32:49 GMT
       elapsed-time: '41'
-      etag: W/"0x8D96C1145D42C78"
+      etag: W/"0x8D96CA55ADB082C"
       expires: '-1'
       location: https://search74a71e70.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 61c56094-09ed-11ec-a2ef-74c63bed1137
+      request-id: 77ab9044-0a81-11ec-81a7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -52,20 +52,20 @@ interactions:
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1145E08AC3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA55AE6F202\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '404'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:49 GMT
-      elapsed-time: '36'
-      etag: W/"0x8D96C1145E08AC3"
+      date: Tue, 31 Aug 2021 17:32:49 GMT
+      elapsed-time: '34'
+      etag: W/"0x8D96CA55AE6F202"
       expires: '-1'
       location: https://search74a71e70.search.windows.net/datasources('another-sample')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 61eea0f6-09ed-11ec-afd1-74c63bed1137
+      request-id: 77d2a125-0a81-11ec-9bf8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -82,18 +82,18 @@ interactions:
     uri: https://search74a71e70.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C1145E08AC3\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96C1145D42C78\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search74a71e70.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA55AE6F202\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96CA55ADB082C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '405'
+      content-length: '406'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 23:52:49 GMT
-      elapsed-time: '44'
+      date: Tue, 31 Aug 2021 17:32:49 GMT
+      elapsed-time: '55'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 61faaaf6-09ed-11ec-becb-74c63bed1137
+      request-id: 77de4240-0a81-11ec-b579-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml
index 980b53a81859..779b6f5a28a7 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_analyze_text.yaml
@@ -19,13 +19,13 @@ interactions:
       cache-control: no-cache
       content-length: '305'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:35:32 GMT
-      elapsed-time: '51'
+      date: Tue, 31 Aug 2021 17:33:02 GMT
+      elapsed-time: '67'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d258d06d-09d1-11ec-bb82-74c63bed1137
+      request-id: 7f919a27-0a81-11ec-af5a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml
index d88f5b53222a..fd2be10519cd 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_index.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search4bde15af.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4bde15af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5BEFDF777\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search4bde15af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA56AD3940E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1020'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:35:46 GMT
-      elapsed-time: '963'
-      etag: W/"0x8D96BF5BEFDF777"
+      date: Tue, 31 Aug 2021 17:33:16 GMT
+      elapsed-time: '691'
+      etag: W/"0x8D96CA56AD3940E"
       expires: '-1'
       location: https://search4bde15af.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: da421b5d-09d1-11ec-a89c-74c63bed1137
+      request-id: 874a3e18-0a81-11ec-9e38-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml
index ace9bb45482f..d6854e55d7b3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_index.yaml
@@ -21,20 +21,20 @@ interactions:
     uri: https://search3b9d19d1.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5C74567EE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA57419877A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '946'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:00 GMT
-      elapsed-time: '500'
-      etag: W/"0x8D96BF5C74567EE"
+      date: Tue, 31 Aug 2021 17:33:31 GMT
+      elapsed-time: '2203'
+      etag: W/"0x8D96CA57419877A"
       expires: '-1'
       location: https://search3b9d19d1.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e2d083aa-09d1-11ec-829a-74c63bed1137
+      request-id: 8fad36d6-0a81-11ec-a91a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -62,19 +62,19 @@ interactions:
     uri: https://search3b9d19d1.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5C7822DF8\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search3b9d19d1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA574AFF8FA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
-      content-length: '588'
+      content-length: '587'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:00 GMT
-      elapsed-time: '354'
-      etag: W/"0x8D96BF5C7822DF8"
+      date: Tue, 31 Aug 2021 17:33:33 GMT
+      elapsed-time: '705'
+      etag: W/"0x8D96CA574AFF8FA"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e337d5e5-09d1-11ec-9b04-74c63bed1137
+      request-id: 912f7b05-0a81-11ec-9f1c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml
index 7676c033403b..9c475bb2b600 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_create_or_update_indexes_if_unchanged.yaml
@@ -17,20 +17,20 @@ interactions:
     uri: https://searchefa91fe3.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5CFB464E2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA57E761144\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1014'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:14 GMT
-      elapsed-time: '514'
-      etag: W/"0x8D96BF5CFB464E2"
+      date: Tue, 31 Aug 2021 17:33:49 GMT
+      elapsed-time: '1711'
+      etag: W/"0x8D96CA57E761144"
       expires: '-1'
       location: https://searchefa91fe3.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: eb3b2e4a-09d1-11ec-88b4-74c63bed1137
+      request-id: 9a49477a-0a81-11ec-91c1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -56,19 +56,19 @@ interactions:
     uri: https://searchefa91fe3.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5CFEDCEF3\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchefa91fe3.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA57EB1F07B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '555'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:14 GMT
-      elapsed-time: '328'
-      etag: W/"0x8D96BF5CFEDCEF3"
+      date: Tue, 31 Aug 2021 17:33:49 GMT
+      elapsed-time: '313'
+      etag: W/"0x8D96CA57EB1F07B"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: eba6d2a7-09d1-11ec-9a79-74c63bed1137
+      request-id: 9b753929-0a81-11ec-9e46-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,7 +79,7 @@ interactions:
     body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
       "key": true, "retrievable": true, "searchable": false}, {"name": "baseRate",
       "type": "Edm.Double", "retrievable": true}], "scoringProfiles": [], "corsOptions":
-      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D96BF5CFB464E2\""}'
+      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D96CA57E761144\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -88,7 +88,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96BF5CFB464E2"'
+      - '"0x8D96CA57E761144"'
       Prefer:
       - return=representation
       User-Agent:
@@ -105,13 +105,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:14 GMT
-      elapsed-time: '21'
+      date: Tue, 31 Aug 2021 17:33:49 GMT
+      elapsed-time: '62'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ebe04eef-09d1-11ec-91e6-74c63bed1137
+      request-id: 9bac40f7-0a81-11ec-a40a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml
index c61dc536a619..b81f22b733ee 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes.yaml
@@ -13,11 +13,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Mon, 30 Aug 2021 20:36:38 GMT
-      elapsed-time: '171'
+      date: Tue, 31 Aug 2021 17:34:03 GMT
+      elapsed-time: '390'
       expires: '-1'
       pragma: no-cache
-      request-id: f9ca2595-09d1-11ec-bd2f-74c63bed1137
+      request-id: a38a2925-0a81-11ec-a3b6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -39,13 +39,13 @@ interactions:
       cache-control: no-cache
       content-length: '200'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:43 GMT
-      elapsed-time: '18'
+      date: Tue, 31 Aug 2021 17:34:09 GMT
+      elapsed-time: '145'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fd068d19-09d1-11ec-a4fa-74c63bed1137
+      request-id: a6ea4fe6-0a81-11ec-86da-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml
index 1cd9b8f83f78..f03f590c6f8e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_delete_indexes_if_unchanged.yaml
@@ -17,20 +17,20 @@ interactions:
     uri: https://searchc1c41bc0.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5E927D698\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA59304FD02\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1014'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:56 GMT
-      elapsed-time: '521'
-      etag: W/"0x8D96BF5E927D698"
+      date: Tue, 31 Aug 2021 17:34:24 GMT
+      elapsed-time: '1194'
+      etag: W/"0x8D96CA59304FD02"
       expires: '-1'
       location: https://searchc1c41bc0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 04af2f1a-09d2-11ec-bcc2-74c63bed1137
+      request-id: af26b98b-0a81-11ec-9bd7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -56,19 +56,19 @@ interactions:
     uri: https://searchc1c41bc0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5E96511DD\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc1c41bc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA5932B04EA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '556'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:57 GMT
-      elapsed-time: '353'
-      etag: W/"0x8D96BF5E96511DD"
+      date: Tue, 31 Aug 2021 17:34:24 GMT
+      elapsed-time: '201'
+      etag: W/"0x8D96CA5932B04EA"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 051a8f78-09d2-11ec-aab0-74c63bed1137
+      request-id: affd54e9-0a81-11ec-a6ff-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -81,7 +81,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96BF5E927D698"'
+      - '"0x8D96CA59304FD02"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -96,13 +96,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:36:57 GMT
+      date: Tue, 31 Aug 2021 17:34:24 GMT
       elapsed-time: '23'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 055856ad-09d2-11ec-ae09-74c63bed1137
+      request-id: b02338cb-0a81-11ec-a793-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml
index 395ac62f910a..6d85ca43f4a1 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index.yaml
@@ -10,19 +10,19 @@ interactions:
     uri: https://searchc3d147b.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc3d147b.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF5EF238B97\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc3d147b.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA5992B5FF8\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '1181'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:37:10 GMT
-      elapsed-time: '28'
-      etag: W/"0x8D96BF5EF238B97"
+      date: Tue, 31 Aug 2021 17:34:38 GMT
+      elapsed-time: '41'
+      etag: W/"0x8D96CA5992B5FF8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0d1a23a4-09d2-11ec-8aa3-74c63bed1137
+      request-id: b8218a60-0a81-11ec-b405-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml
index 2572d151379e..ab20e129ca97 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_index_statistics.yaml
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '263'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:37:25 GMT
-      elapsed-time: '19'
+      date: Tue, 31 Aug 2021 17:34:50 GMT
+      elapsed-time: '28'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 15a1f9fe-09d2-11ec-aad8-74c63bed1137
+      request-id: bf8ac439-0a81-11ec-95e0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml
index a86c2681b750..be97aedab518 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_get_service_statistics.yaml
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '431'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:37:35 GMT
-      elapsed-time: '40'
+      date: Tue, 31 Aug 2021 17:34:59 GMT
+      elapsed-time: '117'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1bf78703-09d2-11ec-8d8f-74c63bed1137
+      request-id: c5091769-0a81-11ec-9d69-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml
index 83380b611172..2733532e7475 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes.yaml
@@ -10,18 +10,18 @@ interactions:
     uri: https://search4ce615cf.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ce615cf.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D96BF60644D7F6\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
+      string: '{"@odata.context":"https://search4ce615cf.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D96CA5AEC08AA8\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
     headers:
       cache-control: no-cache
-      content-length: '1171'
+      content-length: '1169'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:37:49 GMT
-      elapsed-time: '81'
+      date: Tue, 31 Aug 2021 17:35:13 GMT
+      elapsed-time: '58'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 243498a1-09d2-11ec-b4ad-74c63bed1137
+      request-id: cdb2cb99-0a81-11ec-b57a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml
index 49cf33040444..d72e3107e60a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_live_async.test_list_indexes_empty.yaml
@@ -15,13 +15,13 @@ interactions:
       cache-control: no-cache
       content-length: '200'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:37:58 GMT
-      elapsed-time: '27'
+      date: Tue, 31 Aug 2021 17:35:24 GMT
+      elapsed-time: '32'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 291e5ee7-09d2-11ec-85b4-74c63bed1137
+      request-id: d3d34c0b-0a81-11ec-80d9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
index 9b494788d26a..fce05141a99d 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07B2C8CD44\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5C258086A\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:16 GMT
-      elapsed-time: '43'
-      etag: W/"0x8D96C07B2C8CD44"
+      date: Tue, 31 Aug 2021 17:35:43 GMT
+      elapsed-time: '1745'
+      etag: W/"0x8D96CA5C258086A"
       expires: '-1'
       location: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ceb4c684-09e3-11ec-be62-74c63bed1137
+      request-id: de2e61b1-0a81-11ec-bb74-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07B2D61631\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5C2668AF1\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '476'
+      content-length: '475'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:16 GMT
-      elapsed-time: '38'
-      etag: W/"0x8D96C07B2D61631"
+      date: Tue, 31 Aug 2021 17:35:43 GMT
+      elapsed-time: '45'
+      etag: W/"0x8D96CA5C2668AF1"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ced4cdf2-09e3-11ec-b1c2-74c63bed1137
+      request-id: df50eaa1-0a81-11ec-8ced-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07B2D61631\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5C2668AF1\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '533'
+      content-length: '532'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:16 GMT
-      elapsed-time: '36'
+      date: Tue, 31 Aug 2021 17:35:43 GMT
+      elapsed-time: '37'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: cee1eedd-09e3-11ec-8bc6-74c63bed1137
+      request-id: df5ea2a8-0a81-11ec-82a4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -117,19 +117,19 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07B2D61631\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5C2668AF1\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:16 GMT
-      elapsed-time: '11'
-      etag: W/"0x8D96C07B2D61631"
+      date: Tue, 31 Aug 2021 17:35:43 GMT
+      elapsed-time: '13'
+      etag: W/"0x8D96CA5C2668AF1"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ceed77eb-09e3-11ec-a263-74c63bed1137
+      request-id: df6b4986-0a81-11ec-a355-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
index e6d6966d72dd..81f49085f2f6 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07BAC8EE72\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5CB230856\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:30 GMT
-      elapsed-time: '34'
-      etag: W/"0x8D96C07BAC8EE72"
+      date: Tue, 31 Aug 2021 17:35:58 GMT
+      elapsed-time: '156'
+      etag: W/"0x8D96CA5CB230856"
       expires: '-1'
       location: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d6a7d023-09e3-11ec-913e-74c63bed1137
+      request-id: e7e1c7e6-0a81-11ec-af51-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07BAD59AF5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5CB35837B\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '476'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:30 GMT
-      elapsed-time: '46'
-      etag: W/"0x8D96C07BAD59AF5"
+      date: Tue, 31 Aug 2021 17:35:58 GMT
+      elapsed-time: '81'
+      etag: W/"0x8D96CA5CB35837B"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d6d503b3-09e3-11ec-ae8e-74c63bed1137
+      request-id: e81b6671-0a81-11ec-bfd5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search4ddb2428.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07BAD59AF5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5CB35837B\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:30 GMT
-      elapsed-time: '15'
+      date: Tue, 31 Aug 2021 17:35:58 GMT
+      elapsed-time: '78'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: d6e33420-09e3-11ec-96d4-74c63bed1137
+      request-id: e8346617-0a81-11ec-9913-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
index 67f6a6430ec0..ce7b0acbd2e3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07C2CE19BB\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5D577A0EC\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:43 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D96C07C2CE19BB"
+      date: Tue, 31 Aug 2021 17:36:14 GMT
+      elapsed-time: '54'
+      etag: W/"0x8D96CA5D577A0EC"
       expires: '-1'
       location: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: debb3cb9-09e3-11ec-b405-74c63bed1137
+      request-id: f23fc68a-0a81-11ec-b8f7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07C2DA7801\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5D5858703\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '476'
+      content-length: '477'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:43 GMT
-      elapsed-time: '37'
-      etag: W/"0x8D96C07C2DA7801"
+      date: Tue, 31 Aug 2021 17:36:14 GMT
+      elapsed-time: '47'
+      etag: W/"0x8D96CA5D5858703"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ded9dabd-09e3-11ec-aa9f-74c63bed1137
+      request-id: f27018a2-0a81-11ec-ba02-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07C2DA7801\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5D5858703\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '533'
+      content-length: '534'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:43 GMT
-      elapsed-time: '14'
+      date: Tue, 31 Aug 2021 17:36:14 GMT
+      elapsed-time: '37'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: dee67008-09e3-11ec-94b1-74c63bed1137
+      request-id: f27da9a7-0a81-11ec-9aaf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -117,19 +117,19 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07C2DA7801\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5D5858703\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '531'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:43 GMT
-      elapsed-time: '9'
-      etag: W/"0x8D96C07C2DA7801"
+      date: Tue, 31 Aug 2021 17:36:14 GMT
+      elapsed-time: '30'
+      etag: W/"0x8D96CA5D5858703"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: deee85e5-09e3-11ec-a1a9-74c63bed1137
+      request-id: f29216a9-0a81-11ec-977a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
index 892609e9e939..9a7bc1556c63 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
@@ -18,20 +18,20 @@ interactions:
     uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07CA25CE1F\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5E13C5041\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '967'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:56 GMT
-      elapsed-time: '63'
-      etag: W/"0x8D96C07CA25CE1F"
+      date: Tue, 31 Aug 2021 17:36:35 GMT
+      elapsed-time: '5078'
+      etag: W/"0x8D96CA5E13C5041"
       expires: '-1'
       location: https://search75151acc.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e6101112-09e3-11ec-91d1-74c63bed1137
+      request-id: fb10f75b-0a81-11ec-b033-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -48,19 +48,19 @@ interactions:
     uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07CA25CE1F\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5E13C5041\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
         Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '633'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:44:56 GMT
-      elapsed-time: '21'
+      date: Tue, 31 Aug 2021 17:36:35 GMT
+      elapsed-time: '256'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e6327fe2-09e3-11ec-a6d7-74c63bed1137
+      request-id: fe3d5e14-0a81-11ec-903a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
index 841b77d7a235..086b3e88112a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07D20F7CFE\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5EC6BEE3A\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:08 GMT
-      elapsed-time: '36'
-      etag: W/"0x8D96C07D20F7CFE"
+      date: Tue, 31 Aug 2021 17:36:54 GMT
+      elapsed-time: '3822'
+      etag: W/"0x8D96CA5EC6BEE3A"
       expires: '-1'
       location: https://search74f91acb.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: edf6339d-09e3-11ec-bc2b-74c63bed1137
+      request-id: 06f2d8de-0a82-11ec-9bcc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,20 +46,19 @@ interactions:
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07D20F7CFE\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5EC6BEE3A\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '532'
+      content-length: '689'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:08 GMT
-      elapsed-time: '15'
+      date: Tue, 31 Aug 2021 17:36:54 GMT
+      elapsed-time: '69'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: ee1bb265-09e3-11ec-a263-74c63bed1137
+      request-id: 096b49a4-0a82-11ec-9974-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
     status:
       code: 200
       message: OK
@@ -78,11 +77,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Mon, 30 Aug 2021 22:45:09 GMT
-      elapsed-time: '21'
+      date: Tue, 31 Aug 2021 17:36:54 GMT
+      elapsed-time: '57'
       expires: '-1'
       pragma: no-cache
-      request-id: ee23c804-09e3-11ec-9f66-74c63bed1137
+      request-id: 09831126-0a82-11ec-9241-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -102,17 +101,16 @@ interactions:
       string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[]}'
     headers:
       cache-control: no-cache
-      content-length: '201'
+      content-length: '93'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:14 GMT
-      elapsed-time: '6'
+      date: Tue, 31 Aug 2021 17:36:59 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f128bc97-09e3-11ec-b221-74c63bed1137
+      request-id: 0c91e1d9-0a82-11ec-80aa-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
     status:
       code: 200
       message: OK
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
index 07cabca76a1b..318d16032556 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchf5e02005.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07DCD6E1E8\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5F8A26755\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:27 GMT
-      elapsed-time: '46'
-      etag: W/"0x8D96C07DCD6E1E8"
+      date: Tue, 31 Aug 2021 17:37:13 GMT
+      elapsed-time: '77'
+      etag: W/"0x8D96CA5F8A26755"
       expires: '-1'
       location: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f8b38231-09e3-11ec-ad4a-74c63bed1137
+      request-id: 1571e7fe-0a82-11ec-aa92-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -55,21 +55,20 @@ interactions:
     uri: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07DCE22E8E\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5F8B18634\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '478'
+      content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:27 GMT
-      elapsed-time: '34'
-      etag: W/"0x8D96C07DCE22E8E"
+      date: Tue, 31 Aug 2021 17:37:13 GMT
+      elapsed-time: '52'
+      etag: W/"0x8D96CA5F8B18634"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f8e329b4-09e3-11ec-b1ba-74c63bed1137
+      request-id: 159b3710-0a82-11ec-94f5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
-      vary: Accept-Encoding
     status:
       code: 200
       message: OK
@@ -80,7 +79,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96C07DCD6E1E8"'
+      - '"0x8D96CA5F8A26755"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -95,13 +94,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:27 GMT
-      elapsed-time: '5'
+      date: Tue, 31 Aug 2021 17:37:13 GMT
+      elapsed-time: '11'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f8ee715f-09e3-11ec-ae65-74c63bed1137
+      request-id: 15aa4e4a-0a82-11ec-8cc8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
index de8fd5a448cc..c56e61af766e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07E4AC9028\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA6011D5ED7\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:40 GMT
-      elapsed-time: '66'
-      etag: W/"0x8D96C07E4AC9028"
+      date: Tue, 31 Aug 2021 17:37:28 GMT
+      elapsed-time: '56'
+      etag: W/"0x8D96CA6011D5ED7"
       expires: '-1'
       location: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0097c52e-09e4-11ec-9041-74c63bed1137
+      request-id: 1dea99a9-0a82-11ec-beab-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07E4AC9028\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA6011D5ED7\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '532'
+      content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:40 GMT
-      elapsed-time: '14'
+      date: Tue, 31 Aug 2021 17:37:28 GMT
+      elapsed-time: '19'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 00b90c10-09e4-11ec-88a2-74c63bed1137
+      request-id: 1e16a725-0a82-11ec-bfd6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -75,19 +75,19 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07E4AC9028\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA6011D5ED7\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:40 GMT
-      elapsed-time: '9'
-      etag: W/"0x8D96C07E4AC9028"
+      date: Tue, 31 Aug 2021 17:37:28 GMT
+      elapsed-time: '19'
+      etag: W/"0x8D96CA6011D5ED7"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 00c0fbd9-09e4-11ec-9e87-74c63bed1137
+      request-id: 1e1f7e80-0a82-11ec-bef5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
index 01b72aae2dde..801b10cea4fc 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
@@ -17,20 +17,20 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07ECBDF28C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA609416E76\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:53 GMT
-      elapsed-time: '44'
-      etag: W/"0x8D96C07ECBDF28C"
+      date: Tue, 31 Aug 2021 17:37:42 GMT
+      elapsed-time: '63'
+      etag: W/"0x8D96CA609416E76"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 089e9eb2-09e4-11ec-bba1-74c63bed1137
+      request-id: 2618540f-0a82-11ec-b482-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,20 +54,20 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96C07ECC98D6F\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA6094F065A\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:53 GMT
-      elapsed-time: '43'
-      etag: W/"0x8D96C07ECC98D6F"
+      date: Tue, 31 Aug 2021 17:37:42 GMT
+      elapsed-time: '42'
+      etag: W/"0x8D96CA6094F065A"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 08ca14f4-09e4-11ec-8e02-74c63bed1137
+      request-id: 263a5216-0a82-11ec-acf1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -84,18 +84,18 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96C07ECBDF28C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96C07ECC98D6F\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA609416E76\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96CA6094F065A\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '564'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:45:53 GMT
-      elapsed-time: '18'
+      date: Tue, 31 Aug 2021 17:37:42 GMT
+      elapsed-time: '20'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 08d845ee-09e4-11ec-8769-74c63bed1137
+      request-id: 2647bc16-0a82-11ec-8264-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
index 8d5ef66d141d..e32c99995d22 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_or_update_synonym_map.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C085AAF5F14\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA610EAD887\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:48:58 GMT
-      elapsed-time: '21'
-      etag: W/"0x8D96C085AAF5F14"
+      date: Tue, 31 Aug 2021 17:37:55 GMT
+      elapsed-time: '146'
+      etag: W/"0x8D96CA610EAD887"
       expires: '-1'
       location: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7680ae32-09e4-11ec-b431-74c63bed1137
+      request-id: 2db4031b-0a82-11ec-afc4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C085AAF5F14\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA610EAD887\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '336'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:48:58 GMT
-      elapsed-time: '12'
+      date: Tue, 31 Aug 2021 17:37:55 GMT
+      elapsed-time: '29'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 76bb7a96-09e4-11ec-a151-74c63bed1137
+      request-id: 2de2db90-0a82-11ec-9362-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -83,20 +83,20 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C085AC2273F\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA611012520\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '302'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:48:58 GMT
-      elapsed-time: '17'
-      etag: W/"0x8D96C085AC2273F"
+      date: Tue, 31 Aug 2021 17:37:55 GMT
+      elapsed-time: '28'
+      etag: W/"0x8D96CA611012520"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 76c3bdf4-09e4-11ec-8128-74c63bed1137
+      request-id: 2dedae29-0a82-11ec-88cf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -114,19 +114,19 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C085AC2273F\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA611012520\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '307'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:48:58 GMT
-      elapsed-time: '10'
+      date: Tue, 31 Aug 2021 17:37:55 GMT
+      elapsed-time: '14'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 76ce3f69-09e4-11ec-936d-74c63bed1137
+      request-id: 2df8ced3-0a82-11ec-aa51-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -144,20 +144,20 @@ interactions:
     uri: https://search5e99218c.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C085AC2273F\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search5e99218c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA611012520\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '302'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:48:58 GMT
-      elapsed-time: '5'
-      etag: W/"0x8D96C085AC2273F"
+      date: Tue, 31 Aug 2021 17:37:55 GMT
+      elapsed-time: '9'
+      etag: W/"0x8D96CA611012520"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 76d69356-09e4-11ec-af3b-74c63bed1137
+      request-id: 2e0094f8-0a82-11ec-8ef0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
index b685e63b408d..adbfc5e2a991 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_create_synonym_map.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://search23141d6a.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C08634328E0\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA619B7ADAA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:13 GMT
-      elapsed-time: '34'
-      etag: W/"0x8D96C08634328E0"
+      date: Tue, 31 Aug 2021 17:38:10 GMT
+      elapsed-time: '406'
+      etag: W/"0x8D96CA619B7ADAA"
       expires: '-1'
       location: https://search23141d6a.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7f318a84-09e4-11ec-b3ff-74c63bed1137
+      request-id: 364dbea3-0a82-11ec-b1f5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search23141d6a.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C08634328E0\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search23141d6a.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA619B7ADAA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '336'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:13 GMT
-      elapsed-time: '11'
+      date: Tue, 31 Aug 2021 17:38:10 GMT
+      elapsed-time: '13'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7f4f7d30-09e4-11ec-8022-74c63bed1137
+      request-id: 36af4d03-0a82-11ec-afe5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
index 4d177acb9fb6..2d503164d8df 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C086DCBF2A5\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA621F8E928\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:30 GMT
-      elapsed-time: '20'
-      etag: W/"0x8D96C086DCBF2A5"
+      date: Tue, 31 Aug 2021 17:38:24 GMT
+      elapsed-time: '119'
+      etag: W/"0x8D96CA621F8E928"
       expires: '-1'
       location: https://search22f51d69.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 89b8c267-09e4-11ec-9961-74c63bed1137
+      request-id: 3ec6b888-0a82-11ec-805b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://search22f51d69.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C086DCBF2A5\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search22f51d69.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA621F8E928\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '337'
+      content-length: '336'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:30 GMT
-      elapsed-time: '16'
+      date: Tue, 31 Aug 2021 17:38:24 GMT
+      elapsed-time: '28'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 89d7fc2e-09e4-11ec-a6cf-74c63bed1137
+      request-id: 3ef0ac77-0a82-11ec-baf1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,11 +79,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Mon, 30 Aug 2021 22:49:30 GMT
-      elapsed-time: '11'
+      date: Tue, 31 Aug 2021 17:38:24 GMT
+      elapsed-time: '20'
       expires: '-1'
       pragma: no-cache
-      request-id: 89e11ce0-09e4-11ec-ab39-74c63bed1137
+      request-id: 3efba618-0a82-11ec-8d1f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -105,13 +105,13 @@ interactions:
       cache-control: no-cache
       content-length: '204'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:30 GMT
-      elapsed-time: '6'
+      date: Tue, 31 Aug 2021 17:38:24 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 89eaa5b7-09e4-11ec-8e87-74c63bed1137
+      request-id: 3f047d6d-0a82-11ec-8d9b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
index 8bff1b55df9a..0173b40cea19 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_delete_synonym_map_if_unchanged.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://searchc5e222a3.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0875DE3FA1\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA629FE93E4\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:43 GMT
-      elapsed-time: '28'
-      etag: W/"0x8D96C0875DE3FA1"
+      date: Tue, 31 Aug 2021 17:38:37 GMT
+      elapsed-time: '35'
+      etag: W/"0x8D96CA629FE93E4"
       expires: '-1'
       location: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 91cc3947-09e4-11ec-908b-74c63bed1137
+      request-id: 46d923a8-0a82-11ec-8678-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -53,20 +53,20 @@ interactions:
     uri: https://searchc5e222a3.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0875E79026\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
+      string: '{"@odata.context":"https://searchc5e222a3.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA62A08A87D\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
         \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '334'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:43 GMT
-      elapsed-time: '17'
-      etag: W/"0x8D96C0875E79026"
+      date: Tue, 31 Aug 2021 17:38:37 GMT
+      elapsed-time: '24'
+      etag: W/"0x8D96CA62A08A87D"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 91ea793b-09e4-11ec-849e-74c63bed1137
+      request-id: 46f640f1-0a82-11ec-919f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -79,7 +79,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96C0875DE3FA1"'
+      - '"0x8D96CA629FE93E4"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -94,13 +94,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:43 GMT
-      elapsed-time: '10'
+      date: Tue, 31 Aug 2021 17:38:37 GMT
+      elapsed-time: '8'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 91f3c6fa-09e4-11ec-a200-74c63bed1137
+      request-id: 47002967-0a82-11ec-9329-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
index 575f2266f3e6..5a5d4c027940 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_map.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C087D6C9E4D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA631FA9F50\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '272'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:56 GMT
-      elapsed-time: '28'
-      etag: W/"0x8D96C087D6C9E4D"
+      date: Tue, 31 Aug 2021 17:38:50 GMT
+      elapsed-time: '37'
+      etag: W/"0x8D96CA631FA9F50"
       expires: '-1'
       location: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 995b4729-09e4-11ec-ba23-74c63bed1137
+      request-id: 4ec7a83b-0a82-11ec-b6b5-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,19 @@ interactions:
     uri: https://searchcce11c36.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C087D6C9E4D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA631FA9F50\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '336'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:56 GMT
-      elapsed-time: '10'
+      date: Tue, 31 Aug 2021 17:38:50 GMT
+      elapsed-time: '15'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9978c386-09e4-11ec-95d6-74c63bed1137
+      request-id: 4ef2a494-0a82-11ec-a8e4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -76,20 +76,20 @@ interactions:
     uri: https://searchcce11c36.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C087D6C9E4D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searchcce11c36.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA631FA9F50\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '331'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:49:56 GMT
-      elapsed-time: '8'
-      etag: W/"0x8D96C087D6C9E4D"
+      date: Tue, 31 Aug 2021 17:38:50 GMT
+      elapsed-time: '7'
+      etag: W/"0x8D96CA631FA9F50"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9980f42f-09e4-11ec-9b71-74c63bed1137
+      request-id: 4efadfce-0a82-11ec-b213-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
index 95644ce508ad..dfde9412aa1b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_synonym_map_live_async.test_get_synonym_maps.yaml
@@ -15,21 +15,21 @@ interactions:
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0885DC85C8\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA63A48880F\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '274'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:50:11 GMT
-      elapsed-time: '22'
-      etag: W/"0x8D96C0885DC85C8"
+      date: Tue, 31 Aug 2021 17:39:04 GMT
+      elapsed-time: '44'
+      etag: W/"0x8D96CA63A48880F"
       expires: '-1'
       location: https://searche98a1ca9.search.windows.net/synonymmaps('test-syn-map-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a1cb69fb-09e4-11ec-829a-74c63bed1137
+      request-id: 571b35ea-0a82-11ec-8127-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -51,21 +51,21 @@ interactions:
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96C0885E75D35\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA63A564714\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '228'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:50:11 GMT
-      elapsed-time: '20'
-      etag: W/"0x8D96C0885E75D35"
+      date: Tue, 31 Aug 2021 17:39:04 GMT
+      elapsed-time: '23'
+      etag: W/"0x8D96CA63A564714"
       expires: '-1'
       location: https://searche98a1ca9.search.windows.net/synonymmaps('test-syn-map-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a1e89c4a-09e4-11ec-b1b0-74c63bed1137
+      request-id: 57434cdb-0a82-11ec-badc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -82,20 +82,20 @@ interactions:
     uri: https://searche98a1ca9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96C0885DC85C8\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
-        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null},{"@odata.etag":"\"0x8D96C0885E75D35\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://searche98a1ca9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA63A48880F\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+        United States, United States of America\nWashington, Wash. => WA","encryptionKey":null},{"@odata.etag":"\"0x8D96CA63A564714\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '359'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 22:50:11 GMT
-      elapsed-time: '17'
+      date: Tue, 31 Aug 2021 17:39:04 GMT
+      elapsed-time: '23'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a1f392a1-09e4-11ec-9ed7-74c63bed1137
+      request-id: 574df866-0a82-11ec-b01b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
index 2e1bae146374..9a9ad9d2581a 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha7b8175d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF72F0B978D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA6430B2182\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:03 GMT
-      elapsed-time: '37'
-      etag: W/"0x8D96BF72F0B978D"
+      date: Tue, 31 Aug 2021 17:39:19 GMT
+      elapsed-time: '51'
+      etag: W/"0x8D96CA6430B2182"
       expires: '-1'
       location: https://searcha7b8175d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4ade53cb-09d3-11ec-880d-74c63bed1137
+      request-id: 5fe416fc-0a82-11ec-91b7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha7b8175d.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF72FA5D107\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA64398DE4D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:04 GMT
-      elapsed-time: '833'
-      etag: W/"0x8D96BF72FA5D107"
+      date: Tue, 31 Aug 2021 17:39:20 GMT
+      elapsed-time: '676'
+      etag: W/"0x8D96CA64398DE4D"
       expires: '-1'
       location: https://searcha7b8175d.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4affd856-09d3-11ec-a977-74c63bed1137
+      request-id: 6004b5e5-0a82-11ec-b566-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:05 GMT
-      elapsed-time: '824'
+      date: Tue, 31 Aug 2021 17:39:22 GMT
+      elapsed-time: '1470'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 4b9abb3f-09d3-11ec-9496-74c63bed1137
+      request-id: 609362dd-0a82-11ec-89bb-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
index 6e6045952d69..2c3dcb85299c 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha8211b7f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7389A42E6\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA64CE849E7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:20 GMT
-      elapsed-time: '31'
-      etag: W/"0x8D96BF7389A42E6"
+      date: Tue, 31 Aug 2021 17:39:36 GMT
+      elapsed-time: '50'
+      etag: W/"0x8D96CA64CE849E7"
       expires: '-1'
       location: https://searcha8211b7f.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 546e7dfc-09d3-11ec-986a-74c63bed1137
+      request-id: 69b4de9c-0a82-11ec-a395-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha8211b7f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF7396FBB94\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA64D614119\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:21 GMT
-      elapsed-time: '1240'
-      etag: W/"0x8D96BF7396FBB94"
+      date: Tue, 31 Aug 2021 17:39:36 GMT
+      elapsed-time: '644'
+      etag: W/"0x8D96CA64D614119"
       expires: '-1'
       location: https://searcha8211b7f.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 548e0bdd-09d3-11ec-b806-74c63bed1137
+      request-id: 69e16148-0a82-11ec-ad2c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:22 GMT
-      elapsed-time: '961'
+      date: Tue, 31 Aug 2021 17:39:38 GMT
+      elapsed-time: '1406'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5569ab2f-09d3-11ec-b11b-74c63bed1137
+      request-id: 6a5b5342-0a82-11ec-a901-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
index 621343c2a8b2..fd1eac171951 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://search323b20b9.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7426E1A70\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA656D99B71\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:36 GMT
-      elapsed-time: '33'
-      etag: W/"0x8D96BF7426E1A70"
+      date: Tue, 31 Aug 2021 17:39:52 GMT
+      elapsed-time: '50'
+      etag: W/"0x8D96CA656D99B71"
       expires: '-1'
       location: https://search323b20b9.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5e390168-09d3-11ec-bb3b-74c63bed1137
+      request-id: 73a8d88b-0a82-11ec-9343-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search323b20b9.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF742D79DEE\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA65759C06F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:36 GMT
-      elapsed-time: '532'
-      etag: W/"0x8D96BF742D79DEE"
+      date: Tue, 31 Aug 2021 17:39:53 GMT
+      elapsed-time: '689'
+      etag: W/"0x8D96CA65759C06F"
       expires: '-1'
       location: https://search323b20b9.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5e624245-09d3-11ec-a263-74c63bed1137
+      request-id: 73d2c3b5-0a82-11ec-82e6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:37 GMT
-      elapsed-time: '502'
+      date: Tue, 31 Aug 2021 17:39:54 GMT
+      elapsed-time: '678'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5ecb6fb1-09d3-11ec-a185-74c63bed1137
+      request-id: 74536ac7-0a82-11ec-8a2a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
index 9dec982ac99a..4e98fd70e544 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha79d175c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF74B548027\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA65FE07A6A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:51 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D96BF74B548027"
+      date: Tue, 31 Aug 2021 17:40:07 GMT
+      elapsed-time: '61'
+      etag: W/"0x8D96CA65FE07A6A"
       expires: '-1'
       location: https://searcha79d175c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 671a4eb8-09d3-11ec-b792-74c63bed1137
+      request-id: 7cb82426-0a82-11ec-ae5a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha79d175c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF74BB9E448\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA66053A3C5\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:51 GMT
-      elapsed-time: '513'
-      etag: W/"0x8D96BF74BB9E448"
+      date: Tue, 31 Aug 2021 17:40:08 GMT
+      elapsed-time: '594'
+      etag: W/"0x8D96CA66053A3C5"
       expires: '-1'
       location: https://searcha79d175c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 67483ad2-09d3-11ec-9516-74c63bed1137
+      request-id: 7cda223b-0a82-11ec-a036-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:46:52 GMT
-      elapsed-time: '494'
+      date: Tue, 31 Aug 2021 17:40:10 GMT
+      elapsed-time: '1549'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 67adf2b8-09d3-11ec-be4e-74c63bed1137
+      request-id: 7d4d8643-0a82-11ec-a4ba-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
index 3a0275a16786..fc290eb4957f 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://searchfbe11c96.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF753B37C48\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA66A655690\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:05 GMT
-      elapsed-time: '33'
-      etag: W/"0x8D96BF753B37C48"
+      date: Tue, 31 Aug 2021 17:40:25 GMT
+      elapsed-time: '39'
+      etag: W/"0x8D96CA66A655690"
       expires: '-1'
       location: https://searchfbe11c96.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6f861f5f-09d3-11ec-beca-74c63bed1137
+      request-id: 873f4fb2-0a82-11ec-bda7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searchfbe11c96.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF75459299B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA66B4034D7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:05 GMT
-      elapsed-time: '935'
-      etag: W/"0x8D96BF75459299B"
+      date: Tue, 31 Aug 2021 17:40:26 GMT
+      elapsed-time: '1226'
+      etag: W/"0x8D96CA66B4034D7"
       expires: '-1'
       location: https://searchfbe11c96.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6fa79300-09d3-11ec-9844-74c63bed1137
+      request-id: 875f0457-0a82-11ec-a4a7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:07 GMT
-      elapsed-time: '735'
+      date: Tue, 31 Aug 2021 17:40:27 GMT
+      elapsed-time: '581'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 704d5e5e-09d3-11ec-b38d-74c63bed1137
+      request-id: 883973cf-0a82-11ec-adbc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
index 6dab4ce50d89..75add8f634a2 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://search632a1629.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF75D3664D1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA673CC4795\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:21 GMT
-      elapsed-time: '40'
-      etag: W/"0x8D96BF75D3664D1"
+      date: Tue, 31 Aug 2021 17:40:41 GMT
+      elapsed-time: '37'
+      etag: W/"0x8D96CA673CC4795"
       expires: '-1'
       location: https://search632a1629.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 78fbf854-09d3-11ec-ab2f-74c63bed1137
+      request-id: 90a7bbe9-0a82-11ec-883c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search632a1629.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF75DA6C753\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA6743D2678\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:22 GMT
-      elapsed-time: '563'
-      etag: W/"0x8D96BF75DA6C753"
+      date: Tue, 31 Aug 2021 17:40:42 GMT
+      elapsed-time: '586'
+      etag: W/"0x8D96CA6743D2678"
       expires: '-1'
       location: https://search632a1629.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 792acea1-09d3-11ec-9de4-74c63bed1137
+      request-id: 90c5755d-0a82-11ec-aea4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:22 GMT
-      elapsed-time: '590'
+      date: Tue, 31 Aug 2021 17:40:42 GMT
+      elapsed-time: '552'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 799c08b0-09d3-11ec-9223-74c63bed1137
+      request-id: 91372c0b-0a82-11ec-a00c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
index 55773ad8c1a7..c742209b2cea 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha24192c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7662D93A6\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA67D17450B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '406'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:36 GMT
-      elapsed-time: '34'
-      etag: W/"0x8D96BF7662D93A6"
+      date: Tue, 31 Aug 2021 17:40:56 GMT
+      elapsed-time: '38'
+      etag: W/"0x8D96CA67D17450B"
       expires: '-1'
       location: https://searcha24192c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 82022333-09d3-11ec-aa71-74c63bed1137
+      request-id: 99d3046f-0a82-11ec-8c9e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha24192c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF766DD2D8E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA67E87352F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '663'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:37 GMT
-      elapsed-time: '982'
-      etag: W/"0x8D96BF766DD2D8E"
+      date: Tue, 31 Aug 2021 17:40:59 GMT
+      elapsed-time: '1991'
+      etag: W/"0x8D96CA67E87352F"
       expires: '-1'
       location: https://searcha24192c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 82222da2-09d3-11ec-9fa6-74c63bed1137
+      request-id: 9a10e793-0a82-11ec-92c1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:38 GMT
-      elapsed-time: '542'
+      date: Tue, 31 Aug 2021 17:41:00 GMT
+      elapsed-time: '677'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 82d2a17c-09d3-11ec-97e8-74c63bed1137
+      request-id: 9b812e24-0a82-11ec-8fa9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
index 67f4c9628217..596020880afd 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF76ECC0B05\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA688285709\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:50 GMT
-      elapsed-time: '45'
-      etag: W/"0x8D96BF76ECC0B05"
+      date: Tue, 31 Aug 2021 17:41:14 GMT
+      elapsed-time: '86'
+      etag: W/"0x8D96CA688285709"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8a9ec613-09d3-11ec-a335-74c63bed1137
+      request-id: a4e6dd5d-0a82-11ec-82c7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF76F342EAA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA688CDC05B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:51 GMT
-      elapsed-time: '521'
-      etag: W/"0x8D96BF76F342EAA"
+      date: Tue, 31 Aug 2021 17:41:16 GMT
+      elapsed-time: '925'
+      etag: W/"0x8D96CA688CDC05B"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8ac06ea7-09d3-11ec-8c93-74c63bed1137
+      request-id: a521db14-0a82-11ec-b3ed-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,20 +85,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF76F61FDC8\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA68928046C\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '408'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:51 GMT
-      elapsed-time: '36'
-      etag: W/"0x8D96BF76F61FDC8"
+      date: Tue, 31 Aug 2021 17:41:16 GMT
+      elapsed-time: '132'
+      etag: W/"0x8D96CA68928046C"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/datasources('another-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8b291dfa-09d3-11ec-8b91-74c63bed1137
+      request-id: a5c84f9b-0a82-11ec-ae31-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -120,20 +120,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF77011E5D6\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA689E9D64D\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '671'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:53 GMT
-      elapsed-time: '984'
-      etag: W/"0x8D96BF77011E5D6"
+      date: Tue, 31 Aug 2021 17:41:18 GMT
+      elapsed-time: '978'
+      etag: W/"0x8D96CA689E9D64D"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/indexes('another-index')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8b56c34f-09d3-11ec-afbf-74c63bed1137
+      request-id: a6317d21-0a82-11ec-9b05-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -170,13 +170,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:47:53 GMT
-      elapsed-time: '518'
+      date: Tue, 31 Aug 2021 17:41:18 GMT
+      elapsed-time: '589'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 8c0687bc-09d3-11ec-8d71-74c63bed1137
+      request-id: a6e44a8a-0a82-11ec-a0f8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
index 9f4c926d8d30..6e56813b7543 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://search916a170c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF7785E84CD\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA692BEEAD7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:48:07 GMT
-      elapsed-time: '36'
-      etag: W/"0x8D96BF7785E84CD"
+      date: Tue, 31 Aug 2021 17:41:32 GMT
+      elapsed-time: '59'
+      etag: W/"0x8D96CA692BEEAD7"
       expires: '-1'
       location: https://search916a170c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9432b3e2-09d3-11ec-a7f1-74c63bed1137
+      request-id: af97d59d-0a82-11ec-badd-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search916a170c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF778C436EF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA6933F36D0\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:48:07 GMT
-      elapsed-time: '513'
-      etag: W/"0x8D96BF778C436EF"
+      date: Tue, 31 Aug 2021 17:41:34 GMT
+      elapsed-time: '690'
+      etag: W/"0x8D96CA6933F36D0"
       expires: '-1'
       location: https://search916a170c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9452a0d1-09d3-11ec-94ca-74c63bed1137
+      request-id: afb98591-0a82-11ec-b978-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:48:08 GMT
-      elapsed-time: '553'
+      date: Tue, 31 Aug 2021 17:41:34 GMT
+      elapsed-time: '640'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 94b8788c-09d3-11ec-935b-74c63bed1137
+      request-id: b03a809b-0a82-11ec-8489-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
index 6076f46ff0ed..458ba3f2444c 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
@@ -15,20 +15,20 @@ interactions:
     uri: https://search640d163e.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96BF78122171E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA69BD621A1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:48:21 GMT
-      elapsed-time: '32'
-      etag: W/"0x8D96BF78122171E"
+      date: Tue, 31 Aug 2021 17:41:47 GMT
+      elapsed-time: '49'
+      etag: W/"0x8D96CA69BD621A1"
       expires: '-1'
       location: https://search640d163e.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9ce5158f-09d3-11ec-8c58-74c63bed1137
+      request-id: b8b0bfea-0a82-11ec-8169-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search640d163e.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF7818CD345\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA69C5EFB38\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:48:22 GMT
-      elapsed-time: '546'
-      etag: W/"0x8D96BF7818CD345"
+      date: Tue, 31 Aug 2021 17:41:49 GMT
+      elapsed-time: '674'
+      etag: W/"0x8D96CA69C5EFB38"
       expires: '-1'
       location: https://search640d163e.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9d1638a8-09d3-11ec-aa78-74c63bed1137
+      request-id: b8d074a7-0a82-11ec-8a38-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -100,13 +100,13 @@ interactions:
       content-language: en
       content-length: '723'
       content-type: application/json; odata.metadata=minimal
-      date: Mon, 30 Aug 2021 20:48:23 GMT
-      elapsed-time: '505'
+      date: Tue, 31 Aug 2021 17:41:50 GMT
+      elapsed-time: '544'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9d815b5d-09d3-11ec-80a0-74c63bed1137
+      request-id: b95908dd-0a82-11ec-991a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 400
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml
index 145f58275902..017e0f0f0036 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document.yaml
@@ -31,9 +31,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '107'
+      - '583'
       expires:
       - '-1'
       odata-version:
@@ -43,7 +43,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3453c145-09ce-11ec-b63c-74c63bed1137
+      - a2d410aa-0a7d-11ec-8814-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -77,9 +77,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '4'
+      - '8'
       expires:
       - '-1'
       odata-version:
@@ -89,7 +89,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34870dc8-09ce-11ec-afa2-74c63bed1137
+      - a3b15362-0a7d-11ec-bede-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -122,9 +122,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '5'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -134,7 +134,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 348f9fae-09ce-11ec-a131-74c63bed1137
+      - a3bb5d13-0a7d-11ec-9350-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -167,9 +167,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '6'
+      - '11'
       expires:
       - '-1'
       odata-version:
@@ -179,7 +179,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3498c8d6-09ce-11ec-b62a-74c63bed1137
+      - a3c3e84e-0a7d-11ec-a75d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -212,9 +212,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '4'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -224,7 +224,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34a17b15-09ce-11ec-831d-74c63bed1137
+      - a3ce966c-0a7d-11ec-b4ea-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -257,9 +257,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '5'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -269,7 +269,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34a9dff9-09ce-11ec-9dff-74c63bed1137
+      - a3d7aa3a-0a7d-11ec-8c38-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -303,9 +303,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '5'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -315,7 +315,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34b44bb4-09ce-11ec-9d77-74c63bed1137
+      - a3e1bd66-0a7d-11ec-8a20-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -351,9 +351,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '4'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -363,7 +363,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34be523b-09ce-11ec-978f-74c63bed1137
+      - a3eb2e06-0a7d-11ec-ae98-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -413,9 +413,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '11'
+      - '13'
       expires:
       - '-1'
       odata-version:
@@ -425,7 +425,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34c6d03a-09ce-11ec-9673-74c63bed1137
+      - a3f9be09-0a7d-11ec-ab49-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -471,9 +471,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:09:38 GMT
+      - Tue, 31 Aug 2021 17:05:25 GMT
       elapsed-time:
-      - '7'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -483,7 +483,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 34d10b6d-09ce-11ec-9257-74c63bed1137
+      - a40549c0-0a7d-11ec-ba82-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml
index 2765a0e53ce2..6b5721bc881a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_count.yaml
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:09:52 GMT
+      - Tue, 31 Aug 2021 17:05:41 GMT
       elapsed-time:
-      - '98'
+      - '80'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3c405878-09ce-11ec-a236-74c63bed1137
+      - acb9dedd-0a7d-11ec-bb85-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml
index 1580a1020dad..a7728743727f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_basic_live.test_get_document_missing.yaml
@@ -21,15 +21,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:10:05 GMT
+      - Tue, 31 Aug 2021 17:05:54 GMT
       elapsed-time:
-      - '99'
+      - '22'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 445e8c47-09ce-11ec-84fa-74c63bed1137
+      - b521612f-0a7d-11ec-a57b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml
index 588f09b26d7a..e8ee422fc836 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_existing.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchf9201cc0.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf9201cc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF22EAEEF8C\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf9201cc0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA19E42FEA6\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:10:19 GMT
+      - Tue, 31 Aug 2021 17:06:09 GMT
       elapsed-time:
-      - '44'
+      - '668'
       etag:
-      - W/"0x8D96BF22EAEEF8C"
+      - W/"0x8D96CA19E42FEA6"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4ca2f9e3-09ce-11ec-88b4-74c63bed1137
+      - bd4b77a0-0a7d-11ec-8961-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:10:20 GMT
+      - Tue, 31 Aug 2021 17:06:09 GMT
       elapsed-time:
-      - '160'
+      - '843'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4cd10782-09ce-11ec-b6b6-74c63bed1137
+      - bdde8a95-0a7d-11ec-941b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:10:23 GMT
+      - Tue, 31 Aug 2021 17:06:14 GMT
       elapsed-time:
-      - '23'
+      - '63'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4ed8f4c6-09ce-11ec-87a3-74c63bed1137
+      - c0508d3a-0a7d-11ec-8d41-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -160,15 +160,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:10:23 GMT
+      - Tue, 31 Aug 2021 17:06:14 GMT
       elapsed-time:
-      - '25'
+      - '4'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 4f0aa62a-09ce-11ec-80c8-74c63bed1137
+      - c08d0121-0a7d-11ec-b1bd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -196,15 +196,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:10:23 GMT
+      - Tue, 31 Aug 2021 17:06:14 GMT
       elapsed-time:
-      - '6'
+      - '3'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 4f1578b1-09ce-11ec-a088-74c63bed1137
+      - c0948d81-0a7d-11ec-9903-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml
index 12361f8f6afb..2fd1af9830b9 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_delete_documents_missing.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchdc521c4f.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchdc521c4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF23A05B684\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchdc521c4f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA1AAE65460\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:10:38 GMT
+      - Tue, 31 Aug 2021 17:06:30 GMT
       elapsed-time:
-      - '74'
+      - '60'
       etag:
-      - W/"0x8D96BF23A05B684"
+      - W/"0x8D96CA1AAE65460"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 57f0805d-09ce-11ec-a3bc-74c63bed1137
+      - c9f7c33d-0a7d-11ec-8df1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:10:38 GMT
+      - Tue, 31 Aug 2021 17:06:29 GMT
       elapsed-time:
-      - '105'
+      - '223'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5827ab5b-09ce-11ec-aeff-74c63bed1137
+      - ca2b3f4f-0a7d-11ec-8764-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,7 +118,7 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:10:41 GMT
+      - Tue, 31 Aug 2021 17:06:33 GMT
       elapsed-time:
       - '5'
       expires:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5a2384ac-09ce-11ec-8287-74c63bed1137
+      - cc39f6ce-0a7d-11ec-ad39-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -160,15 +160,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:10:41 GMT
+      - Tue, 31 Aug 2021 17:06:33 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 5a47c054-09ce-11ec-948f-74c63bed1137
+      - cc69007d-0a7d-11ec-a6d5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -196,7 +196,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:10:41 GMT
+      - Tue, 31 Aug 2021 17:06:33 GMT
       elapsed-time:
       - '3'
       expires:
@@ -204,7 +204,7 @@ interactions:
       pragma:
       - no-cache
       request-id:
-      - 5a509081-09ce-11ec-90aa-74c63bed1137
+      - cc72154c-0a7d-11ec-9ac5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml
index f00a74e2333a..75d109f28c49 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_existing.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchdd361c5d.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchdd361c5d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF24472DCEB\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchdd361c5d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA1B597DF8D\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:10:56 GMT
+      - Tue, 31 Aug 2021 17:07:09 GMT
       elapsed-time:
-      - '28'
+      - '47'
       etag:
-      - W/"0x8D96BF24472DCEB"
+      - W/"0x8D96CA1B597DF8D"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 625dd752-09ce-11ec-9424-74c63bed1137
+      - e16da41e-0a7d-11ec-9b2e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:10:56 GMT
+      - Tue, 31 Aug 2021 17:07:09 GMT
       elapsed-time:
-      - '99'
+      - '44'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 62850d79-09ce-11ec-b324-74c63bed1137
+      - e1a1aaba-0a7d-11ec-9028-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:10:59 GMT
+      - Tue, 31 Aug 2021 17:07:12 GMT
       elapsed-time:
-      - '5'
+      - '190'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6483bcf9-09ce-11ec-bcff-74c63bed1137
+      - e3936ac2-0a7d-11ec-8353-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -163,9 +163,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:10:59 GMT
+      - Tue, 31 Aug 2021 17:07:13 GMT
       elapsed-time:
-      - '11'
+      - '33'
       expires:
       - '-1'
       odata-version:
@@ -175,7 +175,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 64acaae3-09ce-11ec-9550-74c63bed1137
+      - e3d128ca-0a7d-11ec-9c2a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -208,9 +208,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:10:59 GMT
+      - Tue, 31 Aug 2021 17:07:13 GMT
       elapsed-time:
-      - '7'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -220,7 +220,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 64b72f69-09ce-11ec-a15b-74c63bed1137
+      - e3df1e0a-0a7d-11ec-8acc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml
index d0422fe071de..6743d21ea6f0 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_documents_missing.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchc0cb1bec.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchc0cb1bec.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF24EC54A6F\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchc0cb1bec.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA1CD200EE7\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:11:13 GMT
+      - Tue, 31 Aug 2021 17:07:27 GMT
       elapsed-time:
-      - '22'
+      - '48'
       etag:
-      - W/"0x8D96BF24EC54A6F"
+      - W/"0x8D96CA1CD200EE7"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6cacd454-09ce-11ec-851b-74c63bed1137
+      - ec5a7d61-0a7d-11ec-93c0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:11:13 GMT
+      - Tue, 31 Aug 2021 17:07:28 GMT
       elapsed-time:
-      - '52'
+      - '228'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6ccb653e-09ce-11ec-aee5-74c63bed1137
+      - ec92ba91-0a7d-11ec-a3b7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,9 +119,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:11:16 GMT
+      - Tue, 31 Aug 2021 17:07:31 GMT
       elapsed-time:
-      - '98'
+      - '59'
       expires:
       - '-1'
       odata-version:
@@ -131,7 +131,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6ec36ab4-09ce-11ec-b966-74c63bed1137
+      - eea142a3-0a7d-11ec-9d27-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -161,15 +161,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:11:16 GMT
+      - Tue, 31 Aug 2021 17:07:31 GMT
       elapsed-time:
-      - '5'
+      - '8'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 6eec95f0-09ce-11ec-ad60-74c63bed1137
+      - eec9dfe9-0a7d-11ec-8dc9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -200,9 +200,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:11:16 GMT
+      - Tue, 31 Aug 2021 17:07:31 GMT
       elapsed-time:
-      - '10'
+      - '15'
       expires:
       - '-1'
       odata-version:
@@ -212,7 +212,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6ef3b937-09ce-11ec-87f7-74c63bed1137
+      - eed2cc66-0a7d-11ec-ba18-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml
index 04bbc694a74b..48b2c6361608 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_merge_or_upload_documents.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchf9541cb7.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf9541cb7.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF259BDDA8E\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf9541cb7.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA1D89F21CD\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:11:31 GMT
+      - Tue, 31 Aug 2021 17:07:46 GMT
       elapsed-time:
-      - '37'
+      - '30'
       etag:
-      - W/"0x8D96BF259BDDA8E"
+      - W/"0x8D96CA1D89F21CD"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 77a58c33-09ce-11ec-b19b-74c63bed1137
+      - f7b3a2b3-0a7d-11ec-9bd5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:11:31 GMT
+      - Tue, 31 Aug 2021 17:07:47 GMT
       elapsed-time:
-      - '24'
+      - '118'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 77c846fc-09ce-11ec-a4d5-74c63bed1137
+      - f7e48d5d-0a7d-11ec-bc83-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,9 +118,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:11:35 GMT
+      - Tue, 31 Aug 2021 17:07:50 GMT
       elapsed-time:
-      - '76'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -130,7 +130,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 79b02291-09ce-11ec-b28d-74c63bed1137
+      - f9e44e75-0a7d-11ec-9ee3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -162,9 +162,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:11:35 GMT
+      - Tue, 31 Aug 2021 17:07:50 GMT
       elapsed-time:
-      - '8'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -174,7 +174,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 79d5e52a-09ce-11ec-a714-74c63bed1137
+      - fa06591a-0a7d-11ec-a7ea-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -207,9 +207,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:11:35 GMT
+      - Tue, 31 Aug 2021 17:07:50 GMT
       elapsed-time:
-      - '7'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -219,7 +219,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 79de0545-09ce-11ec-a2e6-74c63bed1137
+      - fa0f3c92-0a7d-11ec-b6e4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml
index e36ea3ec3eb2..1bedd60752a6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_existing.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchfb0a1cd2.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfb0a1cd2.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF263C59CBE\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchfb0a1cd2.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA1E30E40A0\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:11:48 GMT
+      - Tue, 31 Aug 2021 17:08:04 GMT
       elapsed-time:
-      - '24'
+      - '31'
       etag:
-      - W/"0x8D96BF263C59CBE"
+      - W/"0x8D96CA1E30E40A0"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 81ad73c8-09ce-11ec-8996-74c63bed1137
+      - 0241f8b6-0a7e-11ec-b9fb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:11:48 GMT
+      - Tue, 31 Aug 2021 17:08:04 GMT
       elapsed-time:
-      - '122'
+      - '31'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 81d3dfb1-09ce-11ec-887d-74c63bed1137
+      - 026b0816-0a7e-11ec-bae3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,9 +119,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:11:52 GMT
+      - Tue, 31 Aug 2021 17:08:07 GMT
       elapsed-time:
-      - '89'
+      - '183'
       expires:
       - '-1'
       odata-version:
@@ -131,7 +131,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 83cbacd8-09ce-11ec-a8f1-74c63bed1137
+      - 0463052c-0a7e-11ec-8b0d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml
index ed9d16d7a4f4..a6641b0cec43 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_buffered_sender_live.test_upload_documents_new.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://search6f1f1ab1.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search6f1f1ab1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF26DD59E24\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search6f1f1ab1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA1ED76A7BB\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:12:05 GMT
+      - Tue, 31 Aug 2021 17:08:21 GMT
       elapsed-time:
-      - '27'
+      - '36'
       etag:
-      - W/"0x8D96BF26DD59E24"
+      - W/"0x8D96CA1ED76A7BB"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8bc7bea4-09ce-11ec-966c-74c63bed1137
+      - 0c86193e-0a7e-11ec-a4cd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:05 GMT
+      - Tue, 31 Aug 2021 17:08:22 GMT
       elapsed-time:
-      - '102'
+      - '40'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8befbdda-09ce-11ec-8667-74c63bed1137
+      - 0cbd3b5d-0a7e-11ec-bf1d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,9 +119,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:12:09 GMT
+      - Tue, 31 Aug 2021 17:08:25 GMT
       elapsed-time:
-      - '7'
+      - '90'
       expires:
       - '-1'
       odata-version:
@@ -131,7 +131,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8de828c9-09ce-11ec-826e-74c63bed1137
+      - 0eb197a9-0a7e-11ec-8f9b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -163,9 +163,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:09 GMT
+      - Tue, 31 Aug 2021 17:08:25 GMT
       elapsed-time:
-      - '13'
+      - '145'
       expires:
       - '-1'
       odata-version:
@@ -175,7 +175,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8e02e478-09ce-11ec-9a85-74c63bed1137
+      - 0ee029cf-0a7e-11ec-a32b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -207,9 +207,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:09 GMT
+      - Tue, 31 Aug 2021 17:08:25 GMT
       elapsed-time:
-      - '5'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -219,7 +219,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8e0b7e30-09ce-11ec-ac6b-74c63bed1137
+      - 0f03953f-0a7e-11ec-a2a9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml
index 742399ca4a3c..b13e16962d1c 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_existing.yaml
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:21 GMT
+      - Tue, 31 Aug 2021 17:08:39 GMT
       elapsed-time:
-      - '101'
+      - '22'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9549c7e0-09ce-11ec-973c-74c63bed1137
+      - 170a30d4-0a7e-11ec-b8f1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -72,9 +72,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:12:24 GMT
+      - Tue, 31 Aug 2021 17:08:42 GMT
       elapsed-time:
-      - '22'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 97417251-09ce-11ec-ab4c-74c63bed1137
+      - 19022cba-0a7e-11ec-843f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -114,15 +114,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:12:24 GMT
+      - Tue, 31 Aug 2021 17:08:42 GMT
       elapsed-time:
-      - '5'
+      - '6'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 974e4fab-09ce-11ec-9bab-74c63bed1137
+      - 190bb212-0a7e-11ec-b46e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -150,15 +150,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:12:24 GMT
+      - Tue, 31 Aug 2021 17:08:42 GMT
       elapsed-time:
-      - '5'
+      - '6'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 97564906-09ce-11ec-acdc-74c63bed1137
+      - 19153f4c-0a7e-11ec-bd6d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml
index cb2b38650ac6..65a676a08133 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_delete_documents_missing.yaml
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:36 GMT
+      - Tue, 31 Aug 2021 17:08:56 GMT
       elapsed-time:
-      - '103'
+      - '81'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9e7683c5-09ce-11ec-a4cb-74c63bed1137
+      - 212cebdf-0a7e-11ec-a482-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -72,9 +72,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:12:39 GMT
+      - Tue, 31 Aug 2021 17:08:59 GMT
       elapsed-time:
-      - '7'
+      - '4'
       expires:
       - '-1'
       odata-version:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a06c931c-09ce-11ec-80f1-74c63bed1137
+      - 2322eaa1-0a7e-11ec-ac78-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -114,15 +114,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:12:39 GMT
+      - Tue, 31 Aug 2021 17:08:59 GMT
       elapsed-time:
-      - '4'
+      - '3'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - a074eacb-09ce-11ec-954e-74c63bed1137
+      - 232becae-0a7e-11ec-a54b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -150,7 +150,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:12:39 GMT
+      - Tue, 31 Aug 2021 17:08:59 GMT
       elapsed-time:
       - '4'
       expires:
@@ -158,7 +158,7 @@ interactions:
       pragma:
       - no-cache
       request-id:
-      - a07be560-09ce-11ec-968e-74c63bed1137
+      - 2333f30f-0a7e-11ec-83c5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml
index 9eb96b3e00be..f07bca4d549f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_existing.yaml
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:52 GMT
+      - Tue, 31 Aug 2021 17:09:14 GMT
       elapsed-time:
-      - '22'
+      - '97'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a81578f5-09ce-11ec-a8ef-74c63bed1137
+      - 2c2a2ab2-0a7e-11ec-844d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -72,7 +72,7 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:12:55 GMT
+      - Tue, 31 Aug 2021 17:09:18 GMT
       elapsed-time:
       - '5'
       expires:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a9fdfe71-09ce-11ec-8439-74c63bed1137
+      - 2e307d82-0a7e-11ec-9ad4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,7 +117,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:55 GMT
+      - Tue, 31 Aug 2021 17:09:18 GMT
       elapsed-time:
       - '14'
       expires:
@@ -129,7 +129,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - aa059974-09ce-11ec-8027-74c63bed1137
+      - 2e397bfe-0a7e-11ec-8bd9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -162,9 +162,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:12:55 GMT
+      - Tue, 31 Aug 2021 17:09:18 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -174,7 +174,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - aa118854-09ce-11ec-85f1-74c63bed1137
+      - 2e460721-0a7e-11ec-9933-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml
index 5e0a444680c8..515fc73bdf8a 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_documents_missing.yaml
@@ -29,9 +29,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:10 GMT
+      - Tue, 31 Aug 2021 17:09:31 GMT
       elapsed-time:
-      - '37'
+      - '119'
       expires:
       - '-1'
       odata-version:
@@ -41,7 +41,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b24baa80-09ce-11ec-a09b-74c63bed1137
+      - 366617ae-0a7e-11ec-8286-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -73,9 +73,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:13:13 GMT
+      - Tue, 31 Aug 2021 17:09:34 GMT
       elapsed-time:
-      - '4'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -85,7 +85,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b43640b0-09ce-11ec-87fb-74c63bed1137
+      - 386863b2-0a7e-11ec-b241-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -115,15 +115,15 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 30 Aug 2021 20:13:13 GMT
+      - Tue, 31 Aug 2021 17:09:35 GMT
       elapsed-time:
-      - '4'
+      - '5'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - b43db8ca-09ce-11ec-8009-74c63bed1137
+      - 386fce0d-0a7e-11ec-be90-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -154,9 +154,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:13 GMT
+      - Tue, 31 Aug 2021 17:09:35 GMT
       elapsed-time:
-      - '16'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -166,7 +166,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b44557fc-09ce-11ec-90fa-74c63bed1137
+      - 3876fad8-0a7e-11ec-b207-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml
index a8f7ff0c7ee2..8b7edb60f0b0 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_merge_or_upload_documents.yaml
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:26 GMT
+      - Tue, 31 Aug 2021 17:09:48 GMT
       elapsed-time:
-      - '104'
+      - '218'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bbd69848-09ce-11ec-a6cd-74c63bed1137
+      - 3fdef405-0a7e-11ec-9b92-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -72,9 +72,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:13:28 GMT
+      - Tue, 31 Aug 2021 17:09:51 GMT
       elapsed-time:
-      - '4'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -84,7 +84,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bdcc2a16-09ce-11ec-a769-74c63bed1137
+      - 41f035d9-0a7e-11ec-8795-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -116,9 +116,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:28 GMT
+      - Tue, 31 Aug 2021 17:09:51 GMT
       elapsed-time:
-      - '7'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -128,7 +128,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bdd3a579-09ce-11ec-b688-74c63bed1137
+      - 41f755b9-0a7e-11ec-a4e7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -161,9 +161,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:28 GMT
+      - Tue, 31 Aug 2021 17:09:51 GMT
       elapsed-time:
-      - '7'
+      - '8'
       expires:
       - '-1'
       odata-version:
@@ -173,7 +173,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bddb746f-09ce-11ec-9ab9-74c63bed1137
+      - 41ff215b-0a7e-11ec-87f6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml
index 44d85db4af4e..eeb888f8ea42 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_existing.yaml
@@ -29,7 +29,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:41 GMT
+      - Tue, 31 Aug 2021 17:10:05 GMT
       elapsed-time:
       - '129'
       expires:
@@ -41,7 +41,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c57b96dc-09ce-11ec-afa8-74c63bed1137
+      - 4a550357-0a7e-11ec-9d57-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml
index 4344cf597bed..ee7ae8b4bc97 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_index_document_live.test_upload_documents_new.yaml
@@ -29,9 +29,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:55 GMT
+      - Tue, 31 Aug 2021 17:10:19 GMT
       elapsed-time:
-      - '103'
+      - '121'
       expires:
       - '-1'
       odata-version:
@@ -41,7 +41,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cd19365c-09ce-11ec-ac90-74c63bed1137
+      - 52dd3f25-0a7e-11ec-b277-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -73,9 +73,9 @@ interactions:
       content-type:
       - text/plain
       date:
-      - Mon, 30 Aug 2021 20:13:57 GMT
+      - Tue, 31 Aug 2021 17:10:22 GMT
       elapsed-time:
-      - '6'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -85,7 +85,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cf0d7af8-09ce-11ec-a7b5-74c63bed1137
+      - 54e2128f-0a7e-11ec-8a18-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,9 +117,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:57 GMT
+      - Tue, 31 Aug 2021 17:10:22 GMT
       elapsed-time:
-      - '8'
+      - '10'
       expires:
       - '-1'
       odata-version:
@@ -129,7 +129,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cf1591a9-09ce-11ec-a4e9-74c63bed1137
+      - 54e98e3b-0a7e-11ec-8ba1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -161,9 +161,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:13:57 GMT
+      - Tue, 31 Aug 2021 17:10:22 GMT
       elapsed-time:
-      - '6'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -173,7 +173,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - cf1db4f6-09ce-11ec-8f54-74c63bed1137
+      - 54f1c06e-0a7e-11ec-b986-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml
index d2c2451c342d..e7381a7d8cd7 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_autocomplete.yaml
@@ -27,9 +27,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:14:11 GMT
+      - Tue, 31 Aug 2021 17:10:37 GMT
       elapsed-time:
-      - '186'
+      - '251'
       expires:
       - '-1'
       odata-version:
@@ -39,7 +39,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - d6ee19d6-09ce-11ec-b372-74c63bed1137
+      - 5d8254ab-0a7e-11ec-bab7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml
index 5cb93cea80ab..a4918a49beb7 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_counts.yaml
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:14:25 GMT
+      - Tue, 31 Aug 2021 17:10:50 GMT
       elapsed-time:
-      - '136'
+      - '66'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - df21584a-09ce-11ec-a351-74c63bed1137
+      - 650b25b5-0a7e-11ec-b8e9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -169,9 +169,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:14:25 GMT
+      - Tue, 31 Aug 2021 17:10:50 GMT
       elapsed-time:
-      - '8'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -181,7 +181,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - df53b59b-09ce-11ec-8c6c-74c63bed1137
+      - 653f6f31-0a7e-11ec-9461-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml
index 7cd1d8ae1e0c..f1f32467c6a1 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_coverage.yaml
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:14:37 GMT
+      - Tue, 31 Aug 2021 17:11:03 GMT
       elapsed-time:
-      - '125'
+      - '298'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e7036bcc-09ce-11ec-9a40-74c63bed1137
+      - 6d1a5ac5-0a7e-11ec-a45c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -169,7 +169,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:14:38 GMT
+      - Tue, 31 Aug 2021 17:11:03 GMT
       elapsed-time:
       - '9'
       expires:
@@ -181,7 +181,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e73dde2b-09ce-11ec-aeb4-74c63bed1137
+      - 6d6eb962-0a7e-11ec-97c9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml
index c78021149a8a..19df06de20c0 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_none.yaml
@@ -37,9 +37,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:14:52 GMT
+      - Tue, 31 Aug 2021 17:11:17 GMT
       elapsed-time:
-      - '105'
+      - '106'
       expires:
       - '-1'
       odata-version:
@@ -49,7 +49,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ef2663f1-09ce-11ec-ac60-74c63bed1137
+      - 75fc1941-0a7e-11ec-9c47-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml
index 430431084dac..8512b383c310 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_facets_result.yaml
@@ -37,9 +37,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:06 GMT
+      - Tue, 31 Aug 2021 17:11:32 GMT
       elapsed-time:
-      - '155'
+      - '337'
       expires:
       - '-1'
       odata-version:
@@ -49,7 +49,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f78b6ffb-09ce-11ec-83b3-74c63bed1137
+      - 7e38bcd8-0a7e-11ec-a88b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml
index 6abeba9716c2..6883ab9e77aa 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter.yaml
@@ -34,9 +34,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:18 GMT
+      - Tue, 31 Aug 2021 17:11:47 GMT
       elapsed-time:
-      - '115'
+      - '113'
       expires:
       - '-1'
       odata-version:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - fe8709d3-09ce-11ec-bccd-74c63bed1137
+      - 86e6e201-0a7e-11ec-8bfd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml
index 6aa8e3f4ff01..135bec6e63d0 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_filter_array.yaml
@@ -34,9 +34,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:31 GMT
+      - Tue, 31 Aug 2021 17:12:01 GMT
       elapsed-time:
-      - '157'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 06749ee6-09cf-11ec-a629-74c63bed1137
+      - 8f70c3bd-0a7e-11ec-ab4f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml
index 0208ae11f2c9..30301f7f7e90 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple.yaml
@@ -74,9 +74,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:44 GMT
+      - Tue, 31 Aug 2021 17:12:15 GMT
       elapsed-time:
-      - '149'
+      - '138'
       expires:
       - '-1'
       odata-version:
@@ -86,7 +86,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0e6fdc8f-09cf-11ec-b15b-74c63bed1137
+      - 97e362f7-0a7e-11ec-9892-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -142,9 +142,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:44 GMT
+      - Tue, 31 Aug 2021 17:12:15 GMT
       elapsed-time:
-      - '12'
+      - '7'
       expires:
       - '-1'
       odata-version:
@@ -154,7 +154,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0ea2f266-09cf-11ec-a140-74c63bed1137
+      - 98173e60-0a7e-11ec-a2ac-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml
index b5caebd4b0e7..dda86003fa10 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_get_search_simple_with_top.yaml
@@ -44,9 +44,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:57 GMT
+      - Tue, 31 Aug 2021 17:12:29 GMT
       elapsed-time:
-      - '138'
+      - '27'
       expires:
       - '-1'
       odata-version:
@@ -56,7 +56,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 16b3a623-09cf-11ec-a5d5-74c63bed1137
+      - a0612520-0a7e-11ec-b5ec-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -112,9 +112,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:15:57 GMT
+      - Tue, 31 Aug 2021 17:12:29 GMT
       elapsed-time:
-      - '16'
+      - '19'
       expires:
       - '-1'
       odata-version:
@@ -124,7 +124,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 16f32bcb-09cf-11ec-b1f5-74c63bed1137
+      - a08a8e53-0a7e-11ec-a0ee-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml
index ecde302d77ae..94d40d0785c6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_client_search_live.test_suggest.yaml
@@ -28,9 +28,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=none
       date:
-      - Mon, 30 Aug 2021 20:16:11 GMT
+      - Tue, 31 Aug 2021 17:12:44 GMT
       elapsed-time:
-      - '270'
+      - '78'
       expires:
       - '-1'
       odata-version:
@@ -40,7 +40,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1e490e22-09cf-11ec-b8ec-74c63bed1137
+      - a941af45-0a7e-11ec-9d92-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
index 3b95c7ac25d4..b0f9ed380e4d 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search54bc1a2e.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54bc1a2e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10C99585E8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54bc1a2e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA294A6E44A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:20 GMT
+      - Tue, 31 Aug 2021 17:12:58 GMT
       elapsed-time:
-      - '48'
+      - '211'
       etag:
-      - W/"0x8D96C10C99585E8"
+      - W/"0x8D96CA294A6E44A"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - e573d7be-09ec-11ec-805f-74c63bed1137
+      - b15c28c1-0a7e-11ec-959a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
index 682c7e4d6470..96f1741316e4 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10D1F476B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA29DA678C5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:34 GMT
+      - Tue, 31 Aug 2021 17:13:13 GMT
       elapsed-time:
-      - '51'
+      - '347'
       etag:
-      - W/"0x8D96C10D1F476B5"
+      - W/"0x8D96CA29DA678C5"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - edd7e25f-09ec-11ec-ac26-74c63bed1137
+      - ba3cf4b7-0a7e-11ec-b330-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C10D1F476B5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA29DA678C5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:34 GMT
+      - Tue, 31 Aug 2021 17:13:13 GMT
       elapsed-time:
-      - '12'
+      - '58'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ee0e52c8-09ec-11ec-853b-74c63bed1137
+      - ba9a58f2-0a7e-11ec-9432-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,7 +118,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10D20CBE0A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA29DC43F60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -127,11 +127,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:34 GMT
+      - Tue, 31 Aug 2021 17:13:13 GMT
       elapsed-time:
-      - '38'
+      - '50'
       etag:
-      - W/"0x8D96C10D20CBE0A"
+      - W/"0x8D96CA29DC43F60"
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ee1913ed-09ec-11ec-b213-74c63bed1137
+      - baaa2f0c-0a7e-11ec-87f4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -164,7 +164,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C10D20CBE0A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA29DC43F60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -173,9 +173,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:34 GMT
+      - Tue, 31 Aug 2021 17:13:13 GMT
       elapsed-time:
-      - '13'
+      - '15'
       expires:
       - '-1'
       odata-version:
@@ -185,7 +185,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ee27842c-09ec-11ec-a81d-74c63bed1137
+      - bab92c51-0a7e-11ec-8858-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -208,7 +208,7 @@ interactions:
     uri: https://search715d1e50.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10D20CBE0A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search715d1e50.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA29DC43F60\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -217,11 +217,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:34 GMT
+      - Tue, 31 Aug 2021 17:13:13 GMT
       elapsed-time:
-      - '7'
+      - '20'
       etag:
-      - W/"0x8D96C10D20CBE0A"
+      - W/"0x8D96CA29DC43F60"
       expires:
       - '-1'
       odata-version:
@@ -231,7 +231,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ee32b51f-09ec-11ec-b2a5-74c63bed1137
+      - bac225bf-0a7e-11ec-8834-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
index 885bca3cb639..dae5c4c46575 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_create_or_update_datasource_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search2014238a.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10DACF64C1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2B3845418\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:49 GMT
+      - Tue, 31 Aug 2021 17:13:50 GMT
       elapsed-time:
-      - '48'
+      - '129'
       etag:
-      - W/"0x8D96C10DACF64C1"
+      - W/"0x8D96CA2B3845418"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f6b2d364-09ec-11ec-9a7a-74c63bed1137
+      - d04b2216-0a7e-11ec-8bf3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://search2014238a.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10DAE057C5\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search2014238a.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2B395471F\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:49 GMT
+      - Tue, 31 Aug 2021 17:13:50 GMT
       elapsed-time:
-      - '45'
+      - '46'
       etag:
-      - W/"0x8D96C10DAE057C5"
+      - W/"0x8D96CA2B395471F"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f6e9b8ba-09ec-11ec-9ee4-74c63bed1137
+      - d07a25ef-0a7e-11ec-9aa8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -108,7 +108,7 @@ interactions:
 - request:
     body: '{"name": "sample-datasource", "description": "changed", "type": "azureblob",
       "credentials": {"connectionString": "DefaultEndpointsProtocol=https;AccountName=storagename;AccountKey=NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg==;EndpointSuffix=core.windows.net"},
-      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96C10DACF64C1\""}'
+      "container": {"name": "searchcontainer"}, "@odata.etag": "\"0x8D96CA2B3845418\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -121,7 +121,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96C10DACF64C1"'
+      - '"0x8D96CA2B3845418"'
       Prefer:
       - return=representation
       User-Agent:
@@ -143,9 +143,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:49:49 GMT
+      - Tue, 31 Aug 2021 17:13:50 GMT
       elapsed-time:
-      - '7'
+      - '8'
       expires:
       - '-1'
       odata-version:
@@ -155,7 +155,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - f6fa5c2a-09ec-11ec-92b8-74c63bed1137
+      - d0886b00-0a7e-11ec-8488-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
index 5cbd5541fac1..7555499ac395 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10E2D24222\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2BC5A871B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:03 GMT
+      - Tue, 31 Aug 2021 17:14:05 GMT
       elapsed-time:
-      - '43'
+      - '50'
       etag:
-      - W/"0x8D96C10E2D24222"
+      - W/"0x8D96CA2BC5A871B"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - fec46198-09ec-11ec-b57b-74c63bed1137
+      - d91ebf13-0a7e-11ec-85c8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search549e1a2d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C10E2D24222\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search549e1a2d.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA2BC5A871B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:03 GMT
+      - Tue, 31 Aug 2021 17:14:05 GMT
       elapsed-time:
-      - '18'
+      - '45'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - feecf14b-09ec-11ec-91fa-74c63bed1137
+      - d94f920a-0a7e-11ec-8dec-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,15 +117,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Mon, 30 Aug 2021 23:50:03 GMT
+      - Tue, 31 Aug 2021 17:14:05 GMT
       elapsed-time:
-      - '24'
+      - '25'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - fef8b689-09ec-11ec-949e-74c63bed1137
+      - d95de0dc-0a7e-11ec-b53e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -155,7 +155,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:03 GMT
+      - Tue, 31 Aug 2021 17:14:05 GMT
       elapsed-time:
       - '7'
       expires:
@@ -167,7 +167,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ff04c563-09ec-11ec-ae44-74c63bed1137
+      - d96872ce-0a7e-11ec-8a06-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
index 8d68052d2f61..696b5733d76b 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://searchcd7f1f67.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10EB723F58\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2C4DA9B2B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:17 GMT
+      - Tue, 31 Aug 2021 17:14:18 GMT
       elapsed-time:
-      - '106'
+      - '53'
       etag:
-      - W/"0x8D96C10EB723F58"
+      - W/"0x8D96CA2C4DA9B2B"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 074f0cd3-09ed-11ec-9027-74c63bed1137
+      - e1abd2a4-0a7e-11ec-bd18-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://searchcd7f1f67.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10EB81845A\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchcd7f1f67.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2C4E88067\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:17 GMT
+      - Tue, 31 Aug 2021 17:14:18 GMT
       elapsed-time:
-      - '49'
+      - '29'
       etag:
-      - W/"0x8D96C10EB81845A"
+      - W/"0x8D96CA2C4E88067"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 078c8ff2-09ed-11ec-8747-74c63bed1137
+      - e1cfd3d8-0a7e-11ec-897b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,7 +117,7 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D96C10EB723F58"'
+      - '"0x8D96CA2C4DA9B2B"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -137,9 +137,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:17 GMT
+      - Tue, 31 Aug 2021 17:14:18 GMT
       elapsed-time:
-      - '7'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -149,7 +149,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 079d78db-09ed-11ec-bb40-74c63bed1137
+      - e1dbcc0d-0a7e-11ec-9945-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
index 834bbb486c29..1777440fcf94 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_delete_datasource_string_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://searchb71c225d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10F3B4F073\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2CDA5CFED\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:30 GMT
+      - Tue, 31 Aug 2021 17:14:33 GMT
       elapsed-time:
-      - '37'
+      - '49'
       etag:
-      - W/"0x8D96C10F3B4F073"
+      - W/"0x8D96CA2CDA5CFED"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0fa7a6e3-09ed-11ec-8621-74c63bed1137
+      - ea67426a-0a7e-11ec-beba-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://searchb71c225d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10F3C4839E\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchb71c225d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2CDB2A388\"","name":"sample-datasource","description":"updated","type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:30 GMT
+      - Tue, 31 Aug 2021 17:14:33 GMT
       elapsed-time:
-      - '40'
+      - '37'
       etag:
-      - W/"0x8D96C10F3C4839E"
+      - W/"0x8D96CA2CDB2A388"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0fcf71cd-09ed-11ec-a48c-74c63bed1137
+      - ea99709b-0a7e-11ec-92f4-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
index 6ab37a63bd49..6b68f9c0e8c1 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_get_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search7d318fa.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10FBFE0B4F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2D645F4FD\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:45 GMT
+      - Tue, 31 Aug 2021 17:14:48 GMT
       elapsed-time:
-      - '45'
+      - '50'
       etag:
-      - W/"0x8D96C10FBFE0B4F"
+      - W/"0x8D96CA2D645F4FD"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 17e236a0-09ed-11ec-a106-74c63bed1137
+      - f3177e17-0a7e-11ec-ba64-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search7d318fa.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10FBFE0B4F\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7d318fa.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2D645F4FD\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -75,11 +75,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:50:45 GMT
+      - Tue, 31 Aug 2021 17:14:48 GMT
       elapsed-time:
-      - '10'
+      - '18'
       etag:
-      - W/"0x8D96C10FBFE0B4F"
+      - W/"0x8D96CA2D645F4FD"
       expires:
       - '-1'
       odata-version:
@@ -89,7 +89,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1819746f-09ed-11ec-8d87-74c63bed1137
+      - f33a77f9-0a7e-11ec-890a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
index 4123d99effcc..480b5a881d24 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_data_source_live.test_list_datasource.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1105768E82\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2DEAAB3E8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:51:01 GMT
+      - Tue, 31 Aug 2021 17:15:02 GMT
       elapsed-time:
-      - '35'
+      - '33'
       etag:
-      - W/"0x8D96C1105768E82"
+      - W/"0x8D96CA2DEAAB3E8"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 21615943-09ed-11ec-8689-74c63bed1137
+      - fb7dc01f-0a7e-11ec-b1a9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -72,7 +72,7 @@ interactions:
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C110584E8FD\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA2DEB6C406\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -81,11 +81,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:51:01 GMT
+      - Tue, 31 Aug 2021 17:15:02 GMT
       elapsed-time:
-      - '39'
+      - '32'
       etag:
-      - W/"0x8D96C110584E8FD"
+      - W/"0x8D96CA2DEB6C406"
       expires:
       - '-1'
       location:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2190a8a4-09ed-11ec-a8b9-74c63bed1137
+      - fb9e6ba2-0a7e-11ec-bc10-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -118,7 +118,7 @@ interactions:
     uri: https://search22291976.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96C110584E8FD\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96C1105768E82\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
+      string: '{"@odata.context":"https://search22291976.search.windows.net/$metadata#datasources","value":[{"@odata.etag":"\"0x8D96CA2DEB6C406\"","name":"another-sample","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null},{"@odata.etag":"\"0x8D96CA2DEAAB3E8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -127,9 +127,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:51:01 GMT
+      - Tue, 31 Aug 2021 17:15:02 GMT
       elapsed-time:
-      - '19'
+      - '24'
       expires:
       - '-1'
       odata-version:
@@ -139,7 +139,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 219f706f-09ed-11ec-ad42-74c63bed1137
+      - fbaa5d61-0a7e-11ec-b9ee-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml
index 31b81ee8eeaf..c592052b4fde 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_analyze_text.yaml
@@ -27,9 +27,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:18:11 GMT
+      - Tue, 31 Aug 2021 17:15:17 GMT
       elapsed-time:
-      - '60'
+      - '51'
       expires:
       - '-1'
       odata-version:
@@ -39,7 +39,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 66271e92-09cf-11ec-acb9-74c63bed1137
+      - 044aceb0-0a7f-11ec-a683-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml
index f0e2c0fb01ca..2d9f569a9d3d 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_index.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://searchce941332.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchce941332.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF3550E40BF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchce941332.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA2F04738C4\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:18:29 GMT
+      - Tue, 31 Aug 2021 17:15:32 GMT
       elapsed-time:
-      - '952'
+      - '956'
       etag:
-      - W/"0x8D96BF3550E40BF"
+      - W/"0x8D96CA2F04738C4"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 70507711-09cf-11ec-9677-74c63bed1137
+      - 0c8e39de-0a7f-11ec-835f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml
index 54ab42c0967f..af7a0570ea20 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_index.yaml
@@ -25,7 +25,7 @@ interactions:
     uri: https://searcha5711754.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF35E80D3C8\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA2F9BBC46A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -34,11 +34,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:18:45 GMT
+      - Tue, 31 Aug 2021 17:15:48 GMT
       elapsed-time:
-      - '950'
+      - '913'
       etag:
-      - W/"0x8D96BF35E80D3C8"
+      - W/"0x8D96CA2F9BBC46A"
       expires:
       - '-1'
       location:
@@ -50,7 +50,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 79b29b15-09cf-11ec-b73d-74c63bed1137
+      - 15fc7f51-0a7f-11ec-a6b6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -82,7 +82,7 @@ interactions:
     uri: https://searcha5711754.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF35EAAF8B7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha5711754.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA2F9F33236\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -91,11 +91,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:18:45 GMT
+      - Tue, 31 Aug 2021 17:15:48 GMT
       elapsed-time:
-      - '226'
+      - '313'
       etag:
-      - W/"0x8D96BF35EAAF8B7"
+      - W/"0x8D96CA2F9F33236"
       expires:
       - '-1'
       odata-version:
@@ -105,7 +105,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7a6f9dab-09cf-11ec-bc6a-74c63bed1137
+      - 16b0fd17-0a7f-11ec-8e3c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml
index d1111b8b8aa9..060205b2b3d3 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_create_or_update_indexes_if_unchanged.yaml
@@ -21,7 +21,7 @@ interactions:
     uri: https://search34391d66.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF370464B1A\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA3034BA57E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:14 GMT
+      - Tue, 31 Aug 2021 17:16:04 GMT
       elapsed-time:
-      - '545'
+      - '705'
       etag:
-      - W/"0x8D96BF370464B1A"
+      - W/"0x8D96CA3034BA57E"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8bc68f30-09cf-11ec-9100-74c63bed1137
+      - 1fba676e-0a7f-11ec-b6a6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -76,7 +76,7 @@ interactions:
     uri: https://search34391d66.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF37080EDF1\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search34391d66.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA30372203B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -85,11 +85,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:15 GMT
+      - Tue, 31 Aug 2021 17:16:04 GMT
       elapsed-time:
-      - '333'
+      - '196'
       etag:
-      - W/"0x8D96BF37080EDF1"
+      - W/"0x8D96CA30372203B"
       expires:
       - '-1'
       odata-version:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8c3524c4-09cf-11ec-bc09-74c63bed1137
+      - 20404645-0a7f-11ec-9fc0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -111,7 +111,7 @@ interactions:
     body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
       "key": true, "retrievable": true, "searchable": false}, {"name": "baseRate",
       "type": "Edm.Double", "retrievable": true}], "scoringProfiles": [], "corsOptions":
-      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D96BF370464B1A\""}'
+      {"allowedOrigins": ["*"], "maxAgeInSeconds": 60}, "@odata.etag": "\"0x8D96CA3034BA57E\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -124,7 +124,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96BF370464B1A"'
+      - '"0x8D96CA3034BA57E"'
       Prefer:
       - return=representation
       User-Agent:
@@ -146,9 +146,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:15 GMT
+      - Tue, 31 Aug 2021 17:16:04 GMT
       elapsed-time:
-      - '20'
+      - '29'
       expires:
       - '-1'
       odata-version:
@@ -158,7 +158,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8c6f9baa-09cf-11ec-b7cd-74c63bed1137
+      - 206623f9-0a7f-11ec-aa7f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml
index a8bf1569a53c..bd3d7c218ec7 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes.yaml
@@ -21,15 +21,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Mon, 30 Aug 2021 20:19:31 GMT
+      - Tue, 31 Aug 2021 17:16:18 GMT
       elapsed-time:
-      - '167'
+      - '186'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 95a6ffa8-09cf-11ec-9ca8-74c63bed1137
+      - 28ad8b63-0a7f-11ec-8129-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -59,9 +59,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:36 GMT
+      - Tue, 31 Aug 2021 17:16:23 GMT
       elapsed-time:
-      - '26'
+      - '96'
       expires:
       - '-1'
       odata-version:
@@ -71,7 +71,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 98e5403d-09cf-11ec-95ce-74c63bed1137
+      - 2bde4ea3-0a7f-11ec-8269-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml
index e5cc47d3ca51..7bcbcf911a3b 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_delete_indexes_if_unchanged.yaml
@@ -21,7 +21,7 @@ interactions:
     uri: https://search1f361943.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF38510688D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA317E070F6\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[{"name":"MyProfile","functionAggregation":null,"text":null,"functions":[]}],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:49 GMT
+      - Tue, 31 Aug 2021 17:16:38 GMT
       elapsed-time:
-      - '568'
+      - '732'
       etag:
-      - W/"0x8D96BF38510688D"
+      - W/"0x8D96CA317E070F6"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a08f8077-09cf-11ec-bca2-74c63bed1137
+      - 3440b7f9-0a7f-11ec-b52c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -76,7 +76,7 @@ interactions:
     uri: https://search1f361943.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF38555BBB7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search1f361943.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA318053DCA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":{"allowedOrigins":["*"],"maxAgeInSeconds":60},"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -85,11 +85,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:50 GMT
+      - Tue, 31 Aug 2021 17:16:38 GMT
       elapsed-time:
-      - '405'
+      - '191'
       etag:
-      - W/"0x8D96BF38555BBB7"
+      - W/"0x8D96CA318053DCA"
       expires:
       - '-1'
       odata-version:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a0ff7f26-09cf-11ec-a5cb-74c63bed1137
+      - 34d4a85a-0a7f-11ec-a2d2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -119,7 +119,7 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D96BF38510688D"'
+      - '"0x8D96CA317E070F6"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -139,9 +139,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:19:50 GMT
+      - Tue, 31 Aug 2021 17:16:38 GMT
       elapsed-time:
-      - '20'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -151,7 +151,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a144539c-09cf-11ec-b203-74c63bed1137
+      - 34f9991b-0a7f-11ec-815c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml
index 91ff01336dc4..9d0dce66ab7f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://search966a11fe.search.windows.net/indexes('drgqefsg')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search966a11fe.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96BF38B42A0E6\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search966a11fe.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA31E8BBDD4\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -23,11 +23,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:20:03 GMT
+      - Tue, 31 Aug 2021 17:16:53 GMT
       elapsed-time:
-      - '23'
+      - '21'
       etag:
-      - W/"0x8D96BF38B42A0E6"
+      - W/"0x8D96CA31E8BBDD4"
       expires:
       - '-1'
       odata-version:
@@ -37,7 +37,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a92a13e1-09cf-11ec-bac4-74c63bed1137
+      - 3dacd1a1-0a7f-11ec-a62f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml
index bcb35db18bf9..ede31b7e5b9f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_index_statistics.yaml
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:20:17 GMT
+      - Tue, 31 Aug 2021 17:17:08 GMT
       elapsed-time:
-      - '44'
+      - '30'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b15321a8-09cf-11ec-92d1-74c63bed1137
+      - 465b627d-0a7f-11ec-a11d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml
index b546a0aff640..51d1516349eb 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_get_service_statistics.yaml
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:20:26 GMT
+      - Tue, 31 Aug 2021 17:17:18 GMT
       elapsed-time:
-      - '54'
+      - '66'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b6043300-09cf-11ec-b6c6-74c63bed1137
+      - 4cad5783-0a7f-11ec-b320-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml
index 443b256b832a..8787aab3998b 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes.yaml
@@ -14,7 +14,7 @@ interactions:
     uri: https://searchcf9c1352.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchcf9c1352.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D96BF39F3BB389\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
+      string: '{"@odata.context":"https://searchcf9c1352.search.windows.net/$metadata#indexes","value":[{"@odata.etag":"\"0x8D96CA3364DF38C\"","name":"drgqefsg","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"hotelName","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"category","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"parkingIncluded","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"lastRenovationDate","type":"Edm.DateTimeOffset","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"rating","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"location","type":"Edm.GeographyPoint","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"address","type":"Edm.ComplexType","fields":[{"name":"streetAddress","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"city","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"stateProvince","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"country","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"postalCode","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]},{"name":"rooms","type":"Collection(Edm.ComplexType)","fields":[{"name":"description","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"en.lucene","normalizer":null,"synonymMaps":[]},{"name":"descriptionFr","type":"Edm.String","searchable":true,"filterable":false,"retrievable":true,"sortable":false,"facetable":false,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":"fr.lucene","normalizer":null,"synonymMaps":[]},{"name":"type","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"baseRate","type":"Edm.Double","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"bedOptions","type":"Edm.String","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"sleepsCount","type":"Edm.Int32","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"smokingAllowed","type":"Edm.Boolean","searchable":false,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]},{"name":"tags","type":"Collection(Edm.String)","searchable":true,"filterable":true,"retrievable":true,"sortable":false,"facetable":true,"key":false,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}]}],"scoringProfiles":[{"name":"nearest","functionAggregation":"sum","text":null,"functions":[{"fieldName":"location","interpolation":"linear","type":"distance","boost":2.0,"freshness":null,"magnitude":null,"distance":{"referencePointParameter":"myloc","boostingDistance":100.0},"tag":null}]}],"corsOptions":null,"suggesters":[{"name":"sg","searchMode":"analyzingInfixMatching","sourceFields":["description","hotelName"]}],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}]}'
     headers:
       cache-control:
       - no-cache
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:20:37 GMT
+      - Tue, 31 Aug 2021 17:17:32 GMT
       elapsed-time:
-      - '53'
+      - '73'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bd27a3ae-09cf-11ec-9792-74c63bed1137
+      - 55616a12-0a7f-11ec-89dc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml
index 704c50ff3f88..a7d8f7f03d13 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_live.test_list_indexes_empty.yaml
@@ -23,9 +23,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:20:45 GMT
+      - Tue, 31 Aug 2021 17:17:43 GMT
       elapsed-time:
-      - '37'
+      - '30'
       expires:
       - '-1'
       odata-version:
@@ -35,7 +35,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - c1f9e651-09cf-11ec-8892-74c63bed1137
+      - 5b3173ac-0a7f-11ec-a127-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
index 9eafa4e6cb02..453bd2e66243 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFA40248F2F\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA349E40C66\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:08:01 GMT
+      - Tue, 31 Aug 2021 17:18:02 GMT
       elapsed-time:
-      - '36'
+      - '1665'
       etag:
-      - W/"0x8D96BFA40248F2F"
+      - W/"0x8D96CA349E40C66"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5bf7bfd5-09d6-11ec-842d-74c63bed1137
+      - 65af3aa0-0a7f-11ec-9731-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -78,7 +78,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFA4032E9BC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA349F8F7C5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:08:01 GMT
+      - Tue, 31 Aug 2021 17:18:02 GMT
       elapsed-time:
-      - '37'
+      - '80'
       etag:
-      - W/"0x8D96BFA4032E9BC"
+      - W/"0x8D96CA349F8F7C5"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5c1d498e-09d6-11ec-8489-74c63bed1137
+      - 66d9146e-0a7f-11ec-b4bf-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -124,7 +124,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BFA4032E9BC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA349F8F7C5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:08:01 GMT
+      - Tue, 31 Aug 2021 17:18:02 GMT
       elapsed-time:
-      - '31'
+      - '37'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5c2bc4bc-09d6-11ec-b780-74c63bed1137
+      - 66ed8172-0a7f-11ec-9b20-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -168,7 +168,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BFA4032E9BC\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA349F8F7C5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -177,11 +177,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:08:01 GMT
+      - Tue, 31 Aug 2021 17:18:02 GMT
       elapsed-time:
-      - '15'
+      - '34'
       etag:
-      - W/"0x8D96BFA4032E9BC"
+      - W/"0x8D96CA349F8F7C5"
       expires:
       - '-1'
       odata-version:
@@ -191,7 +191,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5c3a3a5f-09d6-11ec-b56c-74c63bed1137
+      - 66fa9d72-0a7f-11ec-a9b7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
index 4977660d8bf6..ab540b9cb082 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://search792321ab.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF96B8C336D\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA3568D93AC\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:03 GMT
+      - Tue, 31 Aug 2021 17:18:23 GMT
       elapsed-time:
-      - '95'
+      - '2813'
       etag:
-      - W/"0x8D96BF96B8C336D"
+      - W/"0x8D96CA3568D93AC"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 87406d57-09d5-11ec-8053-74c63bed1137
+      - 71ac8439-0a7f-11ec-ab9c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -78,7 +78,7 @@ interactions:
     uri: https://search792321ab.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF96B9CB12F\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA356A082DE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:03 GMT
+      - Tue, 31 Aug 2021 17:18:23 GMT
       elapsed-time:
-      - '38'
+      - '66'
       etag:
-      - W/"0x8D96BF96B9CB12F"
+      - W/"0x8D96CA356A082DE"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8784a79f-09d5-11ec-8635-74c63bed1137
+      - 738339b9-0a7f-11ec-b768-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -124,7 +124,7 @@ interactions:
     uri: https://search792321ab.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF96B9CB12F\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA356A082DE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:03 GMT
+      - Tue, 31 Aug 2021 17:18:23 GMT
       elapsed-time:
-      - '14'
+      - '40'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 87947ebc-09d5-11ec-b060-74c63bed1137
+      - 73950f5b-0a7f-11ec-8ee0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
index ad1c2859fe70..defc543f4930 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF975276429\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA35EF783A5\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:20 GMT
+      - Tue, 31 Aug 2021 17:18:37 GMT
       elapsed-time:
-      - '43'
+      - '49'
       etag:
-      - W/"0x8D96BF975276429"
+      - W/"0x8D96CA35EF783A5"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 90e81478-09d5-11ec-b3d1-74c63bed1137
+      - 7bbee75a-0a7f-11ec-bbae-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -78,7 +78,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF975371E7E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA35F0A99EE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:20 GMT
+      - Tue, 31 Aug 2021 17:18:37 GMT
       elapsed-time:
-      - '37'
+      - '72'
       etag:
-      - W/"0x8D96BF975371E7E"
+      - W/"0x8D96CA35F0A99EE"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 911f62f0-09d5-11ec-9064-74c63bed1137
+      - 7bec0608-0a7f-11ec-8ed0-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -124,7 +124,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF975371E7E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA35F0A99EE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:20 GMT
+      - Tue, 31 Aug 2021 17:18:37 GMT
       elapsed-time:
-      - '16'
+      - '17'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 912f00c9-09d5-11ec-b655-74c63bed1137
+      - 7bff13d8-0a7f-11ec-9902-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -168,7 +168,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF975371E7E\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA35F0A99EE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -177,11 +177,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:20 GMT
+      - Tue, 31 Aug 2021 17:18:37 GMT
       elapsed-time:
-      - '12'
+      - '32'
       etag:
-      - W/"0x8D96BF975371E7E"
+      - W/"0x8D96CA35F0A99EE"
       expires:
       - '-1'
       odata-version:
@@ -191,7 +191,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 913ac541-09d5-11ec-b553-74c63bed1137
+      - 7c0f1527-0a7f-11ec-a32d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
index be6f95d683a6..c3917a8bcf88 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
@@ -22,7 +22,7 @@ interactions:
     uri: https://searchd998184f.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF97DC89DCF\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA367D69224\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -31,11 +31,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:35 GMT
+      - Tue, 31 Aug 2021 17:18:52 GMT
       elapsed-time:
-      - '73'
+      - '81'
       etag:
-      - W/"0x8D96BF97DC89DCF"
+      - W/"0x8D96CA367D69224"
       expires:
       - '-1'
       location:
@@ -47,7 +47,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 998f903e-09d5-11ec-9f5e-74c63bed1137
+      - 849c3bdd-0a7f-11ec-95d9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -68,7 +68,7 @@ interactions:
     uri: https://searchd998184f.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF97DC89DCF\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
+      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA367D69224\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
         Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
@@ -78,7 +78,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:35 GMT
+      - Tue, 31 Aug 2021 17:18:52 GMT
       elapsed-time:
       - '23'
       expires:
@@ -90,7 +90,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 99c0b254-09d5-11ec-881b-74c63bed1137
+      - 84cb7cd0-0a7f-11ec-97f8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
index 96d85681b9f8..6bc396a42ff1 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF985E63753\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA37075F29B\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:48 GMT
+      - Tue, 31 Aug 2021 17:19:07 GMT
       elapsed-time:
-      - '47'
+      - '57'
       etag:
-      - W/"0x8D96BF985E63753"
+      - W/"0x8D96CA37075F29B"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a1b4ad91-09d5-11ec-b524-74c63bed1137
+      - 8d472f1c-0a7f-11ec-acfa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF985E63753\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA37075F29B\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:48 GMT
+      - Tue, 31 Aug 2021 17:19:07 GMT
       elapsed-time:
-      - '18'
+      - '17'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a1de0f9a-09d5-11ec-bb2b-74c63bed1137
+      - 8d6a8c54-0a7f-11ec-b495-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,15 +117,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Mon, 30 Aug 2021 21:02:48 GMT
+      - Tue, 31 Aug 2021 17:19:07 GMT
       elapsed-time:
-      - '71'
+      - '34'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - a1e9367d-09d5-11ec-a886-74c63bed1137
+      - 8d73ffb3-0a7f-11ec-be49-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -155,7 +155,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:02:48 GMT
+      - Tue, 31 Aug 2021 17:19:07 GMT
       elapsed-time:
       - '7'
       expires:
@@ -167,7 +167,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a1fb98ad-09d5-11ec-8638-74c63bed1137
+      - 8d807f8f-0a7f-11ec-af36-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
index 8d3ec18f56e8..1264fae6c771 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search3a191d88.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF98F15E882\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA379232466\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:03 GMT
+      - Tue, 31 Aug 2021 17:19:21 GMT
       elapsed-time:
-      - '45'
+      - '1227'
       etag:
-      - W/"0x8D96BF98F15E882"
+      - W/"0x8D96CA379232466"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - aae0f6a6-09d5-11ec-9d48-74c63bed1137
+      - 95417ec7-0a7f-11ec-b55a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -75,7 +75,7 @@ interactions:
     uri: https://search3a191d88.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF98F23F4C9\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA37931A5F6\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -84,11 +84,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:03 GMT
+      - Tue, 31 Aug 2021 17:19:21 GMT
       elapsed-time:
       - '43'
       etag:
-      - W/"0x8D96BF98F23F4C9"
+      - W/"0x8D96CA37931A5F6"
       expires:
       - '-1'
       odata-version:
@@ -98,7 +98,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ab0d93bb-09d5-11ec-b6b0-74c63bed1137
+      - 9617d091-0a7f-11ec-86d3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,7 +118,7 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D96BF98F15E882"'
+      - '"0x8D96CA379232466"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -138,9 +138,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:03 GMT
+      - Tue, 31 Aug 2021 17:19:21 GMT
       elapsed-time:
-      - '5'
+      - '8'
       expires:
       - '-1'
       odata-version:
@@ -150,7 +150,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - ab1b94a0-09d5-11ec-8398-74c63bed1137
+      - 96262495-0a7f-11ec-97b1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
index 85ee57c0ad32..314acdd553f6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search9274171b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF997B43B52\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA38131EB76\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:18 GMT
+      - Tue, 31 Aug 2021 17:19:34 GMT
       elapsed-time:
-      - '35'
+      - '73'
       etag:
-      - W/"0x8D96BF997B43B52"
+      - W/"0x8D96CA38131EB76"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b37f0868-09d5-11ec-9d7a-74c63bed1137
+      - 9dfb10f3-0a7f-11ec-a0df-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search9274171b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF997B43B52\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA38131EB76\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:18 GMT
+      - Tue, 31 Aug 2021 17:19:34 GMT
       elapsed-time:
-      - '17'
+      - '20'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b3ac5473-09d5-11ec-92b6-74c63bed1137
+      - 9e2c7452-0a7f-11ec-be87-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -110,7 +110,7 @@ interactions:
     uri: https://search9274171b.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF997B43B52\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA38131EB76\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -119,11 +119,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:18 GMT
+      - Tue, 31 Aug 2021 17:19:34 GMT
       elapsed-time:
-      - '10'
+      - '33'
       etag:
-      - W/"0x8D96BF997B43B52"
+      - W/"0x8D96CA38131EB76"
       expires:
       - '-1'
       odata-version:
@@ -133,7 +133,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - b3b72705-09d5-11ec-8b14-74c63bed1137
+      - 9e3635c2-0a7f-11ec-a186-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
index 83ab8a82f4ff..3026b9fcb139 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
@@ -21,7 +21,7 @@ interactions:
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF9A03ABC2D\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA389B13C5C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:32 GMT
+      - Tue, 31 Aug 2021 17:19:49 GMT
       elapsed-time:
-      - '40'
+      - '79'
       etag:
-      - W/"0x8D96BF9A03ABC2D"
+      - W/"0x8D96CA389B13C5C"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bbea1a58-09d5-11ec-b42e-74c63bed1137
+      - a67e8ec1-0a7f-11ec-858c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96BF9A0498BF7\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA389C3B645\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:32 GMT
+      - Tue, 31 Aug 2021 17:19:49 GMT
       elapsed-time:
-      - '40'
+      - '56'
       etag:
-      - W/"0x8D96BF9A0498BF7"
+      - W/"0x8D96CA389C3B645"
       expires:
       - '-1'
       location:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bc331ca4-09d5-11ec-bde5-74c63bed1137
+      - a6a847c6-0a7f-11ec-8ca5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -120,7 +120,7 @@ interactions:
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96BF9A03ABC2D\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96BF9A0498BF7\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA389B13C5C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96CA389C3B645\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -129,9 +129,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 21:03:32 GMT
+      - Tue, 31 Aug 2021 17:19:49 GMT
       elapsed-time:
-      - '19'
+      - '43'
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - bc41bea2-09d5-11ec-a814-74c63bed1137
+      - a6b87e13-0a7f-11ec-8a6c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml
index a452a0c8f80e..a4008b0dbc82 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search9ae91f0f.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3EEF700D8\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3924131D5\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:22:48 GMT
+      - Tue, 31 Aug 2021 17:20:03 GMT
       elapsed-time:
-      - '103'
+      - '120'
       etag:
-      - W/"0x8D96BF3EEF700D8"
+      - W/"0x8D96CA3924131D5"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0ab3905c-09d0-11ec-8abd-74c63bed1137
+      - aef405de-0a7f-11ec-bcbb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search9ae91f0f.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF3EEF700D8\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA3924131D5\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:22:48 GMT
+      - Tue, 31 Aug 2021 17:20:03 GMT
       elapsed-time:
-      - '22'
+      - '28'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0ae577c5-09d0-11ec-8d75-74c63bed1137
+      - af34c8b5-0a7f-11ec-bc8b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,7 +118,7 @@ interactions:
     uri: https://search9ae91f0f.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3EF100BBD\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA392577D00\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -128,11 +128,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:22:48 GMT
+      - Tue, 31 Aug 2021 17:20:03 GMT
       elapsed-time:
-      - '20'
+      - '21'
       etag:
-      - W/"0x8D96BF3EF100BBD"
+      - W/"0x8D96CA392577D00"
       expires:
       - '-1'
       odata-version:
@@ -142,7 +142,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0af21b19-09d0-11ec-a1f8-74c63bed1137
+      - af3fc62d-0a7f-11ec-a9cb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -165,7 +165,7 @@ interactions:
     uri: https://search9ae91f0f.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF3EF100BBD\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA392577D00\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -175,9 +175,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:22:48 GMT
+      - Tue, 31 Aug 2021 17:20:03 GMT
       elapsed-time:
-      - '10'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -187,7 +187,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0afe063e-09d0-11ec-a8c7-74c63bed1137
+      - af4af046-0a7f-11ec-b083-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -210,7 +210,7 @@ interactions:
     uri: https://search9ae91f0f.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3EF100BBD\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search9ae91f0f.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA392577D00\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -220,11 +220,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:22:48 GMT
+      - Tue, 31 Aug 2021 17:20:03 GMT
       elapsed-time:
       - '8'
       etag:
-      - W/"0x8D96BF3EF100BBD"
+      - W/"0x8D96CA392577D00"
       expires:
       - '-1'
       odata-version:
@@ -234,7 +234,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 0b072119-09d0-11ec-a681-74c63bed1137
+      - af543dae-0a7f-11ec-8fd8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml
index d4a8ed35c2ef..f5a0cb0c0469 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_or_update_synonym_map_if_unchanged.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search53532449.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3F72DCC71\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA39B40781D\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:01 GMT
+      - Tue, 31 Aug 2021 17:20:18 GMT
       elapsed-time:
-      - '113'
+      - '24'
       etag:
-      - W/"0x8D96BF3F72DCC71"
+      - W/"0x8D96CA39B40781D"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 12e17e9a-09d0-11ec-896e-74c63bed1137
+      - b8062391-0a7f-11ec-a9ac-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -73,7 +73,7 @@ interactions:
     uri: https://search53532449.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF3F738F219\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search53532449.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA39B4B0158\"","name":"test-syn-map","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:01 GMT
+      - Tue, 31 Aug 2021 17:20:18 GMT
       elapsed-time:
-      - '25'
+      - '23'
       etag:
-      - W/"0x8D96BF3F738F219"
+      - W/"0x8D96CA39B4B0158"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 131c03bb-09d0-11ec-aeaa-74c63bed1137
+      - b833eecb-0a7f-11ec-b01d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -107,7 +107,7 @@ interactions:
       message: OK
 - request:
     body: '{"name": "test-syn-map", "format": "solr", "synonyms": "USA, United States,
-      United States of America\nWashington, Wash. => WA", "@odata.etag": "\"0x8D96BF3F72DCC71\""}'
+      United States of America\nWashington, Wash. => WA", "@odata.etag": "\"0x8D96CA39B40781D\""}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -120,7 +120,7 @@ interactions:
       Content-Type:
       - application/json
       If-Match:
-      - '"0x8D96BF3F72DCC71"'
+      - '"0x8D96CA39B40781D"'
       Prefer:
       - return=representation
       User-Agent:
@@ -142,9 +142,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:01 GMT
+      - Tue, 31 Aug 2021 17:20:18 GMT
       elapsed-time:
-      - '10'
+      - '11'
       expires:
       - '-1'
       odata-version:
@@ -154,7 +154,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 13279971-09d0-11ec-893c-74c63bed1137
+      - b8408779-0a7f-11ec-a1c7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml
index 6169144e2131..0ccd9efcc982 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_create_synonym_map.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search78461aed.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF401CE8F75\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3A3E643C0\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:19 GMT
+      - Tue, 31 Aug 2021 17:20:33 GMT
       elapsed-time:
-      - '202'
+      - '169'
       etag:
-      - W/"0x8D96BF401CE8F75"
+      - W/"0x8D96CA3A3E643C0"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1d71340c-09d0-11ec-a8c8-74c63bed1137
+      - c0a50a75-0a7f-11ec-9cb3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search78461aed.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF401CE8F75\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78461aed.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA3A3E643C0\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:19 GMT
+      - Tue, 31 Aug 2021 17:20:33 GMT
       elapsed-time:
-      - '70'
+      - '23'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 1dbda7af-09d0-11ec-b25d-74c63bed1137
+      - c0d9f676-0a7f-11ec-b390-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml
index c5754d98dc67..93be44d19fcd 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search78271aec.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF4097731E6\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3ACACBC75\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:32 GMT
+      - Tue, 31 Aug 2021 17:20:48 GMT
       elapsed-time:
-      - '32'
+      - '34'
       etag:
-      - W/"0x8D96BF4097731E6"
+      - W/"0x8D96CA3ACACBC75"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2541ef27-09d0-11ec-b53e-74c63bed1137
+      - c98079e4-0a7f-11ec-820c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search78271aec.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF4097731E6\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search78271aec.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA3ACACBC75\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:32 GMT
+      - Tue, 31 Aug 2021 17:20:48 GMT
       elapsed-time:
-      - '17'
+      - '12'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 256521fb-09d0-11ec-9cd1-74c63bed1137
+      - c9a0c267-0a7f-11ec-94fa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,15 +118,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Mon, 30 Aug 2021 20:23:32 GMT
+      - Tue, 31 Aug 2021 17:20:48 GMT
       elapsed-time:
-      - '19'
+      - '18'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 256f587e-09d0-11ec-a921-74c63bed1137
+      - c9a9c5e0-0a7f-11ec-a606-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -156,9 +156,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:32 GMT
+      - Tue, 31 Aug 2021 17:20:48 GMT
       elapsed-time:
-      - '7'
+      - '5'
       expires:
       - '-1'
       odata-version:
@@ -168,7 +168,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 25791a02-09d0-11ec-834b-74c63bed1137
+      - c9b32485-0a7f-11ec-aee2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml
index b6b922579c19..2b8c894b2f30 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_delete_synonym_map_if_unchanged.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchfabb2026.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF4119A71FA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3B51CA0F8\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:46 GMT
+      - Tue, 31 Aug 2021 17:21:02 GMT
       elapsed-time:
-      - '26'
+      - '27'
       etag:
-      - W/"0x8D96BF4119A71FA"
+      - W/"0x8D96CA3B51CA0F8"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2d60c9e6-09d0-11ec-9c10-74c63bed1137
+      - d1efaf0f-0a7f-11ec-8ec8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -73,7 +73,7 @@ interactions:
     uri: https://searchfabb2026.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF411AA7A7B\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
+      string: '{"@odata.context":"https://searchfabb2026.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3B527EDAA\"","name":"test-syn-map","format":"solr","synonyms":"W\na\ns\nh\ni\nn\ng\nt\no\nn\n,\n
         \nW\na\ns\nh\n.\n \n=\n>\n \nW\nA","encryptionKey":null}'
     headers:
       cache-control:
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:46 GMT
+      - Tue, 31 Aug 2021 17:21:02 GMT
       elapsed-time:
-      - '59'
+      - '31'
       etag:
-      - W/"0x8D96BF411AA7A7B"
+      - W/"0x8D96CA3B527EDAA"
       expires:
       - '-1'
       odata-version:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2d8cc080-09d0-11ec-9314-74c63bed1137
+      - d2104ddf-0a7f-11ec-9e43-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,7 +117,7 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D96BF4119A71FA"'
+      - '"0x8D96CA3B51CA0F8"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -137,9 +137,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:23:46 GMT
+      - Tue, 31 Aug 2021 17:21:02 GMT
       elapsed-time:
-      - '27'
+      - '13'
       expires:
       - '-1'
       odata-version:
@@ -149,7 +149,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 2d9f343c-09d0-11ec-bcf2-74c63bed1137
+      - d21bbc9e-0a7f-11ec-a67f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml
index eea0c0672e4e..494d3b4cad76 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_map.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search299919b9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF41B32BC1A\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3BD79E4BA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:24:02 GMT
+      - Tue, 31 Aug 2021 17:21:16 GMT
       elapsed-time:
-      - '35'
+      - '36'
       etag:
-      - W/"0x8D96BF41B32BC1A"
+      - W/"0x8D96CA3BD79E4BA"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 37018150-09d0-11ec-a85e-74c63bed1137
+      - da4e44bf-0a7f-11ec-9c6f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search299919b9.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF41B32BC1A\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA3BD79E4BA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -76,9 +76,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:24:02 GMT
+      - Tue, 31 Aug 2021 17:21:16 GMT
       elapsed-time:
-      - '24'
+      - '14'
       expires:
       - '-1'
       odata-version:
@@ -88,7 +88,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3720d336-09d0-11ec-90cc-74c63bed1137
+      - da6e2069-0a7f-11ec-a4fb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -111,7 +111,7 @@ interactions:
     uri: https://search299919b9.search.windows.net/synonymmaps('test-syn-map')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF41B32BC1A\"","name":"test-syn-map","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search299919b9.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3BD79E4BA\"","name":"test-syn-map","format":"solr","synonyms":"USA,
         United States, United States of America\nWashington, Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -121,11 +121,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:24:02 GMT
+      - Tue, 31 Aug 2021 17:21:16 GMT
       elapsed-time:
-      - '8'
+      - '7'
       etag:
-      - W/"0x8D96BF41B32BC1A"
+      - W/"0x8D96CA3BD79E4BA"
       expires:
       - '-1'
       odata-version:
@@ -135,7 +135,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 372af766-09d0-11ec-b4cc-74c63bed1137
+      - da771ebd-0a7f-11ec-b3e7-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml
index f603725138c4..644045d9f210 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_synonym_map_live.test_get_synonym_maps.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search43c51a2c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF42355870E\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3C5CCC615\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
         United States, United States of America","encryptionKey":null}'
     headers:
       cache-control:
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:24:15 GMT
+      - Tue, 31 Aug 2021 17:21:30 GMT
       elapsed-time:
-      - '31'
+      - '21'
       etag:
-      - W/"0x8D96BF42355870E"
+      - W/"0x8D96CA3C5CCC615"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3f15b7ff-09d0-11ec-986d-74c63bed1137
+      - e29e8454-0a7f-11ec-b589-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -71,7 +71,7 @@ interactions:
     uri: https://search43c51a2c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96BF42362339A\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps/$entity","@odata.etag":"\"0x8D96CA3C5D6B2EF\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}'
     headers:
       cache-control:
@@ -81,11 +81,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:24:15 GMT
+      - Tue, 31 Aug 2021 17:21:30 GMT
       elapsed-time:
-      - '23'
+      - '19'
       etag:
-      - W/"0x8D96BF42362339A"
+      - W/"0x8D96CA3C5D6B2EF"
       expires:
       - '-1'
       location:
@@ -97,7 +97,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3f443918-09d0-11ec-ade4-74c63bed1137
+      - e2c036ca-0a7f-11ec-abc8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -118,8 +118,8 @@ interactions:
     uri: https://search43c51a2c.search.windows.net/synonymmaps?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96BF42355870E\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
-        United States, United States of America","encryptionKey":null},{"@odata.etag":"\"0x8D96BF42362339A\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
+      string: '{"@odata.context":"https://search43c51a2c.search.windows.net/$metadata#synonymmaps","value":[{"@odata.etag":"\"0x8D96CA3C5CCC615\"","name":"test-syn-map-1","format":"solr","synonyms":"USA,
+        United States, United States of America","encryptionKey":null},{"@odata.etag":"\"0x8D96CA3C5D6B2EF\"","name":"test-syn-map-2","format":"solr","synonyms":"Washington,
         Wash. => WA","encryptionKey":null}]}'
     headers:
       cache-control:
@@ -129,9 +129,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 20:24:15 GMT
+      - Tue, 31 Aug 2021 17:21:30 GMT
       elapsed-time:
-      - '15'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 3f50a041-09d0-11ec-a790-74c63bed1137
+      - e2ca5393-0a7f-11ec-9e71-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
deleted file mode 100644
index 9d079ecc9e11..000000000000
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "sample-datasource", "type": "azureblob", "credentials": {"connectionString":
-      "connection_string"}, "container": {"name": "searchcontainer"}}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '319'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search207914e0.search.windows.net/datasources?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C102F526DA9\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '407'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Mon, 30 Aug 2021 23:45:01 GMT
-      elapsed-time:
-      - '58'
-      etag:
-      - W/"0x8D96C102F526DA9"
-      expires:
-      - '-1'
-      location:
-      - https://search207914e0.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 4b428a3d-09ec-11ec-be11-74c63bed1137
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
-      "key": true, "retrievable": true, "searchable": false}]}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '128'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search207914e0.search.windows.net/indexes?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C102FF1B0C9\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '664'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Mon, 30 Aug 2021 23:45:02 GMT
-      elapsed-time:
-      - '798'
-      etag:
-      - W/"0x8D96C102FF1B0C9"
-      expires:
-      - '-1'
-      location:
-      - https://search207914e0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 4b6e7523-09ec-11ec-963d-74c63bed1137
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "sample-indexer", "dataSourceName": "sample-datasource", "targetIndexName":
-      "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '113'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://search207914e0.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-language:
-      - en
-      content-length:
-      - '723'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Mon, 30 Aug 2021 23:45:03 GMT
-      elapsed-time:
-      - '827'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 4c0b4f5a-09ec-11ec-8832-74c63bed1137
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 400
-      message: Bad Request
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
index d9b5f8b95751..12ae62fbab72 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search8001902.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C103958F2CA\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA8081F62D4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:18 GMT
+      - Tue, 31 Aug 2021 17:51:59 GMT
       elapsed-time:
-      - '53'
+      - '89'
       etag:
-      - W/"0x8D96C103958F2CA"
+      - W/"0x8D96CA8081F62D4"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 554e7a2a-09ec-11ec-9e4e-74c63bed1137
+      - 24ebd3ab-0a84-11ec-b458-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search8001902.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C103A35E67E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA809CF0363\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:20 GMT
+      - Tue, 31 Aug 2021 17:52:02 GMT
       elapsed-time:
-      - '1175'
+      - '2606'
       etag:
-      - W/"0x8D96C103A35E67E"
+      - W/"0x8D96CA809CF0363"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5574e3cb-09ec-11ec-8683-74c63bed1137
+      - 251bd2a2-0a84-11ec-a98f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:21 GMT
+      - Tue, 31 Aug 2021 17:52:03 GMT
       elapsed-time:
-      - '1213'
+      - '804'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 564f1dde-09ec-11ec-917b-74c63bed1137
+      - 26ecc941-0a84-11ec-a4d3-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
index b22bbe3b3164..e74f32767126 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1043CC5783\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA8238EE069\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:36 GMT
+      - Tue, 31 Aug 2021 17:52:44 GMT
       elapsed-time:
-      - '51'
+      - '53'
       etag:
-      - W/"0x8D96C1043CC5783"
+      - W/"0x8D96CA8238EE069"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5fb7459e-09ec-11ec-a8b5-74c63bed1137
+      - 405c60dc-0a84-11ec-902b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C10444D5EC6\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA82403DF06\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:37 GMT
+      - Tue, 31 Aug 2021 17:52:46 GMT
       elapsed-time:
-      - '603'
+      - '580'
       etag:
-      - W/"0x8D96C10444D5EC6"
+      - W/"0x8D96CA82403DF06"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 5fe5d088-09ec-11ec-bb5b-74c63bed1137
+      - 408abca0-0a84-11ec-bd43-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:38 GMT
+      - Tue, 31 Aug 2021 17:52:47 GMT
       elapsed-time:
-      - '1162'
+      - '738'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 60676b01-09ec-11ec-8ac1-74c63bed1137
+      - 4100cddf-0a84-11ec-8163-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
index 43bfd37d0ff6..3ef8f4e68490 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search205e14df.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C104DB89927\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA82C9CC62A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:52 GMT
+      - Tue, 31 Aug 2021 17:53:00 GMT
       elapsed-time:
-      - '61'
+      - '47'
       etag:
-      - W/"0x8D96C104DB89927"
+      - W/"0x8D96CA82C9CC62A"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 69abb2a0-09ec-11ec-a986-74c63bed1137
+      - 496f0b25-0a84-11ec-b74b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search205e14df.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C104E7E08CF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA82D1807D4\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:54 GMT
+      - Tue, 31 Aug 2021 17:53:01 GMT
       elapsed-time:
-      - '999'
+      - '626'
       etag:
-      - W/"0x8D96C104E7E08CF"
+      - W/"0x8D96CA82D1807D4"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 69d5a399-09ec-11ec-af0a-74c63bed1137
+      - 4998c87e-0a84-11ec-9454-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:45:55 GMT
+      - Tue, 31 Aug 2021 17:53:02 GMT
       elapsed-time:
-      - '554'
+      - '618'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6a9a586d-09ec-11ec-9115-74c63bed1137
+      - 4a147582-0a84-11ec-a85d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
index f51656b2d781..43f71b5ce046 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search54491a19.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10573031CB\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA836864DAB\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:46:08 GMT
+      - Tue, 31 Aug 2021 17:53:17 GMT
       elapsed-time:
-      - '44'
+      - '41'
       etag:
-      - W/"0x8D96C10573031CB"
+      - W/"0x8D96CA836864DAB"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 73205fb3-09ec-11ec-9967-74c63bed1137
+      - 536131d6-0a84-11ec-bcd5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search54491a19.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C1057B1AE4F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA8375F56BA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:46:09 GMT
+      - Tue, 31 Aug 2021 17:53:18 GMT
       elapsed-time:
-      - '602'
+      - '1149'
       etag:
-      - W/"0x8D96C1057B1AE4F"
+      - W/"0x8D96CA8375F56BA"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 734a9db8-09ec-11ec-84e1-74c63bed1137
+      - 53833a1c-0a84-11ec-8227-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:46:10 GMT
+      - Tue, 31 Aug 2021 17:53:19 GMT
       elapsed-time:
-      - '521'
+      - '821'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 73cb498f-09ec-11ec-98cc-74c63bed1137
+      - 545bc4c2-0a84-11ec-9ed2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
deleted file mode 100644
index b8e22b22fc1c..000000000000
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-interactions:
-- request:
-    body: '{"name": "sample-datasource", "type": "azureblob", "credentials": {"connectionString":
-      "connection_string"}, "container": {"name": "searchcontainer"}}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '319'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searche35313ac.search.windows.net/datasources?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C106464962D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '407'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Mon, 30 Aug 2021 23:46:30 GMT
-      elapsed-time:
-      - '36'
-      etag:
-      - W/"0x8D96C106464962D"
-      expires:
-      - '-1'
-      location:
-      - https://searche35313ac.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 8058b3bb-09ec-11ec-84bd-74c63bed1137
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
-      "key": true, "retrievable": true, "searchable": false}]}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '128'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searche35313ac.search.windows.net/indexes?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C10652CC57D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-length:
-      - '664'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Mon, 30 Aug 2021 23:46:31 GMT
-      elapsed-time:
-      - '1033'
-      etag:
-      - W/"0x8D96C10652CC57D"
-      expires:
-      - '-1'
-      location:
-      - https://searche35313ac.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 807e202e-09ec-11ec-8209-74c63bed1137
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 201
-      message: Created
-- request:
-    body: '{"name": "sample-indexer", "dataSourceName": "sample-datasource", "targetIndexName":
-      "hotels", "disabled": false}'
-    headers:
-      Accept:
-      - application/json;odata.metadata=minimal
-      Accept-Encoding:
-      - gzip, deflate
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '113'
-      Content-Type:
-      - application/json
-      User-Agent:
-      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
-    method: POST
-    uri: https://searche35313ac.search.windows.net/indexers?api-version=2021-04-30-Preview
-  response:
-    body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
-    headers:
-      cache-control:
-      - no-cache
-      content-language:
-      - en
-      content-length:
-      - '723'
-      content-type:
-      - application/json; odata.metadata=minimal
-      date:
-      - Mon, 30 Aug 2021 23:46:33 GMT
-      elapsed-time:
-      - '552'
-      expires:
-      - '-1'
-      odata-version:
-      - '4.0'
-      pragma:
-      - no-cache
-      preference-applied:
-      - odata.include-annotations="*"
-      request-id:
-      - 81481695-09ec-11ec-a2e5-74c63bed1137
-      strict-transport-security:
-      - max-age=15724800; includeSubDomains
-    status:
-      code: 400
-      message: Bad Request
-version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
index f57dce9e6c59..708edeeb62b9 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://search78e216af.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C106E051B05\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA845EE0EC7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:46:47 GMT
+      - Tue, 31 Aug 2021 17:53:43 GMT
       elapsed-time:
-      - '37'
+      - '46'
       etag:
-      - W/"0x8D96C106E051B05"
+      - W/"0x8D96CA845EE0EC7"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 89f58bbb-09ec-11ec-b56c-74c63bed1137
+      - 62b3f845-0a84-11ec-acce-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search78e216af.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C106E939238\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA8466E5AC5\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:46:48 GMT
+      - Tue, 31 Aug 2021 17:53:44 GMT
       elapsed-time:
-      - '585'
+      - '674'
       etag:
-      - W/"0x8D96C106E939238"
+      - W/"0x8D96CA8466E5AC5"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8a1f1fd8-09ec-11ec-8ee9-74c63bed1137
+      - 62ea3e62-0a84-11ec-b408-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:46:48 GMT
+      - Tue, 31 Aug 2021 17:53:44 GMT
       elapsed-time:
-      - '542'
+      - '637'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8aad551f-09ec-11ec-9305-74c63bed1137
+      - 636b2853-0a84-11ec-9500-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
index bf63e9019a52..ca86757daecc 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10779CEBB4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA84EF27C4C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:03 GMT
+      - Tue, 31 Aug 2021 17:53:58 GMT
       elapsed-time:
-      - '49'
+      - '33'
       etag:
-      - W/"0x8D96C10779CEBB4"
+      - W/"0x8D96CA84EF27C4C"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9384a8df-09ec-11ec-9cd7-74c63bed1137
+      - 6bcc68d4-0a84-11ec-a21a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C1078189AD2\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA84F740112\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:03 GMT
+      - Tue, 31 Aug 2021 17:53:59 GMT
       elapsed-time:
-      - '600'
+      - '656'
       etag:
-      - W/"0x8D96C1078189AD2"
+      - W/"0x8D96CA84F740112"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 93b62cb4-09ec-11ec-8100-74c63bed1137
+      - 6beeafe1-0a84-11ec-98ba-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,7 +121,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C10783F8AD5\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA84F979761\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -130,11 +130,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:04 GMT
+      - Tue, 31 Aug 2021 17:53:59 GMT
       elapsed-time:
-      - '45'
+      - '50'
       etag:
-      - W/"0x8D96C10783F8AD5"
+      - W/"0x8D96CA84F979761"
       expires:
       - '-1'
       location:
@@ -146,7 +146,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 94335dcf-09ec-11ec-93aa-74c63bed1137
+      - 6c7097e9-0a84-11ec-914b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -172,7 +172,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C107908F31A\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA85061335E\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -181,11 +181,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:05 GMT
+      - Tue, 31 Aug 2021 17:54:00 GMT
       elapsed-time:
-      - '1103'
+      - '1138'
       etag:
-      - W/"0x8D96C107908F31A"
+      - W/"0x8D96CA85061335E"
       expires:
       - '-1'
       location:
@@ -197,7 +197,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9459b615-09ec-11ec-abc6-74c63bed1137
+      - 6c9426ac-0a84-11ec-b5e1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -243,9 +243,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:06 GMT
+      - Tue, 31 Aug 2021 17:54:00 GMT
       elapsed-time:
-      - '765'
+      - '627'
       expires:
       - '-1'
       odata-version:
@@ -255,7 +255,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9523f20a-09ec-11ec-abf7-74c63bed1137
+      - 6d5da6fc-0a84-11ec-8220-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
index e0658e21d5e4..5fe608479507 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchca8148f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C1082074E23\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA859A10AC5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:20 GMT
+      - Tue, 31 Aug 2021 17:54:16 GMT
       elapsed-time:
-      - '37'
+      - '36'
       etag:
-      - W/"0x8D96C1082074E23"
+      - W/"0x8D96CA859A10AC5"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9df86018-09ec-11ec-b821-74c63bed1137
+      - 7674bbca-0a84-11ec-ac71-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searchca8148f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C1082C71779\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA85A2AF61B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:21 GMT
+      - Tue, 31 Aug 2021 17:54:17 GMT
       elapsed-time:
-      - '1033'
+      - '726'
       etag:
-      - W/"0x8D96C1082C71779"
+      - W/"0x8D96CA85A2AF61B"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9e21025f-09ec-11ec-96b2-74c63bed1137
+      - 769d5a21-0a84-11ec-87e6-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:21 GMT
+      - Tue, 31 Aug 2021 17:54:17 GMT
       elapsed-time:
-      - '511'
+      - '602'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9ee127d9-09ec-11ec-8e15-74c63bed1137
+      - 77278639-0a84-11ec-8e5c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
index 11c140803946..fd470441a5c6 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
@@ -19,7 +19,7 @@ interactions:
     uri: https://searche43613c1.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96C108B3CA19C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA86382C7EE\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:35 GMT
+      - Tue, 31 Aug 2021 17:54:32 GMT
       elapsed-time:
-      - '44'
+      - '50'
       etag:
-      - W/"0x8D96C108B3CA19C"
+      - W/"0x8D96CA86382C7EE"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a72b8ca9-09ec-11ec-8061-74c63bed1137
+      - 805c26c8-0a84-11ec-8a12-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searche43613c1.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96C108C01C31F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA863FBBF1F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:37 GMT
+      - Tue, 31 Aug 2021 17:54:33 GMT
       elapsed-time:
-      - '1020'
+      - '616'
       etag:
-      - W/"0x8D96C108C01C31F"
+      - W/"0x8D96CA863FBBF1F"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a7570df1-09ec-11ec-afb8-74c63bed1137
+      - 807f6f07-0a84-11ec-8259-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -141,9 +141,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Mon, 30 Aug 2021 23:47:38 GMT
+      - Tue, 31 Aug 2021 17:54:34 GMT
       elapsed-time:
-      - '531'
+      - '801'
       expires:
       - '-1'
       odata-version:
@@ -153,7 +153,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a81c2a9e-09ec-11ec-ba8d-74c63bed1137
+      - 80f8cb65-0a84-11ec-a88a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:

From 86459affb5a14e5932ec8d2dbf8d5758d1398214 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Tue, 31 Aug 2021 11:21:19 -0700
Subject: [PATCH 08/17] Fix pylint errors.

---
 .../documents/indexes/models/_models.py       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index 0480da841f71..8b5b27b840d4 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -218,7 +218,7 @@ def _to_generated(self):
                 default_language_code=self.default_language_code,
                 include_typeless_entities=self.include_typeless_entities,
                 minimum_precision=self.minimum_precision,
-                model_version = self.model_version
+                model_version=self.model_version
             )
         if self.skill_version in [EntityRecognitionSkillVersion.V3, EntityRecognitionSkillVersion.LATEST]:
             return _EntityRecognitionSkillV3(
@@ -230,7 +230,7 @@ def _to_generated(self):
                 default_language_code=self.default_language_code,
                 include_typeless_entities=self.include_typeless_entities,
                 minimum_precision=self.minimum_precision,
-                model_version = self.model_version
+                model_version=self.model_version
             )
 
     @classmethod
@@ -262,8 +262,11 @@ class SentimentSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum))
 
 
 class SentimentSkill(SearchIndexerSkill):
-    """V1: Text analytics positive-negative sentiment analysis, scored as a floating point value in a range of zero to 1.
-       V3: Using the Text Analytics API, evaluates unstructured text and for each record, provides sentiment labels (such as "negative", "neutral" and "positive") based on the highest confidence score found by the service at a sentence and document-level.
+    """V1: Text analytics positive-negative sentiment analysis, scored as a floating point value in a range of zero 
+    to 1.
+    V3: Using the Text Analytics API, evaluates unstructured text and for each record, provides sentiment labels
+    (such as "negative", "neutral" and "positive") based on the highest confidence score found by the service at
+    a sentence and document-level.
 
     All required parameters must be populated in order to send to Azure.
 
@@ -345,17 +348,17 @@ def _to_generated(self):
             return _SentimentSkillV1(
                 name=self.name,
                 odata_type=self.odata_type,
-                default_language_code = self.default_language_code,
-                include_opinion_mining = self.include_opinion_mining,
-                model_version = self.model_version
+                default_language_code=self.default_language_code,
+                include_opinion_mining=self.include_opinion_mining,
+                model_version=self.model_version
             )
         if self.skill_version in [SentimentSkillVersion.V3, SentimentSkillVersion.LATEST]:
             return _SentimentSkillV3(
                 name=self.name,
                 odata_type=self.odata_type,
-                default_language_code = self.default_language_code,
-                include_opinion_mining = self.include_opinion_mining,
-                model_version = self.model_version
+                default_language_code=self.default_language_code,
+                include_opinion_mining=self.include_opinion_mining,
+                model_version=self.model_version
             )
 
     @classmethod

From 6d6453ff810dda151d9e3d584cc913a491f749cc Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Tue, 31 Aug 2021 13:29:11 -0700
Subject: [PATCH 09/17] Rerecord tests. Fix linter errors.

---
 .../indexes/_search_indexer_client.py         |  12 +-
 .../indexes/aio/_search_indexer_client.py     |  10 +-
 .../documents/indexes/models/_models.py       |  12 +-
 ...client_live_async.test_create_indexer.yaml |  48 ++--
 ...e_async.test_create_or_update_indexer.yaml | 173 ++++++++++---
 ...create_or_update_indexer_if_unchanged.yaml | 126 +++++++---
 ...client_live_async.test_delete_indexer.yaml | 130 +++++++---
 ...sync.test_delete_indexer_if_unchanged.yaml | 118 ++++++---
 ...er_client_live_async.test_get_indexer.yaml |  78 +++---
 ...nt_live_async.test_get_indexer_status.yaml |  77 +++---
 ...r_client_live_async.test_list_indexer.yaml | 134 +++++++---
 ..._client_live_async.test_reset_indexer.yaml | 130 +++++++---
 ...er_client_live_async.test_run_indexer.yaml | 131 +++++++---
 ...dexer_client_live.test_create_indexer.yaml | 155 ++++++++++++
 ...nt_live.test_create_or_update_indexer.yaml | 238 +++++++++++++++---
 ...create_or_update_indexer_if_unchanged.yaml | 156 ++++++++++--
 ...dexer_client_live.test_delete_indexer.yaml | 175 ++++++++++---
 ...live.test_delete_indexer_if_unchanged.yaml | 150 +++++++++--
 ..._indexer_client_live.test_get_indexer.yaml | 201 +++++++++++++++
 ...r_client_live.test_get_indexer_status.yaml |  95 ++++---
 ...indexer_client_live.test_list_indexer.yaml | 168 ++++++++++---
 ...ndexer_client_live.test_reset_indexer.yaml | 175 ++++++++++---
 ..._indexer_client_live.test_run_indexer.yaml | 177 ++++++++++---
 23 files changed, 2322 insertions(+), 547 deletions(-)
 create mode 100644 sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
 create mode 100644 sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
index 7f65cb8940ec..44ec458543e7 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
@@ -469,7 +469,7 @@ def get_skillsets(self, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
         result = self._client.skillsets.list(**kwargs)
-        return [SearchIndexerSkillset._from_generated(skillset) for skillset in result.skillsets]
+        return [SearchIndexerSkillset._from_generated(skillset) for skillset in result.skillsets] # pylint:disable=protected-access
 
     @distributed_trace
     def get_skillset_names(self, **kwargs):
@@ -508,7 +508,7 @@ def get_skillset(self, name, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
         result = self._client.skillsets.get(name, **kwargs)
-        return SearchIndexerSkillset._from_generated(result)
+        return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
 
     @distributed_trace
     def delete_skillset(self, skillset, **kwargs):
@@ -564,8 +564,8 @@ def create_skillset(self, skillset, **kwargs):
 
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
-        result =  self._client.skillsets.create(skillset._to_generated(), **kwargs)
-        return SearchIndexerSkillset._from_generated(result)
+        result = self._client.skillsets.create(skillset._to_generated(), **kwargs) # pylint:disable=protected-access
+        return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
 
 
     @distributed_trace
@@ -590,8 +590,8 @@ def create_or_update_skillset(self, skillset, **kwargs):
 
         result = self._client.skillsets.create_or_update(
             skillset_name=skillset.name,
-            skillset=skillset._to_generated(),
+            skillset=skillset._to_generated(), # pylint:disable=protected-access
             error_map=error_map,
             **kwargs
         )
-        return SearchIndexerSkillset._from_generated(result)
+        return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
index 9494b4e9d1c2..e5b70c694ef6 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
@@ -462,7 +462,7 @@ async def get_skillsets(self, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
         result = await self._client.skillsets.list(**kwargs)
-        return [SearchIndexerSkillset._from_generated(skillset) for skillset in result.skillsets]
+        return [SearchIndexerSkillset._from_generated(skillset) for skillset in result.skillsets] # pylint:disable=protected-access
 
     @distributed_trace_async
     async def get_skillset_names(self, **kwargs):
@@ -501,7 +501,7 @@ async def get_skillset(self, name, **kwargs):
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
         result = await self._client.skillsets.get(name, **kwargs)
-        return SearchIndexerSkillset._from_generated(result)
+        return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
 
     @distributed_trace_async
     async def delete_skillset(self, skillset, **kwargs):
@@ -559,7 +559,7 @@ async def create_skillset(self, skillset, **kwargs):
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
 
         result = await self._client.skillsets.create(skillset, **kwargs)
-        return SearchIndexerSkillset._from_generated(result)
+        return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
 
     @distributed_trace_async
     async def create_or_update_skillset(self, skillset, **kwargs):
@@ -583,8 +583,8 @@ async def create_or_update_skillset(self, skillset, **kwargs):
 
         result = await self._client.skillsets.create_or_update(
             skillset_name=skillset.name,
-            skillset=skillset._to_generated(),
+            skillset=skillset._to_generated(), # pylint:disable=protected-access
             error_map=error_map,
             **kwargs
         )
-        return SearchIndexerSkillset._from_generated(result)
+        return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index 8b5b27b840d4..eed05eea4e0e 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -73,7 +73,7 @@ def _to_generated(self):
         generated_skills = []
         for skill in self.skills:
             if hasattr(skill, '_to_generated'):
-                generated_skills.append(skill._to_generated())
+                generated_skills.append(skill._to_generated()) # pylint:disable=protected-access
             else:
                 generated_skills.append(skill)
         assert len(generated_skills) == len(self.skills)
@@ -93,9 +93,9 @@ def _from_generated(cls, skillset):
         for skill in skillset.skills:
             skill_cls = type(skill)
             if skill_cls in [_EntityRecognitionSkillV1, _EntityRecognitionSkillV3]:
-                custom_skills.append(EntityRecognitionSkill._from_generated(skill))
+                custom_skills.append(EntityRecognitionSkill._from_generated(skill)) # pylint:disable=protected-access
             elif skill_cls in [_SentimentSkillV1, _SentimentSkillV3]:
-                custom_skills.append(SentimentSkill._from_generated(skill))
+                custom_skills.append(SentimentSkill._from_generated(skill)) # pylint:disable=protected-access
             else:
                 custom_skills.append(skill)
         assert len(skillset.skills) == len(custom_skills)
@@ -262,7 +262,7 @@ class SentimentSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum))
 
 
 class SentimentSkill(SearchIndexerSkill):
-    """V1: Text analytics positive-negative sentiment analysis, scored as a floating point value in a range of zero 
+    """V1: Text analytics positive-negative sentiment analysis, scored as a floating point value in a range of zero
     to 1.
     V3: Using the Text Analytics API, evaluates unstructured text and for each record, provides sentiment labels
     (such as "negative", "neutral" and "positive") based on the highest confidence score found by the service at
@@ -340,7 +340,7 @@ def __init__(
         self.skill_version = kwargs.get('skill_version', SentimentSkillVersion.V1)
         self.odata_type = self.skill_version  # type: str
         self.default_language_code = kwargs.get('default_language_code', None)
-        self.include_opinion_mining = kwargs.get('include_opinion_mining', False )
+        self.include_opinion_mining = kwargs.get('include_opinion_mining', False)
         self.model_version = kwargs.get('model_version', None)
 
     def _to_generated(self):
@@ -959,4 +959,4 @@ def validate(kwargs, version, unsupported):
         if param in kwargs:
             errors.append(param)
     if errors:
-        raise ValueError("Unsupported parameters for skill version {}: {}".format(version, ', '.join(errors)))
\ No newline at end of file
+        raise ValueError("Unsupported parameters for skill version {}: {}".format(version, ', '.join(errors)))
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
index 9a9ad9d2581a..435a804d07b7 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha7b8175d.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA6430B2182\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBB7C6290F1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:19 GMT
-      elapsed-time: '51'
-      etag: W/"0x8D96CA6430B2182"
+      date: Tue, 31 Aug 2021 20:11:14 GMT
+      elapsed-time: '30'
+      etag: W/"0x8D96CBB7C6290F1"
       expires: '-1'
       location: https://searcha7b8175d.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 5fe416fc-0a82-11ec-91b7-74c63bed1137
+      request-id: 9814d18e-0a97-11ec-98db-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha7b8175d.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA64398DE4D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBB7D01D2CA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:20 GMT
-      elapsed-time: '676'
-      etag: W/"0x8D96CA64398DE4D"
+      date: Tue, 31 Aug 2021 20:11:16 GMT
+      elapsed-time: '833'
+      etag: W/"0x8D96CBB7D01D2CA"
       expires: '-1'
       location: https://searcha7b8175d.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6004b5e5-0a82-11ec-b566-74c63bed1137
+      request-id: 98352267-0a97-11ec-82a2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,23 @@ interactions:
     uri: https://searcha7b8175d.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searcha7b8175d.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB7E11EBAE\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:22 GMT
-      elapsed-time: '1470'
+      date: Tue, 31 Aug 2021 20:11:18 GMT
+      elapsed-time: '1846'
+      etag: W/"0x8D96CBB7E11EBAE"
       expires: '-1'
+      location: https://searcha7b8175d.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 609362dd-0a82-11ec-89bb-74c63bed1137
+      request-id: 98d46cdc-0a97-11ec-a1bc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://searcha7b8175d.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
index 2c3dcb85299c..fb7b8a501b4c 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha8211b7f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA64CE849E7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBB85F60878\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:36 GMT
-      elapsed-time: '50'
-      etag: W/"0x8D96CA64CE849E7"
+      date: Tue, 31 Aug 2021 20:11:31 GMT
+      elapsed-time: '36'
+      etag: W/"0x8D96CBB85F60878"
       expires: '-1'
       location: https://searcha8211b7f.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 69b4de9c-0a82-11ec-a395-74c63bed1137
+      request-id: a1ab1635-0a97-11ec-b42a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha8211b7f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA64D614119\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBB86733D72\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:36 GMT
-      elapsed-time: '644'
-      etag: W/"0x8D96CA64D614119"
+      date: Tue, 31 Aug 2021 20:11:32 GMT
+      elapsed-time: '594'
+      etag: W/"0x8D96CBB86733D72"
       expires: '-1'
       location: https://searcha8211b7f.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 69e16148-0a82-11ec-ad2c-74c63bed1137
+      request-id: a1c8a894-0a97-11ec-b056-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,148 @@ interactions:
     uri: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB86C3190E\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:38 GMT
-      elapsed-time: '1406'
+      date: Tue, 31 Aug 2021 20:11:32 GMT
+      elapsed-time: '503'
+      etag: W/"0x8D96CBB86C3190E"
       expires: '-1'
+      location: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 6a5b5342-0a82-11ec-a901-74c63bed1137
+      request-id: a247f759-0a97-11ec-b0e8-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBB86C3190E\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '379'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:11:32 GMT
+      elapsed-time: '19'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: a2aeedc0-0a97-11ec-a607-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '139'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB8724D227\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '378'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:11:32 GMT
+      elapsed-time: '361'
+      etag: W/"0x8D96CBB8724D227"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: a2ba0e4b-0a97-11ec-926c-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBB8724D227\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '382'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:11:32 GMT
+      elapsed-time: '21'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: a2f88035-0a97-11ec-9136-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searcha8211b7f.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha8211b7f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB8724D227\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '378'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:11:32 GMT
+      elapsed-time: '9'
+      etag: W/"0x8D96CBB8724D227"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: a3038dc7-0a97-11ec-94b5-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searcha8211b7f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
index fd1eac171951..b9ee98ffa9c9 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_create_or_update_indexer_if_unchanged.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://search323b20b9.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA656D99B71\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBB8F405C32\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:52 GMT
-      elapsed-time: '50'
-      etag: W/"0x8D96CA656D99B71"
+      date: Tue, 31 Aug 2021 20:11:46 GMT
+      elapsed-time: '49'
+      etag: W/"0x8D96CBB8F405C32"
       expires: '-1'
       location: https://search323b20b9.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 73a8d88b-0a82-11ec-9343-74c63bed1137
+      request-id: aaea9c68-0a97-11ec-bc71-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search323b20b9.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA65759C06F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBB8FC97A3D\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:53 GMT
-      elapsed-time: '689'
-      etag: W/"0x8D96CA65759C06F"
+      date: Tue, 31 Aug 2021 20:11:47 GMT
+      elapsed-time: '729'
+      etag: W/"0x8D96CBB8FC97A3D"
       expires: '-1'
       location: https://search323b20b9.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 73d2c3b5-0a82-11ec-82e6-74c63bed1137
+      request-id: ab130150-0a97-11ec-be6f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,101 @@ interactions:
     uri: https://search323b20b9.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB90170B80\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:39:54 GMT
-      elapsed-time: '678'
+      date: Tue, 31 Aug 2021 20:11:48 GMT
+      elapsed-time: '487'
+      etag: W/"0x8D96CBB90170B80"
       expires: '-1'
+      location: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 74536ac7-0a82-11ec-8a2a-74c63bed1137
+      request-id: ab9df4d7-0a97-11ec-beed-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://search323b20b9.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '139'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search323b20b9.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB9063B243\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '379'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:11:48 GMT
+      elapsed-time: '286'
+      etag: W/"0x8D96CBB9063B243"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: ac022ea1-0a97-11ec-877d-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false, "@odata.etag":
+      "\"0x8D96CBB90170B80\""}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '179'
+      Content-Type:
+      - application/json
+      If-Match:
+      - '"0x8D96CBB90170B80"'
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"error":{"code":"","message":"The precondition given in one of the
+        request headers evaluated to false. No change was made to the resource from
+        this request."}}'
+    headers:
+      cache-control: no-cache
+      content-language: en
+      content-length: '160'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:11:48 GMT
+      elapsed-time: '12'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: ac3517f4-0a97-11ec-9b75-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 412
+      message: Precondition Failed
+    url: https://search323b20b9.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
index 4e98fd70e544..00fa6aeb4675 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha79d175c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA65FE07A6A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBB9966905E\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:07 GMT
-      elapsed-time: '61'
-      etag: W/"0x8D96CA65FE07A6A"
+      date: Tue, 31 Aug 2021 20:12:03 GMT
+      elapsed-time: '30'
+      etag: W/"0x8D96CBB9966905E"
       expires: '-1'
       location: https://searcha79d175c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7cb82426-0a82-11ec-ae5a-74c63bed1137
+      request-id: b518777a-0a97-11ec-9472-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha79d175c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA66053A3C5\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBB99E461D5\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:08 GMT
-      elapsed-time: '594'
-      etag: W/"0x8D96CA66053A3C5"
+      date: Tue, 31 Aug 2021 20:12:04 GMT
+      elapsed-time: '647'
+      etag: W/"0x8D96CBB99E461D5"
       expires: '-1'
       location: https://searcha79d175c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7cda223b-0a82-11ec-a036-74c63bed1137
+      request-id: b538a13a-0a97-11ec-bde4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,105 @@ interactions:
     uri: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBB9AE5AB04\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:10 GMT
-      elapsed-time: '1549'
+      date: Tue, 31 Aug 2021 20:12:06 GMT
+      elapsed-time: '1578'
+      etag: W/"0x8D96CBB9AE5AB04"
       expires: '-1'
+      location: https://searcha79d175c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 7d4d8643-0a82-11ec-a4ba-74c63bed1137
+      request-id: b5b69095-0a97-11ec-831f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
+    url: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBB9AE5AB04\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '379'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:12:06 GMT
+      elapsed-time: '20'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: b6ce94e4-0a97-11ec-b216-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://searcha79d175c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control: no-cache
+      date: Tue, 31 Aug 2021 20:12:06 GMT
+      elapsed-time: '37'
+      expires: '-1'
+      pragma: no-cache
+      request-id: b6d8f264-0a97-11ec-a7d5-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 204
+      message: No Content
+    url: https://searcha79d175c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha79d175c.search.windows.net/$metadata#indexers","value":[]}'
+    headers:
+      cache-control: no-cache
+      content-length: '200'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:12:06 GMT
+      elapsed-time: '6'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: b6e6aa7e-0a97-11ec-bc39-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
     url: https://searcha79d175c.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
index fc290eb4957f..2461e75ca0bd 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_delete_indexer_if_unchanged.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://searchfbe11c96.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA66A655690\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBA409D297\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:25 GMT
-      elapsed-time: '39'
-      etag: W/"0x8D96CA66A655690"
+      date: Tue, 31 Aug 2021 20:12:21 GMT
+      elapsed-time: '121'
+      etag: W/"0x8D96CBBA409D297"
       expires: '-1'
       location: https://searchfbe11c96.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 873f4fb2-0a82-11ec-bda7-74c63bed1137
+      request-id: bfa42cae-0a97-11ec-9220-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searchfbe11c96.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA66B4034D7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBA4818878\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:26 GMT
-      elapsed-time: '1226'
-      etag: W/"0x8D96CA66B4034D7"
+      date: Tue, 31 Aug 2021 20:12:22 GMT
+      elapsed-time: '623'
+      etag: W/"0x8D96CBBA4818878"
       expires: '-1'
       location: https://searchfbe11c96.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 875f0457-0a82-11ec-a4a7-74c63bed1137
+      request-id: bfdbcfe9-0a97-11ec-a0a0-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,93 @@ interactions:
     uri: https://searchfbe11c96.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBA4C2463F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:27 GMT
-      elapsed-time: '581'
+      date: Tue, 31 Aug 2021 20:12:22 GMT
+      elapsed-time: '380'
+      etag: W/"0x8D96CBBA4C2463F"
       expires: '-1'
+      location: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 883973cf-0a82-11ec-adbc-74c63bed1137
+      request-id: c05462c4-0a97-11ec-b22e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://searchfbe11c96.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '139'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchfbe11c96.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBA4FF80FF\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '378'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:12:22 GMT
+      elapsed-time: '233'
+      etag: W/"0x8D96CBBA4FF80FF"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: c0a79094-0a97-11ec-9ec6-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      If-Match:
+      - '"0x8D96CBBA4C2463F"'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"error":{"code":"","message":"The precondition given in one of the
+        request headers evaluated to false. No change was made to the resource from
+        this request."}}'
+    headers:
+      cache-control: no-cache
+      content-language: en
+      content-length: '160'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:12:22 GMT
+      elapsed-time: '5'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: c0d154c7-0a97-11ec-a4c6-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 412
+      message: Precondition Failed
+    url: https://searchfbe11c96.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
index 75add8f634a2..ff9fc8f0e034 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://search632a1629.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA673CC4795\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBAD82DFAF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:41 GMT
-      elapsed-time: '37'
-      etag: W/"0x8D96CA673CC4795"
+      date: Tue, 31 Aug 2021 20:12:37 GMT
+      elapsed-time: '79'
+      etag: W/"0x8D96CBBAD82DFAF"
       expires: '-1'
       location: https://search632a1629.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 90a7bbe9-0a82-11ec-883c-74c63bed1137
+      request-id: c92a7759-0a97-11ec-95fc-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search632a1629.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA6743D2678\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBAE019BAF\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:42 GMT
-      elapsed-time: '586'
-      etag: W/"0x8D96CA6743D2678"
+      date: Tue, 31 Aug 2021 20:12:38 GMT
+      elapsed-time: '638'
+      etag: W/"0x8D96CBBAE019BAF"
       expires: '-1'
       location: https://search632a1629.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 90c5755d-0a82-11ec-aea4-74c63bed1137
+      request-id: c95894cf-0a97-11ec-8676-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,53 @@ interactions:
     uri: https://search632a1629.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBAE3DC4C4\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:42 GMT
-      elapsed-time: '552'
+      date: Tue, 31 Aug 2021 20:12:38 GMT
+      elapsed-time: '372'
+      etag: W/"0x8D96CBBAE3DC4C4"
       expires: '-1'
+      location: https://search632a1629.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 91372c0b-0a82-11ec-a00c-74c63bed1137
+      request-id: c9d3ccca-0a97-11ec-9330-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://search632a1629.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search632a1629.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search632a1629.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBAE3DC4C4\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '375'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:12:38 GMT
+      elapsed-time: '8'
+      etag: W/"0x8D96CBBAE3DC4C4"
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: ca243f47-0a97-11ec-b46a-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search632a1629.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
index c742209b2cea..83569b88abe3 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_get_indexer_status.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://searcha24192c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA67D17450B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBB696FEDF\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '406'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:56 GMT
-      elapsed-time: '38'
-      etag: W/"0x8D96CA67D17450B"
+      date: Tue, 31 Aug 2021 20:12:52 GMT
+      elapsed-time: '41'
+      etag: W/"0x8D96CBBB696FEDF"
       expires: '-1'
       location: https://searcha24192c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 99d3046f-0a82-11ec-8c9e-74c63bed1137
+      request-id: d23fdd24-0a97-11ec-a89e-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://searcha24192c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA67E87352F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBB7128602\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '663'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:40:59 GMT
-      elapsed-time: '1991'
-      etag: W/"0x8D96CA67E87352F"
+      date: Tue, 31 Aug 2021 20:12:53 GMT
+      elapsed-time: '639'
+      etag: W/"0x8D96CBBB7128602"
       expires: '-1'
       location: https://searcha24192c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9a10e793-0a82-11ec-92c1-74c63bed1137
+      request-id: d269b4d9-0a97-11ec-8ee4-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,52 @@ interactions:
     uri: https://searcha24192c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBB752A76D\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '382'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:00 GMT
-      elapsed-time: '677'
+      date: Tue, 31 Aug 2021 20:12:53 GMT
+      elapsed-time: '374'
+      etag: W/"0x8D96CBBB752A76D"
       expires: '-1'
+      location: https://searcha24192c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 9b812e24-0a82-11ec-8fa9-74c63bed1137
+      request-id: d2e591c9-0a97-11ec-958d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://searcha24192c.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searcha24192c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searcha24192c.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
+    headers:
+      cache-control: no-cache
+      content-length: '439'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:12:53 GMT
+      elapsed-time: '18'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: d337dc7c-0a97-11ec-abed-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://searcha24192c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
index 596020880afd..3df41fe08c1e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_list_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA688285709\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBBFFE2E90\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:14 GMT
-      elapsed-time: '86'
-      etag: W/"0x8D96CA688285709"
+      date: Tue, 31 Aug 2021 20:13:08 GMT
+      elapsed-time: '43'
+      etag: W/"0x8D96CBBBFFE2E90"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a4e6dd5d-0a82-11ec-82c7-74c63bed1137
+      request-id: dba6acd6-0a97-11ec-9cae-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA688CDC05B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBC071EC25\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:16 GMT
-      elapsed-time: '925'
-      etag: W/"0x8D96CA688CDC05B"
+      date: Tue, 31 Aug 2021 20:13:09 GMT
+      elapsed-time: '601'
+      etag: W/"0x8D96CBBC071EC25"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a521db14-0a82-11ec-b3ed-74c63bed1137
+      request-id: dbd0e671-0a97-11ec-b2e1-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -76,7 +76,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '320'
+      - '326'
       Content-Type:
       - application/json
       User-Agent:
@@ -85,20 +85,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA68928046C\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBC091D5C4\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '408'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:16 GMT
-      elapsed-time: '132'
-      etag: W/"0x8D96CA68928046C"
+      date: Tue, 31 Aug 2021 20:13:09 GMT
+      elapsed-time: '32'
+      etag: W/"0x8D96CBBC091D5C4"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/datasources('another-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a5c84f9b-0a82-11ec-ae31-74c63bed1137
+      request-id: dc45905a-0a97-11ec-afb6-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -120,20 +120,20 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA689E9D64D\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBC10F8026\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '671'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:18 GMT
-      elapsed-time: '978'
-      etag: W/"0x8D96CA689E9D64D"
+      date: Tue, 31 Aug 2021 20:13:10 GMT
+      elapsed-time: '658'
+      etag: W/"0x8D96CBBC10F8026"
       expires: '-1'
       location: https://search7a7716a5.search.windows.net/indexes('another-index')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a6317d21-0a82-11ec-9b05-74c63bed1137
+      request-id: dc645198-0a97-11ec-9178-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -155,31 +155,87 @@ interactions:
     uri: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBC15743FE\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:18 GMT
-      elapsed-time: '589'
+      date: Tue, 31 Aug 2021 20:13:10 GMT
+      elapsed-time: '426'
+      etag: W/"0x8D96CBBC15743FE"
       expires: '-1'
+      location: https://search7a7716a5.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: a6e44a8a-0a82-11ec-a0f8-74c63bed1137
+      request-id: dce317eb-0a97-11ec-bf2d-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
+    url: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: '{"name": "another-indexer", "dataSourceName": "another-datasource", "targetIndexName":
+      "another-index", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Content-Length:
+      - '122'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBC199FDD2\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control: no-cache
+      content-length: '392'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:13:10 GMT
+      elapsed-time: '385'
+      etag: W/"0x8D96CBBC199FDD2"
+      expires: '-1'
+      location: https://search7a7716a5.search.windows.net/indexers('another-indexer')?api-version=2021-04-30-Preview
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: dd3cabb5-0a97-11ec-ab11-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+    url: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search7a7716a5.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBBC199FDD2\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96CBBC15743FE\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '415'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:13:10 GMT
+      elapsed-time: '17'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: dd7ee4da-0a97-11ec-996f-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
     url: https://search7a7716a5.search.windows.net/indexers?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
index 6e56813b7543..7c6019f0b7ac 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_reset_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://search916a170c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA692BEEAD7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBCC7A0562\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:32 GMT
-      elapsed-time: '59'
-      etag: W/"0x8D96CA692BEEAD7"
+      date: Tue, 31 Aug 2021 20:13:29 GMT
+      elapsed-time: '38'
+      etag: W/"0x8D96CBBCC7A0562"
       expires: '-1'
       location: https://search916a170c.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: af97d59d-0a82-11ec-badd-74c63bed1137
+      request-id: e817d152-0a97-11ec-bf59-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search916a170c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA6933F36D0\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBCCFD7D1F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:34 GMT
-      elapsed-time: '690'
-      etag: W/"0x8D96CA6933F36D0"
+      date: Tue, 31 Aug 2021 20:13:30 GMT
+      elapsed-time: '692'
+      etag: W/"0x8D96CBBCCFD7D1F"
       expires: '-1'
       location: https://search916a170c.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: afb98591-0a82-11ec-b978-74c63bed1137
+      request-id: e84ca03e-0a97-11ec-911a-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,105 @@ interactions:
     uri: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBCD39580B\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:34 GMT
-      elapsed-time: '640'
+      date: Tue, 31 Aug 2021 20:13:30 GMT
+      elapsed-time: '348'
+      etag: W/"0x8D96CBBCD39580B"
       expires: '-1'
+      location: https://search916a170c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b03a809b-0a82-11ec-8489-74c63bed1137
+      request-id: e8d05892-0a97-11ec-8512-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBBCD39580B\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '379'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:13:30 GMT
+      elapsed-time: '23'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: e91e86df-0a97-11ec-81ba-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search916a170c.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.reset?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control: no-cache
+      date: Tue, 31 Aug 2021 20:13:30 GMT
+      elapsed-time: '270'
+      expires: '-1'
+      pragma: no-cache
+      request-id: e928d9b7-0a97-11ec-8749-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 204
+      message: No Content
+    url: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.reset?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search916a170c.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":{"status":"reset","statusDetail":null,"errorMessage":null,"startTime":"2021-08-31T20:13:31.001Z","endTime":"2021-08-31T20:13:31.001Z","itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null},"executionHistory":[{"status":"reset","statusDetail":null,"errorMessage":null,"startTime":"2021-08-31T20:13:31.001Z","endTime":"2021-08-31T20:13:31.001Z","itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null}],"limits":null,"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
+    headers:
+      cache-control: no-cache
+      content-length: '508'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:13:30 GMT
+      elapsed-time: '15'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: e95966fd-0a97-11ec-8952-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search916a170c.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
index 458ba3f2444c..4c6c01438a69 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_indexer_client_live_async.test_run_indexer.yaml
@@ -6,7 +6,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -15,20 +15,20 @@ interactions:
     uri: https://search640d163e.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA69BD621A1\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBBD644C32D\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control: no-cache
       content-length: '407'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:47 GMT
-      elapsed-time: '49'
-      etag: W/"0x8D96CA69BD621A1"
+      date: Tue, 31 Aug 2021 20:13:45 GMT
+      elapsed-time: '45'
+      etag: W/"0x8D96CBBD644C32D"
       expires: '-1'
       location: https://search640d163e.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b8b0bfea-0a82-11ec-8169-74c63bed1137
+      request-id: f1e8a032-0a97-11ec-8e89-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -50,20 +50,20 @@ interactions:
     uri: https://search640d163e.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA69C5EFB38\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBBD6BCEE51\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control: no-cache
       content-length: '664'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:49 GMT
-      elapsed-time: '674'
-      etag: W/"0x8D96CA69C5EFB38"
+      date: Tue, 31 Aug 2021 20:13:46 GMT
+      elapsed-time: '618'
+      etag: W/"0x8D96CBBD6BCEE51"
       expires: '-1'
       location: https://search640d163e.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b8d074a7-0a82-11ec-8a38-74c63bed1137
+      request-id: f2174f6d-0a97-11ec-95f3-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -85,31 +85,106 @@ interactions:
     uri: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBBD79720B3\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-language: en
-      content-length: '723'
+      content-length: '383'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:41:50 GMT
-      elapsed-time: '544'
+      date: Tue, 31 Aug 2021 20:13:48 GMT
+      elapsed-time: '1392'
+      etag: W/"0x8D96CBBD79720B3"
       expires: '-1'
+      location: https://search640d163e.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: b95908dd-0a82-11ec-991a-74c63bed1137
+      request-id: f28f54e0-0a97-11ec-9168-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 201
+      message: Created
     url: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBBD79720B3\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control: no-cache
+      content-length: '380'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:13:48 GMT
+      elapsed-time: '17'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: f37ca0f1-0a97-11ec-9260-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search640d163e.search.windows.net/indexers?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.run?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control: no-cache
+      content-length: '0'
+      date: Tue, 31 Aug 2021 20:13:48 GMT
+      elapsed-time: '53'
+      expires: '-1'
+      pragma: no-cache
+      request-id: f3852848-0a97-11ec-ae21-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+    status:
+      code: 202
+      message: Accepted
+    url: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.run?api-version=2021-04-30-Preview
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search640d163e.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
+    headers:
+      cache-control: no-cache
+      content-length: '440'
+      content-type: application/json; odata.metadata=minimal
+      date: Tue, 31 Aug 2021 20:13:48 GMT
+      elapsed-time: '13'
+      expires: '-1'
+      odata-version: '4.0'
+      pragma: no-cache
+      preference-applied: odata.include-annotations="*"
+      request-id: f39365ee-0a97-11ec-a2ba-74c63bed1137
+      strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
+    status:
+      code: 200
+      message: OK
+    url: https://search640d163e.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
new file mode 100644
index 000000000000..25e0893f6857
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_indexer.yaml
@@ -0,0 +1,155 @@
+interactions:
+- request:
+    body: '{"name": "sample-datasource", "type": "azureblob", "credentials": {"connectionString":
+      "connection_string"}, "container": {"name": "searchcontainer"}}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '325'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search207914e0.search.windows.net/datasources?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA11CE349A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '407'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:06 GMT
+      elapsed-time:
+      - '43'
+      etag:
+      - W/"0x8D96CBA11CE349A"
+      expires:
+      - '-1'
+      location:
+      - https://search207914e0.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 2eaa49c0-0a96-11ec-98ed-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
+      "key": true, "retrievable": true, "searchable": false}]}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '128'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search207914e0.search.windows.net/indexes?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA125296E4\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '664'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:07 GMT
+      elapsed-time:
+      - '644'
+      etag:
+      - W/"0x8D96CBA125296E4"
+      expires:
+      - '-1'
+      location:
+      - https://search207914e0.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 2ee7dedb-0a96-11ec-b6f9-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "sample-indexer", "dataSourceName": "sample-datasource", "targetIndexName":
+      "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '113'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://search207914e0.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search207914e0.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA12A6E018\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '383'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:08 GMT
+      elapsed-time:
+      - '418'
+      etag:
+      - W/"0x8D96CBA12A6E018"
+      expires:
+      - '-1'
+      location:
+      - https://search207914e0.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 2f6b4466-0a96-11ec-857f-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
index 12ae62fbab72..225e40a61525 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://search8001902.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA8081F62D4\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA1C34B154\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:51:59 GMT
+      - Tue, 31 Aug 2021 20:01:24 GMT
       elapsed-time:
-      - '89'
+      - '47'
       etag:
-      - W/"0x8D96CA8081F62D4"
+      - W/"0x8D96CBA1C34B154"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 24ebd3ab-0a84-11ec-b458-74c63bed1137
+      - 391b488f-0a96-11ec-852c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search8001902.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA809CF0363\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA1CACB563\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:52:02 GMT
+      - Tue, 31 Aug 2021 20:01:25 GMT
       elapsed-time:
-      - '2606'
+      - '587'
       etag:
-      - W/"0x8D96CA809CF0363"
+      - W/"0x8D96CBA1CACB563"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 251bd2a2-0a84-11ec-a98f-74c63bed1137
+      - 394d20e3-0a96-11ec-b908-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,207 @@ interactions:
     uri: https://search8001902.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA1D1EC4FF\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
-      content-language:
-      - en
       content-length:
-      - '723'
+      - '382'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:52:03 GMT
+      - Tue, 31 Aug 2021 20:01:25 GMT
       elapsed-time:
-      - '804'
+      - '629'
+      etag:
+      - W/"0x8D96CBA1D1EC4FF"
+      expires:
+      - '-1'
+      location:
+      - https://search8001902.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 39c58cb0-0a96-11ec-9961-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search8001902.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBA1D1EC4FF\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '386'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:25 GMT
+      elapsed-time:
+      - '23'
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 3a49193f-0a96-11ec-8993-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '139'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search8001902.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA1D700066\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '387'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:26 GMT
+      elapsed-time:
+      - '291'
+      etag:
+      - W/"0x8D96CBA1D700066"
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 3a5460d0-0a96-11ec-ab83-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search8001902.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBA1D700066\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '391'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:26 GMT
+      elapsed-time:
+      - '45'
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 3a8acbff-0a96-11ec-9c75-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search8001902.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search8001902.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA1D700066\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '387'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:26 GMT
+      elapsed-time:
+      - '8'
+      etag:
+      - W/"0x8D96CBA1D700066"
       expires:
       - '-1'
       odata-version:
@@ -153,10 +331,12 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 26ecc941-0a84-11ec-a4d3-74c63bed1137
+      - 3a9d8b9a-0a96-11ec-85ab-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
index e74f32767126..11d9b6c59f7e 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_create_or_update_indexer_if_unchanged.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA8238EE069\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA26F7B616\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:52:44 GMT
+      - Tue, 31 Aug 2021 20:01:42 GMT
       elapsed-time:
-      - '53'
+      - '39'
       etag:
-      - W/"0x8D96CA8238EE069"
+      - W/"0x8D96CBA26F7B616"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 405c60dc-0a84-11ec-902b-74c63bed1137
+      - 43e664ea-0a96-11ec-9bef-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA82403DF06\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA277C8D9E\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:52:46 GMT
+      - Tue, 31 Aug 2021 20:01:43 GMT
       elapsed-time:
-      - '580'
+      - '662'
       etag:
-      - W/"0x8D96CA82403DF06"
+      - W/"0x8D96CBA277C8D9E"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 408abca0-0a84-11ec-bd43-74c63bed1137
+      - 44113a6c-0a96-11ec-a069-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,131 @@ interactions:
     uri: https://search71b21e3c.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA28C3503E\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '383'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:45 GMT
+      elapsed-time:
+      - '2035'
+      etag:
+      - W/"0x8D96CBA28C3503E"
+      expires:
+      - '-1'
+      location:
+      - https://search71b21e3c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 4495150b-0a96-11ec-9382-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '139'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search71b21e3c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search71b21e3c.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA294C1FF3\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '388'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:01:45 GMT
+      elapsed-time:
+      - '702'
+      etag:
+      - W/"0x8D96CBA294C1FF3"
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 45f19f00-0a96-11ec-a9a2-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false, "@odata.etag":
+      "\"0x8D96CBA28C3503E\""}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '179'
+      Content-Type:
+      - application/json
+      If-Match:
+      - '"0x8D96CBA28C3503E"'
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search71b21e3c.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"error":{"code":"","message":"The precondition given in one of the
+        request headers evaluated to false. No change was made to the resource from
+        this request."}}'
     headers:
       cache-control:
       - no-cache
       content-language:
       - en
       content-length:
-      - '723'
+      - '160'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:52:47 GMT
+      - Tue, 31 Aug 2021 20:01:45 GMT
       elapsed-time:
-      - '738'
+      - '9'
       expires:
       - '-1'
       odata-version:
@@ -153,10 +255,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4100cddf-0a84-11ec-8163-74c63bed1137
+      - 4665ed00-0a96-11ec-b5fa-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 412
+      message: Precondition Failed
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
index 3ef8f4e68490..cdf3eb09783f 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://search205e14df.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA82C9CC62A\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA325827B8\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:00 GMT
+      - Tue, 31 Aug 2021 20:02:01 GMT
       elapsed-time:
-      - '47'
+      - '155'
       etag:
-      - W/"0x8D96CA82C9CC62A"
+      - W/"0x8D96CBA325827B8"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 496f0b25-0a84-11ec-b74b-74c63bed1137
+      - 4f375e77-0a96-11ec-af93-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search205e14df.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA82D1807D4\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA32EBA7CA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:01 GMT
+      - Tue, 31 Aug 2021 20:02:01 GMT
       elapsed-time:
-      - '626'
+      - '672'
       etag:
-      - W/"0x8D96CA82D1807D4"
+      - W/"0x8D96CBA32EBA7CA"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4998c87e-0a84-11ec-9454-74c63bed1137
+      - 4f7198f7-0a96-11ec-953d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,144 @@ interactions:
     uri: https://search205e14df.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA3D6D0434\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
-      content-language:
-      - en
       content-length:
-      - '723'
+      - '383'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:02 GMT
+      - Tue, 31 Aug 2021 20:02:19 GMT
       elapsed-time:
-      - '618'
+      - '17618'
+      etag:
+      - W/"0x8D96CBA3D6D0434"
+      expires:
+      - '-1'
+      location:
+      - https://search205e14df.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 50041593-0a96-11ec-8257-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search205e14df.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBA3D6D0434\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '387'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:19 GMT
+      elapsed-time:
+      - '27'
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 5aa8c026-0a96-11ec-b0cd-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://search205e14df.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control:
+      - no-cache
+      date:
+      - Tue, 31 Aug 2021 20:02:19 GMT
+      elapsed-time:
+      - '46'
+      expires:
+      - '-1'
+      pragma:
+      - no-cache
+      request-id:
+      - 5ab65127-0a96-11ec-939e-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 204
+      message: No Content
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search205e14df.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search205e14df.search.windows.net/$metadata#indexers","value":[]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '92'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:19 GMT
+      elapsed-time:
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -153,10 +268,12 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 4a147582-0a84-11ec-a85d-74c63bed1137
+      - 5ac6798c-0a96-11ec-9bed-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
index 43f71b5ce046..c6e4db10bf79 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_delete_indexer_if_unchanged.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://search54491a19.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA836864DAB\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA467F4E56\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:17 GMT
+      - Tue, 31 Aug 2021 20:02:34 GMT
       elapsed-time:
-      - '41'
+      - '46'
       etag:
-      - W/"0x8D96CA836864DAB"
+      - W/"0x8D96CBA467F4E56"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 536131d6-0a84-11ec-bcd5-74c63bed1137
+      - 63701810-0a96-11ec-898c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search54491a19.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA8375F56BA\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA470C8BC7\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:18 GMT
+      - Tue, 31 Aug 2021 20:02:36 GMT
       elapsed-time:
-      - '1149'
+      - '555'
       etag:
-      - W/"0x8D96CA8375F56BA"
+      - W/"0x8D96CBA470C8BC7"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 53833a1c-0a84-11ec-8227-74c63bed1137
+      - 6398a3eb-0a96-11ec-b8d5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,125 @@ interactions:
     uri: https://search54491a19.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA47F0AAFB\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '383'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:37 GMT
+      elapsed-time:
+      - '1405'
+      etag:
+      - W/"0x8D96CBA47F0AAFB"
+      expires:
+      - '-1'
+      location:
+      - https://search54491a19.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 6425f217-0a96-11ec-a9ef-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "sample-indexer", "description": "updated", "dataSourceName":
+      "sample-datasource", "targetIndexName": "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '139'
+      Content-Type:
+      - application/json
+      Prefer:
+      - return=representation
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: PUT
+    uri: https://search54491a19.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search54491a19.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA483B7CAC\"","name":"sample-indexer","description":"updated","dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '388'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:37 GMT
+      elapsed-time:
+      - '281'
+      etag:
+      - W/"0x8D96CBA483B7CAC"
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 65204c5b-0a96-11ec-979b-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      If-Match:
+      - '"0x8D96CBA47F0AAFB"'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://search54491a19.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"error":{"code":"","message":"The precondition given in one of the
+        request headers evaluated to false. No change was made to the resource from
+        this request."}}'
     headers:
       cache-control:
       - no-cache
       content-language:
       - en
       content-length:
-      - '723'
+      - '160'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:19 GMT
+      - Tue, 31 Aug 2021 20:02:37 GMT
       elapsed-time:
-      - '821'
+      - '23'
       expires:
       - '-1'
       odata-version:
@@ -153,10 +249,10 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 545bc4c2-0a84-11ec-9ed2-74c63bed1137
+      - 6553f8f9-0a96-11ec-966c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
-      code: 400
-      message: Bad Request
+      code: 412
+      message: Precondition Failed
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
new file mode 100644
index 000000000000..bb0dbda6b135
--- /dev/null
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer.yaml
@@ -0,0 +1,201 @@
+interactions:
+- request:
+    body: '{"name": "sample-datasource", "type": "azureblob", "credentials": {"connectionString":
+      "connection_string"}, "container": {"name": "searchcontainer"}}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '325'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searche35313ac.search.windows.net/datasources?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA51051854\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '407'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:51 GMT
+      elapsed-time:
+      - '39'
+      etag:
+      - W/"0x8D96CBA51051854"
+      expires:
+      - '-1'
+      location:
+      - https://searche35313ac.search.windows.net/datasources('sample-datasource')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 6df185e3-0a96-11ec-87b1-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "hotels", "fields": [{"name": "hotelId", "type": "Edm.String",
+      "key": true, "retrievable": true, "searchable": false}]}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '128'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searche35313ac.search.windows.net/indexes?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA51824D6F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '664'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:53 GMT
+      elapsed-time:
+      - '602'
+      etag:
+      - W/"0x8D96CBA51824D6F"
+      expires:
+      - '-1'
+      location:
+      - https://searche35313ac.search.windows.net/indexes('hotels')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 6e1de164-0a96-11ec-82eb-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "sample-indexer", "dataSourceName": "sample-datasource", "targetIndexName":
+      "hotels", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '113'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searche35313ac.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA51D16597\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '383'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:54 GMT
+      elapsed-time:
+      - '430'
+      etag:
+      - W/"0x8D96CBA51D16597"
+      expires:
+      - '-1'
+      location:
+      - https://searche35313ac.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 6e9adfd8-0a96-11ec-b07a-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searche35313ac.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searche35313ac.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA51D16597\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '383'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:02:54 GMT
+      elapsed-time:
+      - '19'
+      etag:
+      - W/"0x8D96CBA51D16597"
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 6efeb795-0a96-11ec-a5dd-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
index 708edeeb62b9..256fc1087b65 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_get_indexer_status.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://search78e216af.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA845EE0EC7\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA5BC20178\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:43 GMT
+      - Tue, 31 Aug 2021 20:03:10 GMT
       elapsed-time:
-      - '46'
+      - '122'
       etag:
-      - W/"0x8D96CA845EE0EC7"
+      - W/"0x8D96CBA5BC20178"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 62b3f845-0a84-11ec-acce-74c63bed1137
+      - 78aa78da-0a96-11ec-ba3a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://search78e216af.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA8466E5AC5\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA5C3066F0\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:44 GMT
+      - Tue, 31 Aug 2021 20:03:11 GMT
       elapsed-time:
-      - '674'
+      - '470'
       etag:
-      - W/"0x8D96CA8466E5AC5"
+      - W/"0x8D96CBA5C3066F0"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 62ea3e62-0a84-11ec-b408-74c63bed1137
+      - 78df849a-0a96-11ec-9e1d-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,64 @@ interactions:
     uri: https://search78e216af.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA5C888158\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
-      content-language:
-      - en
       content-length:
-      - '723'
+      - '383'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:44 GMT
+      - Tue, 31 Aug 2021 20:03:12 GMT
       elapsed-time:
-      - '637'
+      - '397'
+      etag:
+      - W/"0x8D96CBA5C888158"
+      expires:
+      - '-1'
+      location:
+      - https://search78e216af.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 7949c351-0a96-11ec-ab97-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://search78e216af.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://search78e216af.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '527'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:03:12 GMT
+      elapsed-time:
+      - '18'
       expires:
       - '-1'
       odata-version:
@@ -153,10 +188,12 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 636b2853-0a84-11ec-9500-74c63bed1137
+      - 79b4c51f-0a96-11ec-97b8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
index ca86757daecc..9ea075cd5f14 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_list_indexer.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA84EF27C4C\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA662F3622\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:58 GMT
+      - Tue, 31 Aug 2021 20:03:28 GMT
       elapsed-time:
-      - '33'
+      - '41'
       etag:
-      - W/"0x8D96CA84EF27C4C"
+      - W/"0x8D96CBA662F3622"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6bcc68d4-0a84-11ec-a21a-74c63bed1137
+      - 831f6317-0a96-11ec-bb5b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA84F740112\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA66C46436\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:59 GMT
+      - Tue, 31 Aug 2021 20:03:29 GMT
       elapsed-time:
-      - '656'
+      - '665'
       etag:
-      - W/"0x8D96CA84F740112"
+      - W/"0x8D96CBA66C46436"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6beeafe1-0a84-11ec-98ba-74c63bed1137
+      - 8347ef12-0a96-11ec-aebc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -112,7 +112,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '320'
+      - '326'
       Content-Type:
       - application/json
       User-Agent:
@@ -121,7 +121,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA84F979761\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA66F9FC81\"","name":"another-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -130,11 +130,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:53:59 GMT
+      - Tue, 31 Aug 2021 20:03:29 GMT
       elapsed-time:
-      - '50'
+      - '130'
       etag:
-      - W/"0x8D96CA84F979761"
+      - W/"0x8D96CBA66F9FC81"
       expires:
       - '-1'
       location:
@@ -146,7 +146,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6c7097e9-0a84-11ec-914b-74c63bed1137
+      - 83dd7857-0a96-11ec-b1f2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -172,7 +172,7 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA85061335E\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA6769E8D0\"","name":"another-index","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -181,11 +181,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:00 GMT
+      - Tue, 31 Aug 2021 20:03:30 GMT
       elapsed-time:
-      - '1138'
+      - '493'
       etag:
-      - W/"0x8D96CA85061335E"
+      - W/"0x8D96CBA6769E8D0"
       expires:
       - '-1'
       location:
@@ -197,7 +197,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6c9426ac-0a84-11ec-b5e1-74c63bed1137
+      - 84136e66-0a96-11ec-a221-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -223,29 +223,115 @@ interactions:
     uri: https://searchf8231428.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA6863416F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
-      content-language:
-      - en
       content-length:
-      - '723'
+      - '383'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:00 GMT
+      - Tue, 31 Aug 2021 20:03:32 GMT
       elapsed-time:
-      - '627'
+      - '1561'
+      etag:
+      - W/"0x8D96CBA6863416F"
+      expires:
+      - '-1'
+      location:
+      - https://searchf8231428.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 84823fbe-0a96-11ec-911b-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: '{"name": "another-indexer", "dataSourceName": "another-datasource", "targetIndexName":
+      "another-index", "disabled": false}'
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '122'
+      Content-Type:
+      - application/json
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searchf8231428.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA68A5FB5B\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '392'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:03:32 GMT
+      elapsed-time:
+      - '354'
+      etag:
+      - W/"0x8D96CBA68A5FB5B"
+      expires:
+      - '-1'
+      location:
+      - https://searchf8231428.search.windows.net/indexers('another-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 8590d141-0a96-11ec-af37-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searchf8231428.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchf8231428.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBA68A5FB5B\"","name":"another-indexer","description":null,"dataSourceName":"another-datasource","skillsetName":null,"targetIndexName":"another-index","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96CBA6863416F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '692'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:03:32 GMT
+      elapsed-time:
+      - '25'
       expires:
       - '-1'
       odata-version:
@@ -255,10 +341,12 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 6d5da6fc-0a84-11ec-8220-74c63bed1137
+      - 85cf9e78-0a96-11ec-8b23-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
index 5fe608479507..f3213206bdc9 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_reset_indexer.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://searchca8148f.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA859A10AC5\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA71AF9163\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:16 GMT
+      - Tue, 31 Aug 2021 20:03:47 GMT
       elapsed-time:
-      - '36'
+      - '50'
       etag:
-      - W/"0x8D96CA859A10AC5"
+      - W/"0x8D96CBA71AF9163"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7674bbca-0a84-11ec-ac71-74c63bed1137
+      - 8e8efbd5-0a96-11ec-a5b2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searchca8148f.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA85A2AF61B\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA724A65C9\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:17 GMT
+      - Tue, 31 Aug 2021 20:03:48 GMT
       elapsed-time:
-      - '726'
+      - '782'
       etag:
-      - W/"0x8D96CA85A2AF61B"
+      - W/"0x8D96CBA724A65C9"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 769d5a21-0a84-11ec-87e6-74c63bed1137
+      - 8ec89a35-0a96-11ec-9561-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,144 @@ interactions:
     uri: https://searchca8148f.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA729F243F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
-      content-language:
-      - en
       content-length:
-      - '723'
+      - '382'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:17 GMT
+      - Tue, 31 Aug 2021 20:03:49 GMT
       elapsed-time:
-      - '602'
+      - '481'
+      etag:
+      - W/"0x8D96CBA729F243F"
+      expires:
+      - '-1'
+      location:
+      - https://searchca8148f.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 8f632b18-0a96-11ec-8775-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searchca8148f.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBA729F243F\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '386'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:03:49 GMT
+      elapsed-time:
+      - '11'
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 8fd3f80e-0a96-11ec-bba4-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searchca8148f.search.windows.net/indexers('sample-indexer')/search.reset?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control:
+      - no-cache
+      date:
+      - Tue, 31 Aug 2021 20:03:49 GMT
+      elapsed-time:
+      - '425'
+      expires:
+      - '-1'
+      pragma:
+      - no-cache
+      request-id:
+      - 8fddb974-0a96-11ec-8b69-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 204
+      message: No Content
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searchca8148f.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searchca8148f.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":{"status":"inProgress","statusDetail":null,"errorMessage":null,"startTime":"2021-08-31T20:03:49.986Z","endTime":null,"itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null},"executionHistory":[{"status":"reset","statusDetail":null,"errorMessage":null,"startTime":"2021-08-31T20:03:49.565Z","endTime":"2021-08-31T20:03:49.565Z","itemsProcessed":0,"itemsFailed":0,"initialTrackingState":null,"finalTrackingState":null,"mode":"indexingAllDocs","errors":[],"warnings":[],"metrics":null}],"limits":{"maxRunTime":"PT2M","maxDocumentExtractionSize":16777216,"maxDocumentContentCharactersToExtract":32768},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '1094'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:03:49 GMT
+      elapsed-time:
+      - '48'
       expires:
       - '-1'
       odata-version:
@@ -153,10 +268,12 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 77278639-0a84-11ec-8e5c-74c63bed1137
+      - 9026e460-0a96-11ec-a63e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
 version: 1
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
index fd470441a5c6..bb9dcfe190fa 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_indexer_client_live.test_run_indexer.yaml
@@ -10,7 +10,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '319'
+      - '325'
       Content-Type:
       - application/json
       User-Agent:
@@ -19,7 +19,7 @@ interactions:
     uri: https://searche43613c1.search.windows.net/datasources?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CA86382C7EE\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#datasources/$entity","@odata.etag":"\"0x8D96CBA7BB6513B\"","name":"sample-datasource","description":null,"type":"azureblob","subtype":null,"credentials":{"connectionString":null},"container":{"name":"searchcontainer","query":null},"dataChangeDetectionPolicy":null,"dataDeletionDetectionPolicy":null,"encryptionKey":null,"identity":null}'
     headers:
       cache-control:
       - no-cache
@@ -28,11 +28,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:32 GMT
+      - Tue, 31 Aug 2021 20:04:04 GMT
       elapsed-time:
-      - '50'
+      - '47'
       etag:
-      - W/"0x8D96CA86382C7EE"
+      - W/"0x8D96CBA7BB6513B"
       expires:
       - '-1'
       location:
@@ -44,7 +44,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 805c26c8-0a84-11ec-8a12-74c63bed1137
+      - 989b728d-0a96-11ec-9967-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -70,7 +70,7 @@ interactions:
     uri: https://searche43613c1.search.windows.net/indexes?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CA863FBBF1F\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexes/$entity","@odata.etag":"\"0x8D96CBA7C525E54\"","name":"hotels","defaultScoringProfile":null,"fields":[{"name":"hotelId","type":"Edm.String","searchable":false,"filterable":true,"retrievable":true,"sortable":true,"facetable":true,"key":true,"indexAnalyzer":null,"searchAnalyzer":null,"analyzer":null,"normalizer":null,"synonymMaps":[]}],"scoringProfiles":[],"corsOptions":null,"suggesters":[],"analyzers":[],"normalizers":[],"tokenizers":[],"tokenFilters":[],"charFilters":[],"encryptionKey":null,"similarity":{"@odata.type":"#Microsoft.Azure.Search.BM25Similarity","k1":null,"b":null}}'
     headers:
       cache-control:
       - no-cache
@@ -79,11 +79,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:33 GMT
+      - Tue, 31 Aug 2021 20:04:05 GMT
       elapsed-time:
-      - '616'
+      - '828'
       etag:
-      - W/"0x8D96CA863FBBF1F"
+      - W/"0x8D96CBA7C525E54"
       expires:
       - '-1'
       location:
@@ -95,7 +95,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 807f6f07-0a84-11ec-8259-74c63bed1137
+      - 98ceaa28-0a96-11ec-aeac-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -121,29 +121,146 @@ interactions:
     uri: https://searche43613c1.search.windows.net/indexers?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"error":{"code":"","message":"Error with data source: Credentials
-        provided in the connection string are invalid or have expired.\r\nAs a result
-        of a one-time maintenance activity, your search service went through a change
-        of the IP address for its API endpoint. This caused indexers that depend on
-        network access rules on the data source to stop working. In order to address
-        this issue, please update the network access rules in your data source to
-        use the new IP address. We apologize for the inconvenience.\r\nFor more information
-        on troubleshooting connection issues to Azure Storage accounts, please see
-        https://go.microsoft.com/fwlink/?linkid=2049388  Please adjust your data source
-        definition in order to proceed."}}'
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexers/$entity","@odata.etag":"\"0x8D96CBA7CA5BCFA\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
-      content-language:
-      - en
       content-length:
-      - '723'
+      - '383'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:54:34 GMT
+      - Tue, 31 Aug 2021 20:04:05 GMT
       elapsed-time:
-      - '801'
+      - '588'
+      etag:
+      - W/"0x8D96CBA7CA5BCFA"
+      expires:
+      - '-1'
+      location:
+      - https://searche43613c1.search.windows.net/indexers('sample-indexer')?api-version=2021-04-30-Preview
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 996d0aa6-0a96-11ec-b3f3-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 201
+      message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searche43613c1.search.windows.net/indexers?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#indexers","value":[{"@odata.etag":"\"0x8D96CBA7CA5BCFA\"","name":"sample-indexer","description":null,"dataSourceName":"sample-datasource","skillsetName":null,"targetIndexName":"hotels","disabled":false,"schedule":null,"parameters":null,"fieldMappings":[],"outputFieldMappings":[],"cache":null,"encryptionKey":null}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '387'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:04:05 GMT
+      elapsed-time:
+      - '20'
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - 99e8d0e6-0a96-11ec-a5d9-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: POST
+    uri: https://searche43613c1.search.windows.net/indexers('sample-indexer')/search.run?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '0'
+      date:
+      - Tue, 31 Aug 2021 20:04:05 GMT
+      elapsed-time:
+      - '57'
+      expires:
+      - '-1'
+      pragma:
+      - no-cache
+      request-id:
+      - 99f43f83-0a96-11ec-a830-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 202
+      message: Accepted
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://searche43613c1.search.windows.net/indexers('sample-indexer')/search.status?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"@odata.context":"https://searche43613c1.search.windows.net/$metadata#Microsoft.Azure.Search.V2021_04_30_Preview.IndexerExecutionInfo","name":"sample-indexer","status":"running","lastResult":null,"executionHistory":[],"limits":{"maxRunTime":"PT0S","maxDocumentExtractionSize":0,"maxDocumentContentCharactersToExtract":0},"currentState":{"mode":"indexingAllDocs","allDocsInitialTrackingState":null,"allDocsFinalTrackingState":null,"resetDocsInitialTrackingState":null,"resetDocsFinalTrackingState":null,"resetDocumentKeys":[]}}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '527'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Tue, 31 Aug 2021 20:04:05 GMT
+      elapsed-time:
+      - '25'
       expires:
       - '-1'
       odata-version:
@@ -153,10 +270,12 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 80f8cb65-0a84-11ec-a88a-74c63bed1137
+      - 9a05ee1f-0a96-11ec-96fc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
+      vary:
+      - Accept-Encoding
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
 version: 1

From 92938f875d1d5d8e39d3b132afaa4fcf1148e654 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Tue, 31 Aug 2021 14:02:55 -0700
Subject: [PATCH 10/17] Fix ordering on old Python version.

---
 .../azure/search/documents/indexes/models/_models.py      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index eed05eea4e0e..ac7c57ff6706 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -240,13 +240,13 @@ def _from_generated(cls, skill):
         kwargs = skill.as_dict()
         if isinstance(skill, _EntityRecognitionSkillV1):
             return EntityRecognitionSkill(
-                **kwargs,
-                skill_version=EntityRecognitionSkillVersion.V1
+                skill_version=EntityRecognitionSkillVersion.V1,
+                **kwargs
             )
         if isinstance(skill, _EntityRecognitionSkillV3):
             return EntityRecognitionSkill(
-                **kwargs,
-                skill_version=EntityRecognitionSkillVersion.V3
+                skill_version=EntityRecognitionSkillVersion.V3,
+                **kwargs
             )
 
 

From efb63d123ac4310cc4d7ccc5c21aabae20c2ebf7 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Tue, 31 Aug 2021 14:12:18 -0700
Subject: [PATCH 11/17] Add changelog entry.

---
 sdk/search/azure-search-documents/CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sdk/search/azure-search-documents/CHANGELOG.md b/sdk/search/azure-search-documents/CHANGELOG.md
index faba75e3685f..0ba6eec9de3a 100644
--- a/sdk/search/azure-search-documents/CHANGELOG.md
+++ b/sdk/search/azure-search-documents/CHANGELOG.md
@@ -8,6 +8,7 @@
   - `azure.search.documents.models.Captions`
   - `azure.search.documents.models.CaptionResult`
   - `azure.search.documents.indexes.models.CustomEntityLookupSkillLanguage`
+  - `azure.search.documents.indexes.models.EntityRecognitionSkillVersion`
   - `azure.search.documents.indexes.models.LexicalNormalizerName`
   - `azure.search.documents.indexes.models.PIIDetectionSkill`
   - `azure.search.documents.indexes.models.PIIDetectionSkillMaskingMode`
@@ -15,8 +16,21 @@
   - `azure.search.documents.indexes.models.SearchIndexerDataIdentity`
   - `azure.search.documents.indexes.models.SearchIndexerDataNoneIdentity`
   - `azure.search.documents.indexes.models.SearchIndexerDataUserAssignedIdentity`
+  - `azure.search.documents.indexes.models.SentimentSkillVersion`
 - Added `normalizer_name` property to `AnalyzeTextOptions` model.
 
+### Breaking Changes
+
+- Removed models:
+  - `azure.search.documents.indexes.models.SentimentSkillV3`
+  - `azure.search.documents.indexes.models.EntityRecognitionSkillV3`
+
+### Other Changes
+- `SentimentSkill` and `EntityRecognitionSkill` can now be created by specifying
+  the `skill_version` keyword argument with a `SentimentSkillVersion` or
+  `EntityRecognitionSkillVersion`, respectively. The default behavior if `skill_version`
+  is not specified is to create a version 1 skill.
+
 ## 11.3.0b2 (2021-08-10)
 
 ### Features Added

From 27ec63afbee37ac3e853e5c97b161263788d5ae7 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Wed, 1 Sep 2021 10:56:36 -0700
Subject: [PATCH 12/17] Fix linter issues. Make enums NOT case insensitive due
 to pylint failure.

---
 .../documents/indexes/models/_models.py       | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index ac7c57ff6706..33ea72504cc0 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -3,8 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from enum import Enum, EnumMeta
-from six import with_metaclass
+from enum import Enum
 import msrest.serialization
 from .._generated.models import (
     LexicalAnalyzer,
@@ -25,7 +24,6 @@
     DataSourceCredentials,
     AzureActiveDirectoryApplicationCredentials,
 )
-from .._generated.models._search_client_enums import _CaseInsensitiveEnumMeta
 
 
 DELIMITER = "|"
@@ -104,7 +102,7 @@ def _from_generated(cls, skillset):
         return cls(**kwargs)
 
 
-class EntityRecognitionSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
+class EntityRecognitionSkillVersion(str, Enum):
     """Specifies the Entity Recognition skill version to use."""
 
     #: Use Entity Recognition skill V1.
@@ -232,6 +230,7 @@ def _to_generated(self):
                 minimum_precision=self.minimum_precision,
                 model_version=self.model_version
             )
+        return None
 
     @classmethod
     def _from_generated(cls, skill):
@@ -248,9 +247,10 @@ def _from_generated(cls, skill):
                 skill_version=EntityRecognitionSkillVersion.V3,
                 **kwargs
             )
+        return None
 
 
-class SentimentSkillVersion(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
+class SentimentSkillVersion(str, Enum):
     """ Specifies the Sentiment Skill version to use."""
 
     #: Use Sentiment skill V1.
@@ -346,6 +346,8 @@ def __init__(
     def _to_generated(self):
         if self.skill_version == SentimentSkillVersion.V1:
             return _SentimentSkillV1(
+                inputs=self.inputs,
+                outputs=self.outputs,
                 name=self.name,
                 odata_type=self.odata_type,
                 default_language_code=self.default_language_code,
@@ -354,25 +356,32 @@ def _to_generated(self):
             )
         if self.skill_version in [SentimentSkillVersion.V3, SentimentSkillVersion.LATEST]:
             return _SentimentSkillV3(
+                inputs=self.inputs,
+                outputs=self.outputs,
                 name=self.name,
                 odata_type=self.odata_type,
                 default_language_code=self.default_language_code,
                 include_opinion_mining=self.include_opinion_mining,
                 model_version=self.model_version
             )
+        return None
 
     @classmethod
     def _from_generated(cls, skill):
         if not skill:
             return None
+        kwargs = skill.as_dict()
         if isinstance(cls, _SentimentSkillV1):
             return SentimentSkill(
-                skill_version=SentimentSkillVersion.V1
+                skill_version=SentimentSkillVersion.V1,
+                **kwargs
             )
         if isinstance(cls, _SentimentSkillV3):
             return SentimentSkill(
-                skill_version=SentimentSkillVersion.V3
+                skill_version=SentimentSkillVersion.V3,
+                **kwargs
             )
+        return None
 
 
 class AnalyzeTextOptions(msrest.serialization.Model):

From e15b8429260da2a99519c78c0ec9b1e3eadd4bee Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Thu, 2 Sep 2021 16:31:51 -0700
Subject: [PATCH 13/17] Remove client-side validation. Update models.

---
 .../indexes/_search_indexer_client.py         |  7 +++---
 .../indexes/aio/_search_indexer_client.py     |  5 ++--
 .../documents/indexes/models/_models.py       | 25 +++----------------
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
index 44ec458543e7..061e7d54462f 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/_search_indexer_client.py
@@ -564,10 +564,10 @@ def create_skillset(self, skillset, **kwargs):
 
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
-        result = self._client.skillsets.create(skillset._to_generated(), **kwargs) # pylint:disable=protected-access
+        skillset = skillset._to_generated() if hasattr(skillset, '_to_generated') else skillset # pylint:disable=protected-access
+        result = self._client.skillsets.create(skillset, **kwargs)
         return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
 
-
     @distributed_trace
     def create_or_update_skillset(self, skillset, **kwargs):
         # type: (SearchIndexerSkillset, **Any) -> SearchIndexerSkillset
@@ -587,10 +587,11 @@ def create_or_update_skillset(self, skillset, **kwargs):
             skillset, kwargs.pop("match_condition", MatchConditions.Unconditionally)
         )
         kwargs.update(access_condition)
+        skillset = skillset._to_generated() if hasattr(skillset, '_to_generated') else skillset # pylint:disable=protected-access
 
         result = self._client.skillsets.create_or_update(
             skillset_name=skillset.name,
-            skillset=skillset._to_generated(), # pylint:disable=protected-access
+            skillset=skillset,
             error_map=error_map,
             **kwargs
         )
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
index e5b70c694ef6..d8171269bcf6 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_indexer_client.py
@@ -557,7 +557,7 @@ async def create_skillset(self, skillset, **kwargs):
 
         """
         kwargs["headers"] = self._merge_client_headers(kwargs.get("headers"))
-
+        skillset = skillset._to_generated() if hasattr(skillset, '_to_generated') else skillset # pylint:disable=protected-access
         result = await self._client.skillsets.create(skillset, **kwargs)
         return SearchIndexerSkillset._from_generated(result) # pylint:disable=protected-access
 
@@ -580,10 +580,11 @@ async def create_or_update_skillset(self, skillset, **kwargs):
             skillset, kwargs.pop("match_condition", MatchConditions.Unconditionally)
         )
         kwargs.update(access_condition)
+        skillset = skillset._to_generated() if hasattr(skillset, '_to_generated') else skillset # pylint:disable=protected-access
 
         result = await self._client.skillsets.create_or_update(
             skillset_name=skillset.name,
-            skillset=skillset._to_generated(), # pylint:disable=protected-access
+            skillset=skillset,
             error_map=error_map,
             **kwargs
         )
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index 33ea72504cc0..36d75590f017 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -189,11 +189,6 @@ def __init__(
     ):
         # pop skill_version from kwargs to avoid warning in msrest
         skill_version = kwargs.pop('skill_version', EntityRecognitionSkillVersion.V1)
-        # client-side validation
-        if skill_version == EntityRecognitionSkillVersion.V1:
-            validate(kwargs, '1', 'model_version')
-        if skill_version in [EntityRecognitionSkillVersion.V3, EntityRecognitionSkillVersion.LATEST]:
-            validate(kwargs, '3', 'include_typeless_entities')
 
         super(EntityRecognitionSkill, self).__init__(**kwargs)
         self.skill_version = skill_version
@@ -332,12 +327,8 @@ def __init__(
         # pop skill_version from kwargs to avoid warning in msrest
         skill_version = kwargs.pop('skill_version', SentimentSkillVersion.V1)
 
-        # client-side validation
-        if skill_version == SentimentSkillVersion.V1:
-            validate(kwargs, '1', ['include_opinion_mining', 'model_version'])
-
         super(SentimentSkill, self).__init__(**kwargs)
-        self.skill_version = kwargs.get('skill_version', SentimentSkillVersion.V1)
+        self.skill_version = skill_version
         self.odata_type = self.skill_version  # type: str
         self.default_language_code = kwargs.get('default_language_code', None)
         self.include_opinion_mining = kwargs.get('include_opinion_mining', False)
@@ -371,12 +362,12 @@ def _from_generated(cls, skill):
         if not skill:
             return None
         kwargs = skill.as_dict()
-        if isinstance(cls, _SentimentSkillV1):
+        if isinstance(skill, _SentimentSkillV1):
             return SentimentSkill(
                 skill_version=SentimentSkillVersion.V1,
                 **kwargs
             )
-        if isinstance(cls, _SentimentSkillV3):
+        if isinstance(skill, _SentimentSkillV3):
             return SentimentSkill(
                 skill_version=SentimentSkillVersion.V3,
                 **kwargs
@@ -959,13 +950,3 @@ def unpack_analyzer(analyzer):
             analyzer
         )
     return analyzer
-
-
-def validate(kwargs, version, unsupported):
-    unsupported = [unsupported] if isinstance(unsupported, str) else unsupported
-    errors = []
-    for param in unsupported:
-        if param in kwargs:
-            errors.append(param)
-    if errors:
-        raise ValueError("Unsupported parameters for skill version {}: {}".format(version, ', '.join(errors)))

From 456c6f3fb5a58c9f2b32001f632368e80c0b868f Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Thu, 2 Sep 2021 16:32:39 -0700
Subject: [PATCH 14/17] Update test and re-record skillset tests.

---
 ..._async.test_create_or_update_skillset.yaml | 42 ++++----
 ...reate_or_update_skillset_if_unchanged.yaml | 28 +++---
 ...est_create_or_update_skillset_inplace.yaml | 42 ++++----
 ...llset_live_async.test_create_skillset.yaml | 38 ++++---
 ...llset_live_async.test_delete_skillset.yaml | 36 +++----
 ...ync.test_delete_skillset_if_unchanged.yaml | 31 +++---
 ...skillset_live_async.test_get_skillset.yaml | 28 +++---
 ...killset_live_async.test_get_skillsets.yaml | 28 +++---
 ...search_index_client_skillset_live_async.py | 45 +++++++--
 ...t_live.test_create_or_update_skillset.yaml | 38 +++----
 ...reate_or_update_skillset_if_unchanged.yaml | 28 +++---
 ...est_create_or_update_skillset_inplace.yaml | 38 +++----
 ...nt_skillset_live.test_create_skillset.yaml | 98 +++++++++++++++----
 ...nt_skillset_live.test_delete_skillset.yaml | 28 +++---
 ...ive.test_delete_skillset_if_unchanged.yaml | 28 +++---
 ...lient_skillset_live.test_get_skillset.yaml | 28 +++---
 ...ient_skillset_live.test_get_skillsets.yaml | 28 +++---
 .../test_search_index_client_skillset_live.py | 49 ++++++++--
 ...search_index_client_skillset_validation.py | 40 --------
 19 files changed, 410 insertions(+), 311 deletions(-)
 delete mode 100644 sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py

diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
index fce05141a99d..dd76e63868bf 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5C258086A\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68DAFE8B60\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:43 GMT
-      elapsed-time: '1745'
-      etag: W/"0x8D96CA5C258086A"
+      date: Thu, 02 Sep 2021 23:24:47 GMT
+      elapsed-time: '71'
+      etag: W/"0x8D96E68DAFE8B60"
       expires: '-1'
       location: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: de2e61b1-0a81-11ec-bb74-74c63bed1137
+      request-id: f803485e-0c44-11ec-94bf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5C2668AF1\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68DB0E46AD\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '475'
+      content-length: '476'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:43 GMT
-      elapsed-time: '45'
-      etag: W/"0x8D96CA5C2668AF1"
+      date: Thu, 02 Sep 2021 23:24:47 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96E68DB0E46AD"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: df50eaa1-0a81-11ec-8ced-74c63bed1137
+      request-id: f8296400-0c44-11ec-824c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5C2668AF1\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E68DB0E46AD\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '532'
+      content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:43 GMT
-      elapsed-time: '37'
+      date: Thu, 02 Sep 2021 23:24:47 GMT
+      elapsed-time: '17'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: df5ea2a8-0a81-11ec-82a4-74c63bed1137
+      request-id: f8367fef-0c44-11ec-8300-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -117,19 +117,19 @@ interactions:
     uri: https://search971e1eee.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5C2668AF1\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search971e1eee.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68DB0E46AD\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:43 GMT
-      elapsed-time: '13'
-      etag: W/"0x8D96CA5C2668AF1"
+      date: Thu, 02 Sep 2021 23:24:47 GMT
+      elapsed-time: '10'
+      etag: W/"0x8D96E68DB0E46AD"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: df6b4986-0a81-11ec-a355-74c63bed1137
+      request-id: f83f5741-0c44-11ec-8533-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
index 81f49085f2f6..eec4e50f8c22 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_if_unchanged.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5CB230856\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68E3BDC8FB\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:58 GMT
-      elapsed-time: '156'
-      etag: W/"0x8D96CA5CB230856"
+      date: Thu, 02 Sep 2021 23:25:02 GMT
+      elapsed-time: '39'
+      etag: W/"0x8D96E68E3BDC8FB"
       expires: '-1'
       location: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e7e1c7e6-0a81-11ec-af51-74c63bed1137
+      request-id: 00bab8aa-0c45-11ec-a1ea-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search4ddb2428.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5CB35837B\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68E3CA4F26\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '476'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:58 GMT
-      elapsed-time: '81'
-      etag: W/"0x8D96CA5CB35837B"
+      date: Thu, 02 Sep 2021 23:25:02 GMT
+      elapsed-time: '40'
+      etag: W/"0x8D96E68E3CA4F26"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e81b6671-0a81-11ec-bfd5-74c63bed1137
+      request-id: 00e63fa5-0c45-11ec-a293-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search4ddb2428.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5CB35837B\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search4ddb2428.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E68E3CA4F26\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:35:58 GMT
-      elapsed-time: '78'
+      date: Thu, 02 Sep 2021 23:25:02 GMT
+      elapsed-time: '19'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: e8346617-0a81-11ec-9913-74c63bed1137
+      request-id: 00f2797b-0c45-11ec-acce-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
index ce7b0acbd2e3..46b0cf792315 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_or_update_skillset_inplace.yaml
@@ -19,20 +19,20 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5D577A0EC\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68ED1FD734\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '609'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:14 GMT
-      elapsed-time: '54'
-      etag: W/"0x8D96CA5D577A0EC"
+      date: Thu, 02 Sep 2021 23:25:17 GMT
+      elapsed-time: '43'
+      etag: W/"0x8D96E68ED1FD734"
       expires: '-1'
       location: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f23fc68a-0a81-11ec-b8f7-74c63bed1137
+      request-id: 0a1fc946-0c45-11ec-8c33-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -58,19 +58,19 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5D5858703\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68ED2D20E8\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '477'
+      content-length: '476'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:14 GMT
-      elapsed-time: '47'
-      etag: W/"0x8D96CA5D5858703"
+      date: Thu, 02 Sep 2021 23:25:17 GMT
+      elapsed-time: '48'
+      etag: W/"0x8D96E68ED2D20E8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f27018a2-0a81-11ec-ba02-74c63bed1137
+      request-id: 0a485611-0c45-11ec-b8b7-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -88,18 +88,18 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5D5858703\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E68ED2D20E8\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '534'
+      content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:14 GMT
-      elapsed-time: '37'
+      date: Thu, 02 Sep 2021 23:25:17 GMT
+      elapsed-time: '17'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f27da9a7-0a81-11ec-9aaf-74c63bed1137
+      request-id: 0a55d97a-0c45-11ec-a692-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -117,19 +117,19 @@ interactions:
     uri: https://search9d362229.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5D5858703\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9d362229.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68ED2D20E8\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '531'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:14 GMT
-      elapsed-time: '30'
-      etag: W/"0x8D96CA5D5858703"
+      date: Thu, 02 Sep 2021 23:25:17 GMT
+      elapsed-time: '13'
+      etag: W/"0x8D96E68ED2D20E8"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: f29216a9-0a81-11ec-977a-74c63bed1137
+      request-id: 0a5eb6f5-0c45-11ec-8b5b-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
index 9a7bc1556c63..3d61e40be4f7 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_create_skillset.yaml
@@ -2,14 +2,22 @@ interactions:
 - request:
     body: '{"name": "test-ss", "description": "desc", "skills": [{"@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill",
       "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
-      "organizations", "targetName": "organizationsV1"}]}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityRecognitionSkill",
+      "organizations", "targetName": "organizationsS1"}], "includeTypelessEntities":
+      true}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityRecognitionSkill", "inputs":
+      [{"name": "text", "source": "/document/content"}], "outputs": [{"name": "organizations",
+      "targetName": "organizationsS2"}], "modelVersion": "3"}, {"@odata.type": "#Microsoft.Skills.Text.SentimentSkill",
       "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
-      "organizations", "targetName": "organizationsV3"}]}]}'
+      "score", "targetName": "scoreS3"}]}, {"@odata.type": "#Microsoft.Skills.Text.V3.SentimentSkill",
+      "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
+      "confidenceScores", "targetName": "scoreS4"}], "includeOpinionMining": true},
+      {"@odata.type": "#Microsoft.Skills.Text.V3.EntityLinkingSkill", "inputs": [{"name":
+      "text", "source": "/document/content"}], "outputs": [{"name": "entities", "targetName":
+      "entitiesS5"}], "minimumPrecision": 0.5}]}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
       Content-Length:
-      - '457'
+      - '1121'
       Content-Type:
       - application/json
       User-Agent:
@@ -18,20 +26,20 @@ interactions:
     uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5E13C5041\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6933515CD0\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":"3","inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS2"}]},{"@odata.type":"#Microsoft.Skills.Text.SentimentSkill","name":null,"description":null,"context":null,"defaultLanguageCode":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"score","targetName":"scoreS3"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.SentimentSkill","name":null,"description":null,"context":null,"defaultLanguageCode":null,"modelVersion":null,"includeOpinionMining":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"confidenceScores","targetName":"scoreS4"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityLinkingSkill","name":null,"description":null,"context":null,"defaultLanguageCode":null,"minimumPrecision":0.5,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"entities","targetName":"entitiesS5"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '967'
+      content-length: '1894'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:35 GMT
-      elapsed-time: '5078'
-      etag: W/"0x8D96CA5E13C5041"
+      date: Thu, 02 Sep 2021 23:27:16 GMT
+      elapsed-time: '200'
+      etag: W/"0x8D96E6933515CD0"
       expires: '-1'
       location: https://search75151acc.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fb10f75b-0a81-11ec-b033-74c63bed1137
+      request-id: 5036e3d3-0c45-11ec-89fe-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -48,19 +56,19 @@ interactions:
     uri: https://search75151acc.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5E13C5041\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
-        Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search75151acc.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E6933515CD0\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
+        Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":"3","inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS2"}]},{"@odata.type":"#Microsoft.Skills.Text.SentimentSkill","name":"#3","description":null,"context":"/document","defaultLanguageCode":"en","inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"score","targetName":"scoreS3"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.SentimentSkill","name":"#4","description":null,"context":"/document","defaultLanguageCode":"en","modelVersion":null,"includeOpinionMining":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"confidenceScores","targetName":"scoreS4"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityLinkingSkill","name":"#5","description":null,"context":"/document","defaultLanguageCode":"en","minimumPrecision":0.5,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"entities","targetName":"entitiesS5"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '633'
+      content-length: '795'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:35 GMT
-      elapsed-time: '256'
+      date: Thu, 02 Sep 2021 23:27:16 GMT
+      elapsed-time: '39'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: fe3d5e14-0a81-11ec-903a-74c63bed1137
+      request-id: 507bb3fc-0c45-11ec-b9ee-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
index 086b3e88112a..5a09a7fbdc22 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5EC6BEE3A\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68FF489F23\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:54 GMT
-      elapsed-time: '3822'
-      etag: W/"0x8D96CA5EC6BEE3A"
+      date: Thu, 02 Sep 2021 23:25:47 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96E68FF489F23"
       expires: '-1'
       location: https://search74f91acb.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 06f2d8de-0a82-11ec-9bcc-74c63bed1137
+      request-id: 1c4385ac-0c45-11ec-874c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,19 +46,20 @@ interactions:
     uri: https://search74f91acb.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA5EC6BEE3A\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E68FF489F23\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
-      content-length: '689'
+      content-length: '532'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:54 GMT
-      elapsed-time: '69'
+      date: Thu, 02 Sep 2021 23:25:48 GMT
+      elapsed-time: '18'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 096b49a4-0a82-11ec-9974-74c63bed1137
+      request-id: 1c7173b2-0c45-11ec-ae8f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
     status:
       code: 200
       message: OK
@@ -77,11 +78,11 @@ interactions:
       string: ''
     headers:
       cache-control: no-cache
-      date: Tue, 31 Aug 2021 17:36:54 GMT
-      elapsed-time: '57'
+      date: Thu, 02 Sep 2021 23:25:48 GMT
+      elapsed-time: '25'
       expires: '-1'
       pragma: no-cache
-      request-id: 09831126-0a82-11ec-9241-74c63bed1137
+      request-id: 1c7a1871-0c45-11ec-98f2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 204
@@ -101,16 +102,17 @@ interactions:
       string: '{"@odata.context":"https://search74f91acb.search.windows.net/$metadata#skillsets","value":[]}'
     headers:
       cache-control: no-cache
-      content-length: '93'
+      content-length: '201'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:36:59 GMT
-      elapsed-time: '8'
+      date: Thu, 02 Sep 2021 23:25:53 GMT
+      elapsed-time: '7'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 0c91e1d9-0a82-11ec-80aa-74c63bed1137
+      request-id: 1f800e80-0c45-11ec-bf10-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
     status:
       code: 200
       message: OK
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
index 318d16032556..9b5979b55c2b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_delete_skillset_if_unchanged.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://searchf5e02005.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5F8A26755\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E690C10CE45\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:13 GMT
-      elapsed-time: '77'
-      etag: W/"0x8D96CA5F8A26755"
+      date: Thu, 02 Sep 2021 23:26:10 GMT
+      elapsed-time: '45'
+      etag: W/"0x8D96E690C10CE45"
       expires: '-1'
       location: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1571e7fe-0a82-11ec-aa92-74c63bed1137
+      request-id: 290c4a34-0c45-11ec-b7b9-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -55,20 +55,21 @@ interactions:
     uri: https://searchf5e02005.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA5F8B18634\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchf5e02005.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E690C22FB28\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
-      content-length: '611'
+      content-length: '478'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:13 GMT
-      elapsed-time: '52'
-      etag: W/"0x8D96CA5F8B18634"
+      date: Thu, 02 Sep 2021 23:26:10 GMT
+      elapsed-time: '76'
+      etag: W/"0x8D96E690C22FB28"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 159b3710-0a82-11ec-94f5-74c63bed1137
+      request-id: 2939484a-0c45-11ec-9a43-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
+      vary: Accept-Encoding
     status:
       code: 200
       message: OK
@@ -79,7 +80,7 @@ interactions:
       Accept:
       - application/json;odata.metadata=minimal
       If-Match:
-      - '"0x8D96CA5F8A26755"'
+      - '"0x8D96E690C10CE45"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -94,13 +95,13 @@ interactions:
       content-language: en
       content-length: '160'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:13 GMT
-      elapsed-time: '11'
+      date: Thu, 02 Sep 2021 23:26:10 GMT
+      elapsed-time: '6'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 15aa4e4a-0a82-11ec-8cc8-74c63bed1137
+      request-id: 294b99fe-0c45-11ec-a82c-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 412
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
index c56e61af766e..b9fd4b1c9f5e 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillset.yaml
@@ -16,20 +16,20 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA6011D5ED7\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E691431F757\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '608'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:28 GMT
-      elapsed-time: '56'
-      etag: W/"0x8D96CA6011D5ED7"
+      date: Thu, 02 Sep 2021 23:26:22 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96E691431F757"
       expires: '-1'
       location: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1dea99a9-0a82-11ec-beab-74c63bed1137
+      request-id: 31381187-0c45-11ec-a9cf-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -46,18 +46,18 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA6011D5ED7\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E691431F757\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '533'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:28 GMT
-      elapsed-time: '19'
+      date: Thu, 02 Sep 2021 23:26:22 GMT
+      elapsed-time: '16'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1e16a725-0a82-11ec-bfd6-74c63bed1137
+      request-id: 315b22e7-0c45-11ec-97db-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
@@ -75,19 +75,19 @@ interactions:
     uri: https://search267a1998.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA6011D5ED7\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search267a1998.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E691431F757\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '530'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:28 GMT
-      elapsed-time: '19'
-      etag: W/"0x8D96CA6011D5ED7"
+      date: Thu, 02 Sep 2021 23:26:24 GMT
+      elapsed-time: '10'
+      etag: W/"0x8D96E691431F757"
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 1e1f7e80-0a82-11ec-bef5-74c63bed1137
+      request-id: 31635f3c-0c45-11ec-be60-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
index 801b10cea4fc..37cf0a2f3e7b 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/async_tests/recordings/test_search_index_client_skillset_live_async.test_get_skillsets.yaml
@@ -17,20 +17,20 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA609416E76\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E691CCFE91B\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:42 GMT
-      elapsed-time: '63'
-      etag: W/"0x8D96CA609416E76"
+      date: Thu, 02 Sep 2021 23:26:38 GMT
+      elapsed-time: '46'
+      etag: W/"0x8D96E691CCFE91B"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-1')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 2618540f-0a82-11ec-b482-74c63bed1137
+      request-id: 39ca6afa-0c45-11ec-9c31-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -54,20 +54,20 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA6094F065A\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E691CDF0806\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control: no-cache
       content-length: '611'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:42 GMT
-      elapsed-time: '42'
-      etag: W/"0x8D96CA6094F065A"
+      date: Thu, 02 Sep 2021 23:26:38 GMT
+      elapsed-time: '48'
+      etag: W/"0x8D96E691CDF0806"
       expires: '-1'
       location: https://search40851a0b.search.windows.net/skillsets('test-ss-2')?api-version=2021-04-30-Preview
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 263a5216-0a82-11ec-acf1-74c63bed1137
+      request-id: 39f92f62-0c45-11ec-98b2-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
     status:
       code: 201
@@ -84,18 +84,18 @@ interactions:
     uri: https://search40851a0b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA609416E76\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96CA6094F065A\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search40851a0b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E691CCFE91B\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96E691CDF0806\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control: no-cache
       content-length: '564'
       content-type: application/json; odata.metadata=minimal
-      date: Tue, 31 Aug 2021 17:37:42 GMT
-      elapsed-time: '20'
+      date: Thu, 02 Sep 2021 23:26:38 GMT
+      elapsed-time: '19'
       expires: '-1'
       odata-version: '4.0'
       pragma: no-cache
       preference-applied: odata.include-annotations="*"
-      request-id: 2647bc16-0a82-11ec-8264-74c63bed1137
+      request-id: 3a0801ab-0c45-11ec-a88f-74c63bed1137
       strict-transport-security: max-age=15724800; includeSubDomains
       vary: Accept-Encoding
     status:
diff --git a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
index c0609371ea46..1544e53a34cb 100644
--- a/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
+++ b/sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_skillset_live_async.py
@@ -21,11 +21,14 @@
 
 from azure.core.exceptions import HttpResponseError
 from azure.search.documents.indexes.models import(
+    EntityLinkingSkill,
     EntityRecognitionSkill,
     EntityRecognitionSkillVersion,
     InputFieldMappingEntry,
     OutputFieldMappingEntry,
     SearchIndexerSkillset,
+    SentimentSkill,
+    SentimentSkillVersion
 )
 from azure.search.documents.indexes.aio import SearchIndexerClient
 
@@ -57,25 +60,51 @@ async def test_create_skillset(self, api_key, endpoint, index_name, **kwargs):
         name = "test-ss"
 
         s1 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")])
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsS1")],
+                                    description="Skill Version 1",
+                                    model_version="1",
+                                    include_typeless_entities=True)
 
         s2 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV3")],
-                                    skill_version=EntityRecognitionSkillVersion.V3)
-
-        skillset = SearchIndexerSkillset(name=name, skills=list([s1, s2]), description="desc")
-
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsS2")],
+                                    skill_version=EntityRecognitionSkillVersion.LATEST,
+                                    description="Skill Version 3",
+                                    model_version="3",
+                                    include_typeless_entities=True)
+        s3 = SentimentSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                            outputs=[OutputFieldMappingEntry(name="score", target_name="scoreS3")],
+                            skill_version=SentimentSkillVersion.V1,
+                            description="Sentiment V1",
+                            include_opinion_mining=True)
+
+        s4 = SentimentSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                            outputs=[OutputFieldMappingEntry(name="confidenceScores", target_name="scoreS4")],
+                            skill_version=SentimentSkillVersion.V3,
+                            description="Sentiment V3",
+                            include_opinion_mining=True)
+
+        s5 = EntityLinkingSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                outputs=[OutputFieldMappingEntry(name="entities", target_name="entitiesS5")],
+                                minimum_precision=0.5)
+
+        skillset = SearchIndexerSkillset(name=name, skills=list([s1, s2, s3, s4, s5]), description="desc")
         result = await client.create_skillset(skillset)
 
         assert isinstance(result, SearchIndexerSkillset)
-        assert result.name == name
+        assert result.name == "test-ss"
         assert result.description == "desc"
         assert result.e_tag
-        assert len(result.skills) == 2
+        assert len(result.skills) == 5
         assert isinstance(result.skills[0], EntityRecognitionSkill)
         assert result.skills[0].skill_version == EntityRecognitionSkillVersion.V1
         assert isinstance(result.skills[1], EntityRecognitionSkill)
         assert result.skills[1].skill_version == EntityRecognitionSkillVersion.V3
+        assert isinstance(result.skills[2], SentimentSkill)
+        assert result.skills[2].skill_version == SentimentSkillVersion.V1
+        assert isinstance(result.skills[3], SentimentSkill)
+        assert result.skills[3].skill_version == SentimentSkillVersion.V3
+        assert isinstance(result.skills[4], EntityLinkingSkill)
+        assert result.skills[4].minimum_precision == 0.5
 
         assert len(await client.get_skillsets()) == 1
 
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
index 453bd2e66243..beac00b106ed 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA349E40C66\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6871C89346\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:02 GMT
+      - Thu, 02 Sep 2021 23:21:51 GMT
       elapsed-time:
-      - '1665'
+      - '1433'
       etag:
-      - W/"0x8D96CA349E40C66"
+      - W/"0x8D96E6871C89346"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 65af3aa0-0a7f-11ec-9731-74c63bed1137
+      - 8ded272a-0c44-11ec-ac43-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -78,7 +78,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA349F8F7C5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6871DB3571\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:02 GMT
+      - Thu, 02 Sep 2021 23:21:51 GMT
       elapsed-time:
-      - '80'
+      - '46'
       etag:
-      - W/"0x8D96CA349F8F7C5"
+      - W/"0x8D96E6871DB3571"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 66d9146e-0a7f-11ec-b4bf-74c63bed1137
+      - 8ef2919c-0c44-11ec-a88c-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -124,7 +124,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA349F8F7C5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E6871DB3571\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:02 GMT
+      - Thu, 02 Sep 2021 23:21:51 GMT
       elapsed-time:
-      - '37'
+      - '139'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 66ed8172-0a7f-11ec-9b20-74c63bed1137
+      - 8f03c3cb-0c44-11ec-94e8-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -168,7 +168,7 @@ interactions:
     uri: https://searche2bf1c71.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA349F8F7C5\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searche2bf1c71.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6871DB3571\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -177,11 +177,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:02 GMT
+      - Thu, 02 Sep 2021 23:21:51 GMT
       elapsed-time:
-      - '34'
+      - '13'
       etag:
-      - W/"0x8D96CA349F8F7C5"
+      - W/"0x8D96E6871DB3571"
       expires:
       - '-1'
       odata-version:
@@ -191,7 +191,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 66fa9d72-0a7f-11ec-a9b7-74c63bed1137
+      - 8f22fc82-0c44-11ec-8c37-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
index ab540b9cb082..13b7ebb493f8 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_if_unchanged.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://search792321ab.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA3568D93AC\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E687D620A16\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:23 GMT
+      - Thu, 02 Sep 2021 23:22:10 GMT
       elapsed-time:
-      - '2813'
+      - '1575'
       etag:
-      - W/"0x8D96CA3568D93AC"
+      - W/"0x8D96E687D620A16"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 71ac8439-0a7f-11ec-ab9c-74c63bed1137
+      - 9973fe7a-0c44-11ec-88b9-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -78,7 +78,7 @@ interactions:
     uri: https://search792321ab.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA356A082DE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E687D79414B\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:23 GMT
+      - Thu, 02 Sep 2021 23:22:10 GMT
       elapsed-time:
-      - '66'
+      - '55'
       etag:
-      - W/"0x8D96CA356A082DE"
+      - W/"0x8D96E687D79414B"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 738339b9-0a7f-11ec-b768-74c63bed1137
+      - 9a8fb59e-0c44-11ec-b124-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -124,7 +124,7 @@ interactions:
     uri: https://search792321ab.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA356A082DE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search792321ab.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E687D79414B\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:23 GMT
+      - Thu, 02 Sep 2021 23:22:10 GMT
       elapsed-time:
-      - '40'
+      - '38'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 73950f5b-0a7f-11ec-8ee0-74c63bed1137
+      - 9aa208dc-0c44-11ec-90cd-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
index defc543f4930..ac139c653307 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_or_update_skillset_inplace.yaml
@@ -23,7 +23,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA35EF783A5\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6887F54272\"","name":"test-ss","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -32,11 +32,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:37 GMT
+      - Thu, 02 Sep 2021 23:22:28 GMT
       elapsed-time:
-      - '49'
+      - '1212'
       etag:
-      - W/"0x8D96CA35EF783A5"
+      - W/"0x8D96E6887F54272"
       expires:
       - '-1'
       location:
@@ -48,7 +48,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7bbee75a-0a7f-11ec-bbae-74c63bed1137
+      - a4424b77-0c44-11ec-881a-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -78,7 +78,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA35F0A99EE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6888074840\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -87,11 +87,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:37 GMT
+      - Thu, 02 Sep 2021 23:22:28 GMT
       elapsed-time:
-      - '72'
+      - '47'
       etag:
-      - W/"0x8D96CA35F0A99EE"
+      - W/"0x8D96E6888074840"
       expires:
       - '-1'
       odata-version:
@@ -101,7 +101,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7bec0608-0a7f-11ec-8ed0-74c63bed1137
+      - a51fabef-0c44-11ec-b060-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -124,7 +124,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA35F0A99EE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E6888074840\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -133,9 +133,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:37 GMT
+      - Thu, 02 Sep 2021 23:22:28 GMT
       elapsed-time:
-      - '17'
+      - '36'
       expires:
       - '-1'
       odata-version:
@@ -145,7 +145,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7bff13d8-0a7f-11ec-9902-74c63bed1137
+      - a52fad4e-0c44-11ec-b35f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -168,7 +168,7 @@ interactions:
     uri: https://searchd4ef1fac.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA35F0A99EE\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd4ef1fac.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6888074840\"","name":"test-ss","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -177,11 +177,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:37 GMT
+      - Thu, 02 Sep 2021 23:22:28 GMT
       elapsed-time:
-      - '32'
+      - '11'
       etag:
-      - W/"0x8D96CA35F0A99EE"
+      - W/"0x8D96E6888074840"
       expires:
       - '-1'
       odata-version:
@@ -191,7 +191,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 7c0f1527-0a7f-11ec-a32d-74c63bed1137
+      - a53c5426-0c44-11ec-bf70-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
index c3917a8bcf88..ebb45a75662b 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_create_skillset.yaml
@@ -1,10 +1,66 @@
 interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json;odata.metadata=minimal
+      Accept-Encoding:
+      - gzip, deflate
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      User-Agent:
+      - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
+    method: DELETE
+    uri: https://searchd998184f.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
+  response:
+    body:
+      string: '{"error":{"code":"","message":"No skillset with the name ''test-ss''
+        was found in a service named ''searchd998184f''."}}'
+    headers:
+      cache-control:
+      - no-cache
+      content-language:
+      - en
+      content-length:
+      - '116'
+      content-type:
+      - application/json; odata.metadata=minimal
+      date:
+      - Thu, 02 Sep 2021 23:22:43 GMT
+      elapsed-time:
+      - '38'
+      expires:
+      - '-1'
+      odata-version:
+      - '4.0'
+      pragma:
+      - no-cache
+      preference-applied:
+      - odata.include-annotations="*"
+      request-id:
+      - adcd5521-0c44-11ec-99c1-74c63bed1137
+      strict-transport-security:
+      - max-age=15724800; includeSubDomains
+    status:
+      code: 404
+      message: Not Found
 - request:
     body: '{"name": "test-ss", "description": "desc", "skills": [{"@odata.type": "#Microsoft.Skills.Text.EntityRecognitionSkill",
-      "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
-      "organizations", "targetName": "organizationsV1"}]}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityRecognitionSkill",
-      "inputs": [{"name": "text", "source": "/document/content"}], "outputs": [{"name":
-      "organizations", "targetName": "organizationsV3"}]}]}'
+      "description": "Skill Version 1", "inputs": [{"name": "text", "source": "/document/content"}],
+      "outputs": [{"name": "organizations", "targetName": "organizationsS1"}], "includeTypelessEntities":
+      true}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityRecognitionSkill", "description":
+      "Skill Version 3", "inputs": [{"name": "text", "source": "/document/content"}],
+      "outputs": [{"name": "organizations", "targetName": "organizationsS2"}], "modelVersion":
+      "3"}, {"@odata.type": "#Microsoft.Skills.Text.SentimentSkill", "description":
+      "Sentiment V1", "inputs": [{"name": "text", "source": "/document/content"}],
+      "outputs": [{"name": "score", "targetName": "scoreS3"}]}, {"@odata.type": "#Microsoft.Skills.Text.V3.SentimentSkill",
+      "description": "Sentiment V3", "inputs": [{"name": "text", "source": "/document/content"}],
+      "outputs": [{"name": "confidenceScores", "targetName": "scoreS4"}], "includeOpinionMining":
+      true}, {"@odata.type": "#Microsoft.Skills.Text.V3.EntityLinkingSkill", "inputs":
+      [{"name": "text", "source": "/document/content"}], "outputs": [{"name": "entities",
+      "targetName": "entitiesS5"}], "minimumPrecision": 0.5}]}'
     headers:
       Accept:
       - application/json;odata.metadata=minimal
@@ -13,7 +69,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '457'
+      - '1251'
       Content-Type:
       - application/json
       User-Agent:
@@ -22,20 +78,24 @@ interactions:
     uri: https://searchd998184f.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA367D69224\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6890F19808\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":"Skill
+        Version 1","context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":null,"description":"Skill
+        Version 3","context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"modelVersion":"3","inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS2"}]},{"@odata.type":"#Microsoft.Skills.Text.SentimentSkill","name":null,"description":"Sentiment
+        V1","context":null,"defaultLanguageCode":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"score","targetName":"scoreS3"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.SentimentSkill","name":null,"description":"Sentiment
+        V3","context":null,"defaultLanguageCode":null,"modelVersion":null,"includeOpinionMining":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"confidenceScores","targetName":"scoreS4"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityLinkingSkill","name":null,"description":null,"context":null,"defaultLanguageCode":null,"minimumPrecision":0.5,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"entities","targetName":"entitiesS5"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '967'
+      - '1940'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:52 GMT
+      - Thu, 02 Sep 2021 23:22:43 GMT
       elapsed-time:
-      - '81'
+      - '104'
       etag:
-      - W/"0x8D96CA367D69224"
+      - W/"0x8D96E6890F19808"
       expires:
       - '-1'
       location:
@@ -47,7 +107,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 849c3bdd-0a7f-11ec-95d9-74c63bed1137
+      - ae01135c-0c44-11ec-9160-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -68,19 +128,23 @@ interactions:
     uri: https://searchd998184f.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA367D69224\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":null,"context":"/document","categories":["Product","Phone
-        Number","Person","Quantity","IP Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsV3"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd998184f.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E6890F19808\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":"Skill
+        Version 1","context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS1"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityRecognitionSkill","name":"#2","description":"Skill
+        Version 3","context":"/document","categories":["Product","Phone Number","Person","Quantity","IP
+        Address","Organization","URL","Email","Event","Skill","Location","PersonType","Address","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"modelVersion":"3","inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizationsS2"}]},{"@odata.type":"#Microsoft.Skills.Text.SentimentSkill","name":"#3","description":"Sentiment
+        V1","context":"/document","defaultLanguageCode":"en","inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"score","targetName":"scoreS3"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.SentimentSkill","name":"#4","description":"Sentiment
+        V3","context":"/document","defaultLanguageCode":"en","modelVersion":null,"includeOpinionMining":true,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"confidenceScores","targetName":"scoreS4"}]},{"@odata.type":"#Microsoft.Skills.Text.V3.EntityLinkingSkill","name":"#5","description":null,"context":"/document","defaultLanguageCode":"en","minimumPrecision":0.5,"modelVersion":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"entities","targetName":"entitiesS5"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '1202'
+      - '2196'
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:18:52 GMT
+      - Thu, 02 Sep 2021 23:22:43 GMT
       elapsed-time:
-      - '23'
+      - '40'
       expires:
       - '-1'
       odata-version:
@@ -90,7 +154,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 84cb7cd0-0a7f-11ec-97f8-74c63bed1137
+      - ae1b2686-0c44-11ec-b21b-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
index 6bc396a42ff1..2938135169a2 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA37075F29B\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E6899DB4B6E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:07 GMT
+      - Thu, 02 Sep 2021 23:22:57 GMT
       elapsed-time:
-      - '57'
+      - '40'
       etag:
-      - W/"0x8D96CA37075F29B"
+      - W/"0x8D96E6899DB4B6E"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8d472f1c-0a7f-11ec-acfa-74c63bed1137
+      - b6c2e706-0c44-11ec-b97f-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://searchd97c184e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA37075F29B\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchd97c184e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E6899DB4B6E\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,7 +75,7 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:07 GMT
+      - Thu, 02 Sep 2021 23:22:57 GMT
       elapsed-time:
       - '17'
       expires:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8d6a8c54-0a7f-11ec-b495-74c63bed1137
+      - b704089c-0c44-11ec-8ba2-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -117,15 +117,15 @@ interactions:
       cache-control:
       - no-cache
       date:
-      - Tue, 31 Aug 2021 17:19:07 GMT
+      - Thu, 02 Sep 2021 23:22:57 GMT
       elapsed-time:
-      - '34'
+      - '25'
       expires:
       - '-1'
       pragma:
       - no-cache
       request-id:
-      - 8d73ffb3-0a7f-11ec-be49-74c63bed1137
+      - b710b746-0c44-11ec-83f1-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -155,9 +155,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:07 GMT
+      - Thu, 02 Sep 2021 23:22:58 GMT
       elapsed-time:
-      - '7'
+      - '6'
       expires:
       - '-1'
       odata-version:
@@ -167,7 +167,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 8d807f8f-0a7f-11ec-af36-74c63bed1137
+      - b71bb2dd-0c44-11ec-b98e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
index 1264fae6c771..7bfa6376fc3d 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_delete_skillset_if_unchanged.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search3a191d88.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA379232466\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68A28D3F51\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:21 GMT
+      - Thu, 02 Sep 2021 23:23:12 GMT
       elapsed-time:
-      - '1227'
+      - '85'
       etag:
-      - W/"0x8D96CA379232466"
+      - W/"0x8D96E68A28D3F51"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 95417ec7-0a7f-11ec-b55a-74c63bed1137
+      - bf84a894-0c44-11ec-a6bb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -75,7 +75,7 @@ interactions:
     uri: https://search3a191d88.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA37931A5F6\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search3a191d88.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68A29C3723\"","name":"test-ss","description":"updated","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -84,11 +84,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:21 GMT
+      - Thu, 02 Sep 2021 23:23:12 GMT
       elapsed-time:
-      - '43'
+      - '51'
       etag:
-      - W/"0x8D96CA37931A5F6"
+      - W/"0x8D96E68A29C3723"
       expires:
       - '-1'
       odata-version:
@@ -98,7 +98,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9617d091-0a7f-11ec-86d3-74c63bed1137
+      - bfb5a199-0c44-11ec-9ff5-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -118,7 +118,7 @@ interactions:
       Content-Length:
       - '0'
       If-Match:
-      - '"0x8D96CA379232466"'
+      - '"0x8D96E68A28D3F51"'
       User-Agent:
       - azsdk-python-search-documents/11.3.0b3 Python/3.9.2 (Windows-10-10.0.19041-SP0)
     method: DELETE
@@ -138,9 +138,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:21 GMT
+      - Thu, 02 Sep 2021 23:23:12 GMT
       elapsed-time:
-      - '8'
+      - '13'
       expires:
       - '-1'
       odata-version:
@@ -150,7 +150,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 96262495-0a7f-11ec-97b1-74c63bed1137
+      - bfc58d8e-0c44-11ec-b48e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
index 314acdd553f6..c772ef5316ed 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillset.yaml
@@ -20,7 +20,7 @@ interactions:
     uri: https://search9274171b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA38131EB76\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68AB8A58B0\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -29,11 +29,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:34 GMT
+      - Thu, 02 Sep 2021 23:23:27 GMT
       elapsed-time:
-      - '73'
+      - '66'
       etag:
-      - W/"0x8D96CA38131EB76"
+      - W/"0x8D96E68AB8A58B0"
       expires:
       - '-1'
       location:
@@ -45,7 +45,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9dfb10f3-0a7f-11ec-a0df-74c63bed1137
+      - c8807327-0c44-11ec-8f54-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -66,7 +66,7 @@ interactions:
     uri: https://search9274171b.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA38131EB76\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E68AB8A58B0\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -75,9 +75,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:34 GMT
+      - Thu, 02 Sep 2021 23:23:27 GMT
       elapsed-time:
-      - '20'
+      - '16'
       expires:
       - '-1'
       odata-version:
@@ -87,7 +87,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9e2c7452-0a7f-11ec-be87-74c63bed1137
+      - c8b283be-0c44-11ec-a75e-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
@@ -110,7 +110,7 @@ interactions:
     uri: https://search9274171b.search.windows.net/skillsets('test-ss')?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA38131EB76\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://search9274171b.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68AB8A58B0\"","name":"test-ss","description":"desc","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -119,11 +119,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:34 GMT
+      - Thu, 02 Sep 2021 23:23:27 GMT
       elapsed-time:
-      - '33'
+      - '10'
       etag:
-      - W/"0x8D96CA38131EB76"
+      - W/"0x8D96E68AB8A58B0"
       expires:
       - '-1'
       odata-version:
@@ -133,7 +133,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - 9e3635c2-0a7f-11ec-a186-74c63bed1137
+      - c8bbb142-0c44-11ec-bccc-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
index 3026b9fcb139..68bbda1f01c7 100644
--- a/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
+++ b/sdk/search/azure-search-documents/tests/recordings/test_search_index_client_skillset_live.test_get_skillsets.yaml
@@ -21,7 +21,7 @@ interactions:
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA389B13C5C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68B42CDF74\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -30,11 +30,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:49 GMT
+      - Thu, 02 Sep 2021 23:23:42 GMT
       elapsed-time:
-      - '79'
+      - '51'
       etag:
-      - W/"0x8D96CA389B13C5C"
+      - W/"0x8D96E68B42CDF74"
       expires:
       - '-1'
       location:
@@ -46,7 +46,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a67e8ec1-0a7f-11ec-858c-74c63bed1137
+      - d12da940-0c44-11ec-8a11-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -74,7 +74,7 @@ interactions:
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96CA389C3B645\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets/$entity","@odata.etag":"\"0x8D96E68B43AC58E\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":null,"description":null,"context":null,"categories":[],"defaultLanguageCode":null,"minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}'
     headers:
       cache-control:
       - no-cache
@@ -83,11 +83,11 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:49 GMT
+      - Thu, 02 Sep 2021 23:23:42 GMT
       elapsed-time:
-      - '56'
+      - '46'
       etag:
-      - W/"0x8D96CA389C3B645"
+      - W/"0x8D96E68B43AC58E"
       expires:
       - '-1'
       location:
@@ -99,7 +99,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a6a847c6-0a7f-11ec-8ca5-74c63bed1137
+      - d1554d7a-0c44-11ec-9dfb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
     status:
@@ -120,7 +120,7 @@ interactions:
     uri: https://searchaa02178e.search.windows.net/skillsets?api-version=2021-04-30-Preview
   response:
     body:
-      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96CA389B13C5C\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96CA389C3B645\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
+      string: '{"@odata.context":"https://searchaa02178e.search.windows.net/$metadata#skillsets","value":[{"@odata.etag":"\"0x8D96E68B42CDF74\"","name":"test-ss-1","description":"desc1","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null},{"@odata.etag":"\"0x8D96E68B43AC58E\"","name":"test-ss-2","description":"desc2","skills":[{"@odata.type":"#Microsoft.Skills.Text.EntityRecognitionSkill","name":"#1","description":null,"context":"/document","categories":["Person","Quantity","Organization","URL","Email","Location","DateTime"],"defaultLanguageCode":"en","minimumPrecision":null,"includeTypelessEntities":null,"inputs":[{"name":"text","source":"/document/content","sourceContext":null,"inputs":[]}],"outputs":[{"name":"organizations","targetName":"organizations"}]}],"cognitiveServices":null,"knowledgeStore":null,"encryptionKey":null}]}'
     headers:
       cache-control:
       - no-cache
@@ -129,9 +129,9 @@ interactions:
       content-type:
       - application/json; odata.metadata=minimal
       date:
-      - Tue, 31 Aug 2021 17:19:49 GMT
+      - Thu, 02 Sep 2021 23:23:42 GMT
       elapsed-time:
-      - '43'
+      - '23'
       expires:
       - '-1'
       odata-version:
@@ -141,7 +141,7 @@ interactions:
       preference-applied:
       - odata.include-annotations="*"
       request-id:
-      - a6b87e13-0a7f-11ec-8a6c-74c63bed1137
+      - d163c491-0c44-11ec-8ccb-74c63bed1137
       strict-transport-security:
       - max-age=15724800; includeSubDomains
       vary:
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
index 61f5ca9e2afd..cd586a816deb 100644
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
+++ b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_live.py
@@ -16,11 +16,14 @@
 from azure.core.credentials import AzureKeyCredential
 from azure.core.exceptions import HttpResponseError
 from azure.search.documents.indexes.models import(
+    EntityLinkingSkill,
     EntityRecognitionSkill,
     EntityRecognitionSkillVersion,
     InputFieldMappingEntry,
     OutputFieldMappingEntry,
     SearchIndexerSkillset,
+    SentimentSkill,
+    SentimentSkillVersion
 )
 from azure.search.documents.indexes import SearchIndexerClient
 
@@ -42,25 +45,57 @@ def test_create_skillset(self, api_key, endpoint, index_name, **kwargs):
         name = "test-ss"
 
         s1 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")])
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsS1")],
+                                    description="Skill Version 1",
+                                    model_version="1",
+                                    include_typeless_entities=True)
 
         s2 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV3")],
-                                    skill_version=EntityRecognitionSkillVersion.V3)
-
-        skillset = SearchIndexerSkillset(name=name, skills=list([s1, s2]), description="desc")
+                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsS2")],
+                                    skill_version=EntityRecognitionSkillVersion.LATEST,
+                                    description="Skill Version 3",
+                                    model_version="3",
+                                    include_typeless_entities=True)
+        s3 = SentimentSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                            outputs=[OutputFieldMappingEntry(name="score", target_name="scoreS3")],
+                            skill_version=SentimentSkillVersion.V1,
+                            description="Sentiment V1",
+                            include_opinion_mining=True)
+
+        s4 = SentimentSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                            outputs=[OutputFieldMappingEntry(name="confidenceScores", target_name="scoreS4")],
+                            skill_version=SentimentSkillVersion.V3,
+                            description="Sentiment V3",
+                            include_opinion_mining=True)
+
+        s5 = EntityLinkingSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
+                                outputs=[OutputFieldMappingEntry(name="entities", target_name="entitiesS5")],
+                                minimum_precision=0.5)
+
+        skillset = SearchIndexerSkillset(name=name, skills=list([s1, s2, s3, s4, s5]), description="desc")
+
+        client.delete_skillset(name) 
+
+        dict_skills = [skill.as_dict() for skill in skillset.skills]
+        skillset.skills = dict_skills
 
         result = client.create_skillset(skillset)
 
         assert isinstance(result, SearchIndexerSkillset)
-        assert result.name == name
+        assert result.name == "test-ss"
         assert result.description == "desc"
         assert result.e_tag
-        assert len(result.skills) == 2
+        assert len(result.skills) == 5
         assert isinstance(result.skills[0], EntityRecognitionSkill)
         assert result.skills[0].skill_version == EntityRecognitionSkillVersion.V1
         assert isinstance(result.skills[1], EntityRecognitionSkill)
         assert result.skills[1].skill_version == EntityRecognitionSkillVersion.V3
+        assert isinstance(result.skills[2], SentimentSkill)
+        assert result.skills[2].skill_version == SentimentSkillVersion.V1
+        assert isinstance(result.skills[3], SentimentSkill)
+        assert result.skills[3].skill_version == SentimentSkillVersion.V3
+        assert isinstance(result.skills[4], EntityLinkingSkill)
+        assert result.skills[4].minimum_precision == 0.5
 
         assert len(client.get_skillsets()) == 1
 
diff --git a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py b/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py
deleted file mode 100644
index 3eb6f91ebdd5..000000000000
--- a/sdk/search/azure-search-documents/tests/test_search_index_client_skillset_validation.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-
-import pytest
-
-from azure.search.documents.indexes.models import(
-    EntityRecognitionSkill,
-    EntityRecognitionSkillVersion,
-    SentimentSkill,
-    InputFieldMappingEntry,
-    OutputFieldMappingEntry,
-)
-
-
-def test_entity_recogntion_skill_validation():
-    with pytest.raises(ValueError) as err:
-        s1 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")],
-                                    model_version="1")
-    assert 'model_version' in str(err)
-
-    with pytest.raises(ValueError) as err:
-        s2 = EntityRecognitionSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                                    outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV3")],
-                                    skill_version=EntityRecognitionSkillVersion.V3,
-                                    include_typeless_entities=True)
-    assert 'include_typeless_entities' in str(err)
-
-
-def test_sentiment_skill_validation():
-    with pytest.raises(ValueError) as err:
-        skill = SentimentSkill(inputs=[InputFieldMappingEntry(name="text", source="/document/content")],
-                               outputs=[OutputFieldMappingEntry(name="organizations", target_name="organizationsV1")],
-                               include_opinion_mining=True,
-                               model_version="1")
-    assert 'model_version' in str(err)
-    assert 'include_opinion_mining' in str(err)

From b147a1862d45acffb018bb0bbca2d8b5ddf51a46 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Fri, 3 Sep 2021 10:25:22 -0700
Subject: [PATCH 15/17] Change :param annotations to :ivar for custom models.

---
 .../search/documents/indexes/models/_index.py |  98 ++++++-------
 .../documents/indexes/models/_models.py       | 132 +++++++++---------
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
index e249bf141f2f..04571820133a 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
@@ -31,26 +31,26 @@ class SearchField(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the field, which must be unique within the fields collection
+    :ivar name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :param type: Required. The data type of the field. Possible values include: "Edm.String",
+    :ivar type: Required. The data type of the field. Possible values include: "Edm.String",
      "Edm.Int32", "Edm.Int64", "Edm.Double", "Edm.Boolean", "Edm.DateTimeOffset",
      "Edm.GeographyPoint", "Edm.ComplexType".
     :type type: str or ~azure.search.documents.indexes.models.SearchFieldDataType
-    :param key: A value indicating whether the field uniquely identifies documents in the index.
+    :ivar key: A value indicating whether the field uniquely identifies documents in the index.
      Exactly one top-level field in each index must be chosen as the key field and it must be of
      type Edm.String. Key fields can be used to look up documents directly and update or delete
      specific documents. Default is false for simple fields and null for complex fields.
     :type key: bool
-    :param hidden: A value indicating whether the field can be returned in a search result.
+    :ivar hidden: A value indicating whether the field can be returned in a search result.
      You can enable this option if you want to use a field (for example, margin) as a filter,
      sorting, or scoring mechanism but do not want the field to be visible to the end user. This
      property must be False for key fields, and it must be null for complex fields. This property can
      be changed on existing fields. Enabling this property does not cause any increase in index
      storage requirements. Default is False for simple fields and null for complex fields.
     :type hidden: bool
-    :param searchable: A value indicating whether the field is full-text searchable. This means it
+    :ivar searchable: A value indicating whether the field is full-text searchable. This means it
      will undergo analysis such as word-breaking during indexing. If you set a searchable field to a
      value like "sunny day", internally it will be split into the individual tokens "sunny" and
      "day". This enables full-text searches for these terms. Fields of type Edm.String or
@@ -60,14 +60,14 @@ class SearchField(msrest.serialization.Model):
      tokenized version of the field value for full-text searches. If you want to save space in your
      index and you don't need a field to be included in searches, set searchable to false.
     :type searchable: bool
-    :param filterable: A value indicating whether to enable the field to be referenced in $filter
+    :ivar filterable: A value indicating whether to enable the field to be referenced in $filter
      queries. filterable differs from searchable in how strings are handled. Fields of type
      Edm.String or Collection(Edm.String) that are filterable do not undergo word-breaking, so
      comparisons are for exact matches only. For example, if you set such a field f to "sunny day",
      $filter=f eq 'sunny' will find no matches, but $filter=f eq 'sunny day' will. This property
      must be null for complex fields. Default is true for simple fields and null for complex fields.
     :type filterable: bool
-    :param sortable: A value indicating whether to enable the field to be referenced in $orderby
+    :ivar sortable: A value indicating whether to enable the field to be referenced in $orderby
      expressions. By default Azure Cognitive Search sorts results by score, but in many experiences
      users will want to sort by fields in the documents. A simple field can be sortable only if it
      is single-valued (it has a single value in the scope of the parent document). Simple collection
@@ -78,14 +78,14 @@ class SearchField(msrest.serialization.Model):
      sortable is true for single-valued simple fields, false for multi-valued simple fields, and
      null for complex fields.
     :type sortable: bool
-    :param facetable: A value indicating whether to enable the field to be referenced in facet
+    :ivar facetable: A value indicating whether to enable the field to be referenced in facet
      queries. Typically used in a presentation of search results that includes hit count by category
      (for example, search for digital cameras and see hits by brand, by megapixels, by price, and so
      on). This property must be null for complex fields. Fields of type Edm.GeographyPoint or
      Collection(Edm.GeographyPoint) cannot be facetable. Default is true for all other simple
      fields.
     :type facetable: bool
-    :param analyzer_name: The name of the analyzer to use for the field. This option can be used only
+    :ivar analyzer_name: The name of the analyzer to use for the field. This option can be used only
      with searchable fields and it can't be set together with either searchAnalyzer or
      indexAnalyzer. Once the analyzer is chosen, it cannot be changed for the field. Must be null
      for complex fields. Possible values include: "ar.microsoft", "ar.lucene", "hy.lucene",
@@ -106,7 +106,7 @@ class SearchField(msrest.serialization.Model):
      "vi.microsoft", "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern",
      "simple", "stop", "whitespace".
     :type analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :param search_analyzer_name: The name of the analyzer used at search time for the field. This option
+    :ivar search_analyzer_name: The name of the analyzer used at search time for the field. This option
      can be used only with searchable fields. It must be set together with indexAnalyzer and it
      cannot be set together with the analyzer option. This property cannot be set to the name of a
      language analyzer; use the analyzer property instead if you need a language analyzer. This
@@ -129,7 +129,7 @@ class SearchField(msrest.serialization.Model):
      "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern", "simple", "stop",
      "whitespace".
     :type search_analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :param index_analyzer_name: The name of the analyzer used at indexing time for the field. This
+    :ivar index_analyzer_name: The name of the analyzer used at indexing time for the field. This
      option can be used only with searchable fields. It must be set together with searchAnalyzer and
      it cannot be set together with the analyzer option.  This property cannot be set to the name of
      a language analyzer; use the analyzer property instead if you need a language analyzer. Once
@@ -152,18 +152,18 @@ class SearchField(msrest.serialization.Model):
      "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern", "simple", "stop",
      "whitespace".
     :type index_analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :param normalizer: The name of the normalizer to use for the field. This option can be used
+    :ivar normalizer: The name of the normalizer to use for the field. This option can be used
      only with fields with filterable, sortable, or facetable enabled. Once the normalizer is
      chosen, it cannot be changed for the field. Must be null for complex fields. Possible values
      include: "asciifolding", "elision", "lowercase", "standard", "uppercase".
     :type normalizer: str or ~azure.search.documents.indexes.models.LexicalNormalizerName
-    :param synonym_map_names: A list of the names of synonym maps to associate with this field. This
+    :ivar synonym_map_names: A list of the names of synonym maps to associate with this field. This
      option can be used only with searchable fields. Currently only one synonym map per field is
      supported. Assigning a synonym map to a field ensures that query terms targeting that field are
      expanded at query-time using the rules in the synonym map. This attribute can be changed on
      existing fields. Must be null or an empty collection for complex fields.
     :type synonym_map_names: list[str]
-    :param fields: A list of sub-fields if this is a field of type Edm.ComplexType or
+    :ivar fields: A list of sub-fields if this is a field of type Edm.ComplexType or
      Collection(Edm.ComplexType). Must be null or empty for simple fields.
     :type fields: list[~azure.search.documents.models.SearchField]
     """
@@ -268,34 +268,34 @@ def SimpleField(**kw):
     # type: (**Any) -> SearchField
     """Configure a simple field for an Azure Search Index
 
-    :param name: Required. The name of the field, which must be unique within the fields collection
+    :ivar name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :param type: Required. The data type of the field. Possible values include: SearchFieldDataType.String,
+    :ivar type: Required. The data type of the field. Possible values include: SearchFieldDataType.String,
      SearchFieldDataType.Int32, SearchFieldDataType.Int64, SearchFieldDataType.Double, SearchFieldDataType.Boolean,
      SearchFieldDataType.DateTimeOffset, SearchFieldDataType.GeographyPoint, SearchFieldDataType.ComplexType,
      from `azure.search.documents.SearchFieldDataType`.
      :type type: str
-    :param key: A value indicating whether the field uniquely identifies documents in the index.
+    :ivar key: A value indicating whether the field uniquely identifies documents in the index.
      Exactly one top-level field in each index must be chosen as the key field and it must be of
      type SearchFieldDataType.String. Key fields can be used to look up documents directly and
      update or delete specific documents. Default is False
     :type key: bool
-    :param hidden: A value indicating whether the field can be returned in a search result.
+    :ivar hidden: A value indicating whether the field can be returned in a search result.
      You can enable this option if you want to use a field (for example, margin) as a filter,
      sorting, or scoring mechanism but do not want the field to be visible to the end user. This
      property must be False for key fields. This property can be changed on existing fields.
      Enabling this property does not cause any increase in index storage requirements. Default is
      False.
     :type hidden: bool
-    :param filterable: A value indicating whether to enable the field to be referenced in $filter
+    :ivar filterable: A value indicating whether to enable the field to be referenced in $filter
      queries. filterable differs from searchable in how strings are handled. Fields of type
      SearchFieldDataType.String or Collection(SearchFieldDataType.String) that are filterable do
      not undergo word-breaking, so comparisons are for exact matches only. For example, if you
      set such a field f to "sunny day", $filter=f eq 'sunny' will find no matches, but
      $filter=f eq 'sunny day' will. This property must be null for complex fields. Default is False
     :type filterable: bool
-    :param sortable: A value indicating whether to enable the field to be referenced in $orderby
+    :ivar sortable: A value indicating whether to enable the field to be referenced in $orderby
      expressions. By default Azure Cognitive Search sorts results by score, but in many experiences
      users will want to sort by fields in the documents. A simple field can be sortable only if it
      is single-valued (it has a single value in the scope of the parent document). Simple collection
@@ -304,7 +304,7 @@ def SimpleField(**kw):
      an immediate parent field, or an ancestor field, that's the complex collection. The default is
      False.
     :type sortable: bool
-    :param facetable: A value indicating whether to enable the field to be referenced in facet
+    :ivar facetable: A value indicating whether to enable the field to be referenced in facet
      queries. Typically used in a presentation of search results that includes hit count by category
      (for example, search for digital cameras and see hits by brand, by megapixels, by price, and so
      on). Fields of type SearchFieldDataType.GeographyPoint or
@@ -325,24 +325,24 @@ def SearchableField(**kw):
     # type: (**Any) -> SearchField
     """Configure a searchable text field for an Azure Search Index
 
-    :param name: Required. The name of the field, which must be unique within the fields collection
+    :ivar name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :param collection: Whether this search field is a collection (default False)
+    :ivar collection: Whether this search field is a collection (default False)
     :type collection: bool
-    :param key: A value indicating whether the field uniquely identifies documents in the index.
+    :ivar key: A value indicating whether the field uniquely identifies documents in the index.
      Exactly one top-level field in each index must be chosen as the key field and it must be of
      type SearchFieldDataType.String. Key fields can be used to look up documents directly and update or delete
      specific documents. Default is False
     :type key: bool
-    :param hidden: A value indicating whether the field can be returned in a search result.
+    :ivar hidden: A value indicating whether the field can be returned in a search result.
      You can enable this option if you want to use a field (for example, margin) as a filter,
      sorting, or scoring mechanism but do not want the field to be visible to the end user. This
      property must be False for key fields. This property can be changed on existing fields.
      Enabling this property does not cause any increase in index storage requirements. Default is
      False.
     :type hidden: bool
-    :param searchable: A value indicating whether the field is full-text searchable. This means it
+    :ivar searchable: A value indicating whether the field is full-text searchable. This means it
      will undergo analysis such as word-breaking during indexing. If you set a searchable field to a
      value like "sunny day", internally it will be split into the individual tokens "sunny" and
      "day". This enables full-text searches for these terms. Note: searchable fields
@@ -351,22 +351,22 @@ def SearchableField(**kw):
      index and you don't need a field to be included in searches, set searchable to false. Default
      is True.
     :type searchable: bool
-    :param filterable: A value indicating whether to enable the field to be referenced in $filter
+    :ivar filterable: A value indicating whether to enable the field to be referenced in $filter
      queries. filterable differs from searchable in how strings are handled. Fields that are
      filterable do not undergo word-breaking, so comparisons are for exact matches only. For example,
      if you set such a field f to "sunny day", $filter=f eq 'sunny' will find no matches, but
      $filter=f eq 'sunny day' will. Default is False.
     :type filterable: bool
-    :param sortable: A value indicating whether to enable the field to be referenced in $orderby
+    :ivar sortable: A value indicating whether to enable the field to be referenced in $orderby
      expressions. By default Azure Cognitive Search sorts results by score, but in many experiences
      users will want to sort by fields in the documents.  The default is true False.
     :type sortable: bool
-    :param facetable: A value indicating whether to enable the field to be referenced in facet
+    :ivar facetable: A value indicating whether to enable the field to be referenced in facet
      queries. Typically used in a presentation of search results that includes hit count by category
      (for example, search for digital cameras and see hits by brand, by megapixels, by price, and so
      on). Default is False.
     :type facetable: bool
-    :param analyzer_name: The name of the analyzer to use for the field. This option can't be set together
+    :ivar analyzer_name: The name of the analyzer to use for the field. This option can't be set together
      with either searchAnalyzer or indexAnalyzer. Once the analyzer is chosen, it cannot be changed
      for the field. Possible values include: 'ar.microsoft', 'ar.lucene', 'hy.lucene',
      'bn.microsoft', 'eu.lucene', 'bg.microsoft', 'bg.lucene', 'ca.microsoft', 'ca.lucene', 'zh-
@@ -386,7 +386,7 @@ def SearchableField(**kw):
      'vi.microsoft', 'standard.lucene', 'standardasciifolding.lucene', 'keyword', 'pattern',
      'simple', 'stop', 'whitespace'.
     :type analyzer_name: str or ~azure.search.documents.indexes.models.AnalyzerName
-    :param search_analyzer_name: The name of the analyzer used at search time for the field. It must be
+    :ivar search_analyzer_name: The name of the analyzer used at search time for the field. It must be
      set together with indexAnalyzer and it cannot be set together with the analyzer option. This
      property cannot be set to the name of a language analyzer; use the analyzer property instead
      if you need a language analyzer. This analyzer can be updated on an existing field. Possible
@@ -409,7 +409,7 @@ def SearchableField(**kw):
      'standard.lucene', 'standardasciifolding.lucene', 'keyword', 'pattern', 'simple', 'stop',
      'whitespace'.
     :type search_analyzer_name: str or ~azure.search.documents.indexes.models.AnalyzerName
-    :param index_analyzer_name: The name of the analyzer used at indexing time for the field.
+    :ivar index_analyzer_name: The name of the analyzer used at indexing time for the field.
      It must be set together with searchAnalyzer and it cannot be set together with the analyzer
      option.  This property cannot be set to the name of a language analyzer; use the analyzer
      property instead if you need a language analyzer. Once the analyzer is chosen, it cannot be
@@ -432,7 +432,7 @@ def SearchableField(**kw):
      'standard.lucene', 'standardasciifolding.lucene', 'keyword', 'pattern', 'simple', 'stop',
      'whitespace'.
     :type index_analyzer_name: str or ~azure.search.documents.indexes.models.AnalyzerName
-    :param synonym_map_names: A list of the names of synonym maps to associate with this field. Currently
+    :ivar synonym_map_names: A list of the names of synonym maps to associate with this field. Currently
      only one synonym map per field is supported. Assigning a synonym map to a field ensures that
      query terms targeting that field are expanded at query-time using the rules in the synonym map.
      This attribute can be changed on existing fields.
@@ -463,13 +463,13 @@ def ComplexField(**kw):
     """Configure a Complex or Complex collection field for an Azure Search
     Index
 
-    :param name: Required. The name of the field, which must be unique within the fields collection
+    :ivar name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :param collection: Whether this complex field is a collection (default False)
+    :ivar collection: Whether this complex field is a collection (default False)
     :type collection: bool
     :type type: str or ~search_service_client.models.DataType
-    :param fields: A list of sub-fields
+    :ivar fields: A list of sub-fields
     :type fields: list[~search_service_client.models.Field]
 
     """
@@ -485,32 +485,32 @@ class SearchIndex(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the index.
+    :ivar name: Required. The name of the index.
     :type name: str
-    :param fields: Required. The fields of the index.
+    :ivar fields: Required. The fields of the index.
     :type fields: list[~azure.search.documents.indexes.models.SearchField]
-    :param scoring_profiles: The scoring profiles for the index.
+    :ivar scoring_profiles: The scoring profiles for the index.
     :type scoring_profiles: list[~azure.search.documents.indexes.models.ScoringProfile]
-    :param default_scoring_profile: The name of the scoring profile to use if none is specified in
+    :ivar default_scoring_profile: The name of the scoring profile to use if none is specified in
      the query. If this property is not set and no scoring profile is specified in the query, then
      default scoring (tf-idf) will be used.
     :type default_scoring_profile: str
-    :param cors_options: Options to control Cross-Origin Resource Sharing (CORS) for the index.
+    :ivar cors_options: Options to control Cross-Origin Resource Sharing (CORS) for the index.
     :type cors_options: ~azure.search.documents.indexes.models.CorsOptions
-    :param suggesters: The suggesters for the index.
+    :ivar suggesters: The suggesters for the index.
     :type suggesters: list[~azure.search.documents.indexes.models.SearchSuggester]
-    :param analyzers: The analyzers for the index.
+    :ivar analyzers: The analyzers for the index.
     :type analyzers: list[~azure.search.documents.indexes.models.LexicalAnalyzer]
-    :param tokenizers: The tokenizers for the index.
+    :ivar tokenizers: The tokenizers for the index.
     :type tokenizers: list[~azure.search.documents.indexes.models.LexicalTokenizer]
-    :param token_filters: The token filters for the index.
+    :ivar token_filters: The token filters for the index.
     :type token_filters: list[~azure.search.documents.indexes.models.TokenFilter]
-    :param char_filters: The character filters for the index.
+    :ivar char_filters: The character filters for the index.
     :type char_filters: list[~azure.search.documents.indexes.models.CharFilter]
-    :param normalizers: The normalizers for the index.
+    :ivar normalizers: The normalizers for the index.
     :type normalizers:
      list[~azure.search.documents.indexes.models.LexicalNormalizer]
-    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
+    :ivar encryption_key: A description of an encryption key that you create in Azure Key Vault.
      This key is used to provide an additional level of encryption-at-rest for your data when you
      want full assurance that no one, not even Microsoft, can decrypt your data in Azure Cognitive
      Search. Once you have encrypted your data, it will always remain encrypted. Azure Cognitive
@@ -519,7 +519,7 @@ class SearchIndex(msrest.serialization.Model):
      customer-managed keys is not available for free search services, and is only available for paid
      services created on or after January 1, 2019.
     :type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
-    :param similarity: The type of similarity algorithm to be used when scoring and ranking the
+    :ivar similarity: The type of similarity algorithm to be used when scoring and ranking the
      documents matching a search query. The similarity algorithm can only be defined at index
      creation time and cannot be modified on existing indexes. If null, the ClassicSimilarity
      algorithm is used.
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index 36d75590f017..b7e25e01bdfd 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -34,22 +34,22 @@ class SearchIndexerSkillset(_SearchIndexerSkillset):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the skillset.
+    :ivar name: Required. The name of the skillset.
     :type name: str
-    :param description: The description of the skillset.
+    :ivar description: The description of the skillset.
     :type description: str
-    :param skills: Required. A list of skills in the skillset.
+    :ivar skills: Required. A list of skills in the skillset.
     :type skills: list[~azure.search.documents.indexes.models.SearchIndexerSkill]
-    :param cognitive_services_account: Details about cognitive services to be used when running
+    :ivar cognitive_services_account: Details about cognitive services to be used when running
      skills.
     :type cognitive_services_account:
      ~azure.search.documents.indexes.models.CognitiveServicesAccount
-    :param knowledge_store: Definition of additional projections to azure blob, table, or files, of
+    :ivar knowledge_store: Definition of additional projections to azure blob, table, or files, of
      enriched data.
     :type knowledge_store: ~azure.search.documents.indexes.models.SearchIndexerKnowledgeStore
-    :param e_tag: The ETag of the skillset.
+    :ivar e_tag: The ETag of the skillset.
     :type e_tag: str
-    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
+    :ivar encryption_key: A description of an encryption key that you create in Azure Key Vault.
      This key is used to provide an additional level of encryption-at-rest for your skillset
      definition when you want full assurance that no one, not even Microsoft, can decrypt your
      skillset definition in Azure Cognitive Search. Once you have encrypted your skillset
@@ -118,46 +118,46 @@ class EntityRecognitionSkill(SearchIndexerSkill):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param odata_type: Required. Identifies the concrete type of the skill.Constant filled by
+    :ivar odata_type: Required. Identifies the concrete type of the skill.Constant filled by
      server.
     :type odata_type: str
-    :param name: The name of the skill which uniquely identifies it within the skillset. A skill
+    :ivar name: The name of the skill which uniquely identifies it within the skillset. A skill
      with no name defined will be given a default name of its 1-based index in the skills array,
      prefixed with the character '#'.
     :type name: str
-    :param description: The description of the skill which describes the inputs, outputs, and usage
+    :ivar description: The description of the skill which describes the inputs, outputs, and usage
      of the skill.
     :type description: str
-    :param context: Represents the level at which operations take place, such as the document root
+    :ivar context: Represents the level at which operations take place, such as the document root
      or document content (for example, /document or /document/content). The default is /document.
     :type context: str
-    :param inputs: Required. Inputs of the skills could be a column in the source data set, or the
+    :ivar inputs: Required. Inputs of the skills could be a column in the source data set, or the
      output of an upstream skill.
     :type inputs: list[~azure.search.documents.indexes.models.InputFieldMappingEntry]
-    :param outputs: Required. The output of a skill is either a field in a search index, or a value
+    :ivar outputs: Required. The output of a skill is either a field in a search index, or a value
      that can be consumed as an input by another skill.
     :type outputs: list[~azure.search.documents.indexes.models.OutputFieldMappingEntry]
-    :param categories: A list of entity categories that should be extracted.
+    :ivar categories: A list of entity categories that should be extracted.
     :type categories: list[str or ~azure.search.documents.indexes.models.EntityCategory]
-    :param default_language_code: A value indicating which language code to use. Default is en.
+    :ivar default_language_code: A value indicating which language code to use. Default is en.
      Possible values include: "ar", "cs", "zh-Hans", "zh-Hant", "da", "nl", "en", "fi", "fr", "de",
      "el", "hu", "it", "ja", "ko", "no", "pl", "pt-PT", "pt-BR", "ru", "es", "sv", "tr".
     :type default_language_code: str or
      ~azure.search.documents.indexes.models.EntityRecognitionSkillLanguage
-    :param include_typeless_entities: Determines whether or not to include entities which are well
+    :ivar include_typeless_entities: Determines whether or not to include entities which are well
      known but don't conform to a pre-defined type. If this configuration is not set (default), set
      to null or set to false, entities which don't conform to one of the pre-defined types will not
      be surfaced. Only valid for skill version 1.
     :type include_typeless_entities: bool
-    :param minimum_precision: A value between 0 and 1 that be used to only include entities whose
+    :ivar minimum_precision: A value between 0 and 1 that be used to only include entities whose
      confidence score is greater than the value specified. If not set (default), or if explicitly
      set to null, all entities will be included.
     :type minimum_precision: float
-    :param model_version: The version of the model to use when calling the Text Analytics service.
+    :ivar model_version: The version of the model to use when calling the Text Analytics service.
      It will default to the latest available when not specified. We recommend you do not specify
      this value unless absolutely necessary. Only valid from skill version 3.
     :type model_version: str
-    :param skill_version: The version of the skill to use when calling the Text Analytics service.
+    :ivar skill_version: The version of the skill to use when calling the Text Analytics service.
      It will default to V1 when not specified.
     :type skill_version: ~azure.search.documents.indexes.models.EntityRecognitionSkillVersion
     """
@@ -265,39 +265,39 @@ class SentimentSkill(SearchIndexerSkill):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param odata_type: Required. Identifies the concrete type of the skill.Constant filled by
+    :ivar odata_type: Required. Identifies the concrete type of the skill.Constant filled by
      server.
     :type odata_type: str
-    :param name: The name of the skill which uniquely identifies it within the skillset. A skill
+    :ivar name: The name of the skill which uniquely identifies it within the skillset. A skill
      with no name defined will be given a default name of its 1-based index in the skills array,
      prefixed with the character '#'.
     :type name: str
-    :param description: The description of the skill which describes the inputs, outputs, and usage
+    :ivar description: The description of the skill which describes the inputs, outputs, and usage
      of the skill.
     :type description: str
-    :param context: Represents the level at which operations take place, such as the document root
+    :ivar context: Represents the level at which operations take place, such as the document root
      or document content (for example, /document or /document/content). The default is /document.
     :type context: str
-    :param inputs: Required. Inputs of the skills could be a column in the source data set, or the
+    :ivar inputs: Required. Inputs of the skills could be a column in the source data set, or the
      output of an upstream skill.
     :type inputs: list[~azure.search.documents.indexes.models.InputFieldMappingEntry]
-    :param outputs: Required. The output of a skill is either a field in a search index, or a value
+    :ivar outputs: Required. The output of a skill is either a field in a search index, or a value
      that can be consumed as an input by another skill.
     :type outputs: list[~azure.search.documents.indexes.models.OutputFieldMappingEntry]
-    :param default_language_code: A value indicating which language code to use. Default is en.
+    :ivar default_language_code: A value indicating which language code to use. Default is en.
      Possible values include: "da", "nl", "en", "fi", "fr", "de", "el", "it", "no", "pl", "pt-PT",
      "ru", "es", "sv", "tr".
     :type default_language_code: str or
      ~azure.search.documents.indexes.models.SentimentSkillLanguage
-    :param include_opinion_mining: If set to true, the skill output will include information from
+    :ivar include_opinion_mining: If set to true, the skill output will include information from
      Text Analytics for opinion mining, namely targets (nouns or verbs) and their associated
      assessment (adjective) in the text. Default is false.
     :type include_opinion_mining: bool
-    :param model_version: The version of the model to use when calling the Text Analytics service.
+    :ivar model_version: The version of the model to use when calling the Text Analytics service.
      It will default to the latest available when not specified. We recommend you do not specify
      this value unless absolutely necessary.
     :type model_version: str
-    :param skill_version: The version of the skill to use when calling the Text Analytics service.
+    :ivar skill_version: The version of the skill to use when calling the Text Analytics service.
      It will default to V1 when not specified.
     :type skill_version: ~azure.search.documents.indexes.models.SentimentSkillVersion
     """
@@ -380,9 +380,9 @@ class AnalyzeTextOptions(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param text: Required. The text to break into tokens.
+    :ivar text: Required. The text to break into tokens.
     :type text: str
-    :param analyzer_name: The name of the analyzer to use to break the given text. If this parameter is
+    :ivar analyzer_name: The name of the analyzer to use to break the given text. If this parameter is
      not specified, you must specify a tokenizer instead. The tokenizer and analyzer parameters are
      mutually exclusive. Possible values include: "ar.microsoft", "ar.lucene", "hy.lucene",
      "bn.microsoft", "eu.lucene", "bg.microsoft", "bg.lucene", "ca.microsoft", "ca.lucene", "zh-
@@ -402,19 +402,19 @@ class AnalyzeTextOptions(msrest.serialization.Model):
      "vi.microsoft", "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern",
      "simple", "stop", "whitespace".
     :type analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :param tokenizer_name: The name of the tokenizer to use to break the given text. If this parameter
+    :ivar tokenizer_name: The name of the tokenizer to use to break the given text. If this parameter
      is not specified, you must specify an analyzer instead. The tokenizer and analyzer parameters
      are mutually exclusive. Possible values include: "classic", "edgeNGram", "keyword_v2",
      "letter", "lowercase", "microsoft_language_tokenizer", "microsoft_language_stemming_tokenizer",
      "nGram", "path_hierarchy_v2", "pattern", "standard_v2", "uax_url_email", "whitespace".
     :type tokenizer_name: str or ~azure.search.documents.indexes.models.LexicalTokenizerName
-    :param normalizer_name: The name of the normalizer to use to normalize the given text. Possible
+    :ivar normalizer_name: The name of the normalizer to use to normalize the given text. Possible
      values include: "asciifolding", "elision", "lowercase", "standard", "uppercase".
     :type normalizer_name: str or ~azure.search.documents.indexes.models.LexicalNormalizerName
-    :param token_filters: An optional list of token filters to use when breaking the given text.
+    :ivar token_filters: An optional list of token filters to use when breaking the given text.
      This parameter can only be set when using the tokenizer parameter.
     :type token_filters: list[str or ~azure.search.documents.indexes.models.TokenFilterName]
-    :param char_filters: An optional list of character filters to use when breaking the given text.
+    :ivar char_filters: An optional list of character filters to use when breaking the given text.
      This parameter can only be set when using the tokenizer parameter.
     :type char_filters: list[str]
     """
@@ -460,24 +460,24 @@ class CustomAnalyzer(LexicalAnalyzer):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param odata_type: Required. Identifies the concrete type of the analyzer.Constant filled by
+    :ivar odata_type: Required. Identifies the concrete type of the analyzer.Constant filled by
      server.
     :type odata_type: str
-    :param name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
+    :ivar name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
      dashes or underscores, can only start and end with alphanumeric characters, and is limited to
      128 characters.
     :type name: str
-    :param tokenizer_name: Required. The name of the tokenizer to use to divide continuous text into a
+    :ivar tokenizer_name: Required. The name of the tokenizer to use to divide continuous text into a
      sequence of tokens, such as breaking a sentence into words. Possible values include: "classic",
      "edgeNGram", "keyword_v2", "letter", "lowercase", "microsoft_language_tokenizer",
      "microsoft_language_stemming_tokenizer", "nGram", "path_hierarchy_v2", "pattern",
      "standard_v2", "uax_url_email", "whitespace".
     :type tokenizer_name: str or ~azure.search.documents.indexes.models.LexicalTokenizerName
-    :param token_filters: A list of token filters used to filter out or modify the tokens generated
+    :ivar token_filters: A list of token filters used to filter out or modify the tokens generated
      by a tokenizer. For example, you can specify a lowercase filter that converts all characters to
      lowercase. The filters are run in the order in which they are listed.
     :type token_filters: list[str or ~azure.search.documents.indexes.models.TokenFilterName]
-    :param char_filters: A list of character filters used to prepare input text before it is
+    :ivar char_filters: A list of character filters used to prepare input text before it is
      processed by the tokenizer. For instance, they can replace certain characters or symbols. The
      filters are run in the order in which they are listed.
     :type char_filters: list[str]
@@ -532,20 +532,20 @@ class PatternAnalyzer(LexicalAnalyzer):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
+    :ivar name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
      dashes or underscores, can only start and end with alphanumeric characters, and is limited to
      128 characters.
     :type name: str
-    :param lower_case_terms: A value indicating whether terms should be lower-cased. Default is
+    :ivar lower_case_terms: A value indicating whether terms should be lower-cased. Default is
      true.
     :type lower_case_terms: bool
-    :param pattern: A regular expression to match token separators. Default is an
+    :ivar pattern: A regular expression to match token separators. Default is an
      expression that matches one or more white space characters.
     :type pattern: str
-    :param flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
+    :ivar flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
      'CASE_INSENSITIVE', 'COMMENTS', 'DOTALL', 'LITERAL', 'MULTILINE', 'UNICODE_CASE', 'UNIX_LINES'.
     :type flags: list[str] or list[~search_service_client.models.RegexFlags]
-    :param stopwords: A list of stopwords.
+    :ivar stopwords: A list of stopwords.
     :type stopwords: list[str]
     """
 
@@ -604,17 +604,17 @@ class PatternTokenizer(LexicalTokenizer):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the tokenizer. It must only contain letters, digits, spaces,
+    :ivar name: Required. The name of the tokenizer. It must only contain letters, digits, spaces,
      dashes or underscores, can only start and end with alphanumeric characters, and is limited to
      128 characters.
     :type name: str
-    :param pattern: A regular expression to match token separators. Default is an
+    :ivar pattern: A regular expression to match token separators. Default is an
      expression that matches one or more white space characters.
     :type pattern: str
-    :param flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
+    :ivar flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
      'CASE_INSENSITIVE', 'COMMENTS', 'DOTALL', 'LITERAL', 'MULTILINE', 'UNICODE_CASE', 'UNIX_LINES'.
     :type flags: list[str] or list[~search_service_client.models.RegexFlags]
-    :param group: The zero-based ordinal of the matching group in the regular expression to
+    :ivar group: The zero-based ordinal of the matching group in the regular expression to
      extract into tokens. Use -1 if you want to use the entire pattern to split the input into
      tokens, irrespective of matching groups. Default is -1.
     :type group: int
@@ -671,21 +671,21 @@ class SearchResourceEncryptionKey(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param key_name: Required. The name of your Azure Key Vault key to be used to encrypt your data
+    :ivar key_name: Required. The name of your Azure Key Vault key to be used to encrypt your data
      at rest.
     :type key_name: str
-    :param key_version: Required. The version of your Azure Key Vault key to be used to encrypt
+    :ivar key_version: Required. The version of your Azure Key Vault key to be used to encrypt
      your data at rest.
     :type key_version: str
-    :param vault_uri: Required. The URI of your Azure Key Vault, also referred to as DNS name, that
+    :ivar vault_uri: Required. The URI of your Azure Key Vault, also referred to as DNS name, that
      contains the key to be used to encrypt your data at rest. An example URI might be https://my-
      keyvault-name.vault.azure.net.
     :type vault_uri: str
-    :param application_id: Required. An AAD Application ID that was granted the required access
+    :ivar application_id: Required. An AAD Application ID that was granted the required access
      permissions to the Azure Key Vault that is to be used when encrypting your data at rest. The
      Application ID should not be confused with the Object ID for your AAD Application.
     :type application_id: str
-    :param application_secret: The authentication key of the specified AAD application.
+    :ivar application_secret: The authentication key of the specified AAD application.
     :type application_secret: str
     """
 
@@ -756,15 +756,15 @@ class SynonymMap(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the synonym map.
+    :ivar name: Required. The name of the synonym map.
     :type name: str
     :ivar format: Required. The format of the synonym map. Only the 'solr' format is currently
      supported. Default value: "solr".
     :vartype format: str
-    :param synonyms: Required. A series of synonym rules in the specified synonym map format. The
+    :ivar synonyms: Required. A series of synonym rules in the specified synonym map format. The
      rules must be separated by newlines.
     :type synonyms: list[str]
-    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
+    :ivar encryption_key: A description of an encryption key that you create in Azure Key Vault.
      This key is used to provide an additional level of encryption-at-rest for your data when you
      want full assurance that no one, not even Microsoft, can decrypt your data in Azure Cognitive
      Search. Once you have encrypted your data, it will always remain encrypted. Azure Cognitive
@@ -773,7 +773,7 @@ class SynonymMap(msrest.serialization.Model):
      customer-managed keys is not available for free search services, and is only available for paid
      services created on or after January 1, 2019.
     :type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
-    :param e_tag: The ETag of the synonym map.
+    :ivar e_tag: The ETag of the synonym map.
     :type e_tag: str
     """
 
@@ -833,23 +833,23 @@ class SearchIndexerDataSourceConnection(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the datasource connection.
+    :ivar name: Required. The name of the datasource connection.
     :type name: str
-    :param description: The description of the datasource connection.
+    :ivar description: The description of the datasource connection.
     :type description: str
-    :param type: Required. The type of the datasource connection. Possible values include: "azuresql",
+    :ivar type: Required. The type of the datasource connection. Possible values include: "azuresql",
      "cosmosdb", "azureblob", "azuretable", "mysql", "adlsgen2".
     :type type: str or ~azure.search.documents.indexes.models.SearchIndexerDataSourceType
-    :param connection_string: The connection string for the datasource connection.
+    :ivar connection_string: The connection string for the datasource connection.
     :type connection_string: str
-    :param container: Required. The data container for the datasource connection.
+    :ivar container: Required. The data container for the datasource connection.
     :type container: ~azure.search.documents.indexes.models.SearchIndexerDataContainer
-    :param data_change_detection_policy: The data change detection policy for the datasource connection.
+    :ivar data_change_detection_policy: The data change detection policy for the datasource connection.
     :type data_change_detection_policy: ~azure.search.documents.models.DataChangeDetectionPolicy
-    :param data_deletion_detection_policy: The data deletion detection policy for the datasource connection.
+    :ivar data_deletion_detection_policy: The data deletion detection policy for the datasource connection.
     :type data_deletion_detection_policy:
      ~azure.search.documents.models.DataDeletionDetectionPolicy
-    :param e_tag: The ETag of the data source.
+    :ivar e_tag: The ETag of the data source.
     :type e_tag: str
     """
 

From 09a05818f734182f62198129c3a70ee8f67d624f Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Fri, 3 Sep 2021 10:33:54 -0700
Subject: [PATCH 16/17] Rename SearchField normalizer to normalizer_name.

---
 sdk/search/azure-search-documents/CHANGELOG.md       |  4 +++-
 .../azure/search/documents/indexes/models/_index.py  | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sdk/search/azure-search-documents/CHANGELOG.md b/sdk/search/azure-search-documents/CHANGELOG.md
index 0ba6eec9de3a..b0818bbf4981 100644
--- a/sdk/search/azure-search-documents/CHANGELOG.md
+++ b/sdk/search/azure-search-documents/CHANGELOG.md
@@ -21,9 +21,11 @@
 
 ### Breaking Changes
 
-- Removed models:
+- Removed:
   - `azure.search.documents.indexes.models.SentimentSkillV3`
   - `azure.search.documents.indexes.models.EntityRecognitionSkillV3`
+- Renamed:
+  - `SearchField.normalizer` renamed to `SearchField.normalizer_name`.
 
 ### Other Changes
 - `SentimentSkill` and `EntityRecognitionSkill` can now be created by specifying
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
index 04571820133a..f8baec42292c 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
@@ -152,11 +152,11 @@ class SearchField(msrest.serialization.Model):
      "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern", "simple", "stop",
      "whitespace".
     :type index_analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :ivar normalizer: The name of the normalizer to use for the field. This option can be used
+    :ivar normalizer_name: The name of the normalizer to use for the field. This option can be used
      only with fields with filterable, sortable, or facetable enabled. Once the normalizer is
      chosen, it cannot be changed for the field. Must be null for complex fields. Possible values
      include: "asciifolding", "elision", "lowercase", "standard", "uppercase".
-    :type normalizer: str or ~azure.search.documents.indexes.models.LexicalNormalizerName
+    :type normalizer_name: str or ~azure.search.documents.indexes.models.LexicalNormalizerName
     :ivar synonym_map_names: A list of the names of synonym maps to associate with this field. This
      option can be used only with searchable fields. Currently only one synonym map per field is
      supported. Assigning a synonym map to a field ensures that query terms targeting that field are
@@ -185,7 +185,7 @@ class SearchField(msrest.serialization.Model):
         "analyzer_name": {"key": "analyzerName", "type": "str"},
         "search_analyzer_name": {"key": "searchAnalyzerName", "type": "str"},
         "index_analyzer_name": {"key": "indexAnalyzerName", "type": "str"},
-        "normalizer": {"key": "normalizer", "type": "str"},
+        "normalizer_name": {"key": "normalizerName", "type": "str"},
         "synonym_map_names": {"key": "synonymMapNames", "type": "[str]"},
         "fields": {"key": "fields", "type": "[SearchField]"},
     }
@@ -203,7 +203,7 @@ def __init__(self, **kwargs):
         self.analyzer_name = kwargs.get("analyzer_name", None)
         self.search_analyzer_name = kwargs.get("search_analyzer_name", None)
         self.index_analyzer_name = kwargs.get("index_analyzer_name", None)
-        self.normalizer = kwargs.get("normalizer", None)
+        self.normalizer_name = kwargs.get("normalizer_name", None)
         self.synonym_map_names = kwargs.get("synonym_map_names", None)
         self.fields = kwargs.get("fields", None)
 
@@ -222,7 +222,7 @@ def _to_generated(self):
             analyzer=self.analyzer_name,
             search_analyzer=self.search_analyzer_name,
             index_analyzer=self.index_analyzer_name,
-            normalizer=self.normalizer,
+            normalizer=self.normalizer_name,
             synonym_maps=self.synonym_map_names,
             fields=fields,
         )
@@ -243,7 +243,7 @@ def _from_generated(cls, search_field):
             else None
         )
         try:
-            normalizer = search_field.normalizer
+            normalizer = search_field.normalizer_name
         except AttributeError:
             normalizer = None
         return cls(

From 71ed2d8c77c57bbc6decf87eeb07340d546fb234 Mon Sep 17 00:00:00 2001
From: Travis Prescott <travisj.prescott@gmail.com>
Date: Fri, 3 Sep 2021 10:50:08 -0700
Subject: [PATCH 17/17] Restore :param annotation for now.

---
 .../search/documents/indexes/models/_index.py |  98 ++++++-------
 .../documents/indexes/models/_models.py       | 132 +++++++++---------
 2 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
index f8baec42292c..c4bc1bbe1318 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_index.py
@@ -31,26 +31,26 @@ class SearchField(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the field, which must be unique within the fields collection
+    :param name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :ivar type: Required. The data type of the field. Possible values include: "Edm.String",
+    :param type: Required. The data type of the field. Possible values include: "Edm.String",
      "Edm.Int32", "Edm.Int64", "Edm.Double", "Edm.Boolean", "Edm.DateTimeOffset",
      "Edm.GeographyPoint", "Edm.ComplexType".
     :type type: str or ~azure.search.documents.indexes.models.SearchFieldDataType
-    :ivar key: A value indicating whether the field uniquely identifies documents in the index.
+    :param key: A value indicating whether the field uniquely identifies documents in the index.
      Exactly one top-level field in each index must be chosen as the key field and it must be of
      type Edm.String. Key fields can be used to look up documents directly and update or delete
      specific documents. Default is false for simple fields and null for complex fields.
     :type key: bool
-    :ivar hidden: A value indicating whether the field can be returned in a search result.
+    :param hidden: A value indicating whether the field can be returned in a search result.
      You can enable this option if you want to use a field (for example, margin) as a filter,
      sorting, or scoring mechanism but do not want the field to be visible to the end user. This
      property must be False for key fields, and it must be null for complex fields. This property can
      be changed on existing fields. Enabling this property does not cause any increase in index
      storage requirements. Default is False for simple fields and null for complex fields.
     :type hidden: bool
-    :ivar searchable: A value indicating whether the field is full-text searchable. This means it
+    :param searchable: A value indicating whether the field is full-text searchable. This means it
      will undergo analysis such as word-breaking during indexing. If you set a searchable field to a
      value like "sunny day", internally it will be split into the individual tokens "sunny" and
      "day". This enables full-text searches for these terms. Fields of type Edm.String or
@@ -60,14 +60,14 @@ class SearchField(msrest.serialization.Model):
      tokenized version of the field value for full-text searches. If you want to save space in your
      index and you don't need a field to be included in searches, set searchable to false.
     :type searchable: bool
-    :ivar filterable: A value indicating whether to enable the field to be referenced in $filter
+    :param filterable: A value indicating whether to enable the field to be referenced in $filter
      queries. filterable differs from searchable in how strings are handled. Fields of type
      Edm.String or Collection(Edm.String) that are filterable do not undergo word-breaking, so
      comparisons are for exact matches only. For example, if you set such a field f to "sunny day",
      $filter=f eq 'sunny' will find no matches, but $filter=f eq 'sunny day' will. This property
      must be null for complex fields. Default is true for simple fields and null for complex fields.
     :type filterable: bool
-    :ivar sortable: A value indicating whether to enable the field to be referenced in $orderby
+    :param sortable: A value indicating whether to enable the field to be referenced in $orderby
      expressions. By default Azure Cognitive Search sorts results by score, but in many experiences
      users will want to sort by fields in the documents. A simple field can be sortable only if it
      is single-valued (it has a single value in the scope of the parent document). Simple collection
@@ -78,14 +78,14 @@ class SearchField(msrest.serialization.Model):
      sortable is true for single-valued simple fields, false for multi-valued simple fields, and
      null for complex fields.
     :type sortable: bool
-    :ivar facetable: A value indicating whether to enable the field to be referenced in facet
+    :param facetable: A value indicating whether to enable the field to be referenced in facet
      queries. Typically used in a presentation of search results that includes hit count by category
      (for example, search for digital cameras and see hits by brand, by megapixels, by price, and so
      on). This property must be null for complex fields. Fields of type Edm.GeographyPoint or
      Collection(Edm.GeographyPoint) cannot be facetable. Default is true for all other simple
      fields.
     :type facetable: bool
-    :ivar analyzer_name: The name of the analyzer to use for the field. This option can be used only
+    :param analyzer_name: The name of the analyzer to use for the field. This option can be used only
      with searchable fields and it can't be set together with either searchAnalyzer or
      indexAnalyzer. Once the analyzer is chosen, it cannot be changed for the field. Must be null
      for complex fields. Possible values include: "ar.microsoft", "ar.lucene", "hy.lucene",
@@ -106,7 +106,7 @@ class SearchField(msrest.serialization.Model):
      "vi.microsoft", "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern",
      "simple", "stop", "whitespace".
     :type analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :ivar search_analyzer_name: The name of the analyzer used at search time for the field. This option
+    :param search_analyzer_name: The name of the analyzer used at search time for the field. This option
      can be used only with searchable fields. It must be set together with indexAnalyzer and it
      cannot be set together with the analyzer option. This property cannot be set to the name of a
      language analyzer; use the analyzer property instead if you need a language analyzer. This
@@ -129,7 +129,7 @@ class SearchField(msrest.serialization.Model):
      "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern", "simple", "stop",
      "whitespace".
     :type search_analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :ivar index_analyzer_name: The name of the analyzer used at indexing time for the field. This
+    :param index_analyzer_name: The name of the analyzer used at indexing time for the field. This
      option can be used only with searchable fields. It must be set together with searchAnalyzer and
      it cannot be set together with the analyzer option.  This property cannot be set to the name of
      a language analyzer; use the analyzer property instead if you need a language analyzer. Once
@@ -152,18 +152,18 @@ class SearchField(msrest.serialization.Model):
      "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern", "simple", "stop",
      "whitespace".
     :type index_analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :ivar normalizer_name: The name of the normalizer to use for the field. This option can be used
+    :param normalizer_name: The name of the normalizer to use for the field. This option can be used
      only with fields with filterable, sortable, or facetable enabled. Once the normalizer is
      chosen, it cannot be changed for the field. Must be null for complex fields. Possible values
      include: "asciifolding", "elision", "lowercase", "standard", "uppercase".
     :type normalizer_name: str or ~azure.search.documents.indexes.models.LexicalNormalizerName
-    :ivar synonym_map_names: A list of the names of synonym maps to associate with this field. This
+    :param synonym_map_names: A list of the names of synonym maps to associate with this field. This
      option can be used only with searchable fields. Currently only one synonym map per field is
      supported. Assigning a synonym map to a field ensures that query terms targeting that field are
      expanded at query-time using the rules in the synonym map. This attribute can be changed on
      existing fields. Must be null or an empty collection for complex fields.
     :type synonym_map_names: list[str]
-    :ivar fields: A list of sub-fields if this is a field of type Edm.ComplexType or
+    :param fields: A list of sub-fields if this is a field of type Edm.ComplexType or
      Collection(Edm.ComplexType). Must be null or empty for simple fields.
     :type fields: list[~azure.search.documents.models.SearchField]
     """
@@ -268,34 +268,34 @@ def SimpleField(**kw):
     # type: (**Any) -> SearchField
     """Configure a simple field for an Azure Search Index
 
-    :ivar name: Required. The name of the field, which must be unique within the fields collection
+    :param name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :ivar type: Required. The data type of the field. Possible values include: SearchFieldDataType.String,
+    :param type: Required. The data type of the field. Possible values include: SearchFieldDataType.String,
      SearchFieldDataType.Int32, SearchFieldDataType.Int64, SearchFieldDataType.Double, SearchFieldDataType.Boolean,
      SearchFieldDataType.DateTimeOffset, SearchFieldDataType.GeographyPoint, SearchFieldDataType.ComplexType,
      from `azure.search.documents.SearchFieldDataType`.
      :type type: str
-    :ivar key: A value indicating whether the field uniquely identifies documents in the index.
+    :param key: A value indicating whether the field uniquely identifies documents in the index.
      Exactly one top-level field in each index must be chosen as the key field and it must be of
      type SearchFieldDataType.String. Key fields can be used to look up documents directly and
      update or delete specific documents. Default is False
     :type key: bool
-    :ivar hidden: A value indicating whether the field can be returned in a search result.
+    :param hidden: A value indicating whether the field can be returned in a search result.
      You can enable this option if you want to use a field (for example, margin) as a filter,
      sorting, or scoring mechanism but do not want the field to be visible to the end user. This
      property must be False for key fields. This property can be changed on existing fields.
      Enabling this property does not cause any increase in index storage requirements. Default is
      False.
     :type hidden: bool
-    :ivar filterable: A value indicating whether to enable the field to be referenced in $filter
+    :param filterable: A value indicating whether to enable the field to be referenced in $filter
      queries. filterable differs from searchable in how strings are handled. Fields of type
      SearchFieldDataType.String or Collection(SearchFieldDataType.String) that are filterable do
      not undergo word-breaking, so comparisons are for exact matches only. For example, if you
      set such a field f to "sunny day", $filter=f eq 'sunny' will find no matches, but
      $filter=f eq 'sunny day' will. This property must be null for complex fields. Default is False
     :type filterable: bool
-    :ivar sortable: A value indicating whether to enable the field to be referenced in $orderby
+    :param sortable: A value indicating whether to enable the field to be referenced in $orderby
      expressions. By default Azure Cognitive Search sorts results by score, but in many experiences
      users will want to sort by fields in the documents. A simple field can be sortable only if it
      is single-valued (it has a single value in the scope of the parent document). Simple collection
@@ -304,7 +304,7 @@ def SimpleField(**kw):
      an immediate parent field, or an ancestor field, that's the complex collection. The default is
      False.
     :type sortable: bool
-    :ivar facetable: A value indicating whether to enable the field to be referenced in facet
+    :param facetable: A value indicating whether to enable the field to be referenced in facet
      queries. Typically used in a presentation of search results that includes hit count by category
      (for example, search for digital cameras and see hits by brand, by megapixels, by price, and so
      on). Fields of type SearchFieldDataType.GeographyPoint or
@@ -325,24 +325,24 @@ def SearchableField(**kw):
     # type: (**Any) -> SearchField
     """Configure a searchable text field for an Azure Search Index
 
-    :ivar name: Required. The name of the field, which must be unique within the fields collection
+    :param name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :ivar collection: Whether this search field is a collection (default False)
+    :param collection: Whether this search field is a collection (default False)
     :type collection: bool
-    :ivar key: A value indicating whether the field uniquely identifies documents in the index.
+    :param key: A value indicating whether the field uniquely identifies documents in the index.
      Exactly one top-level field in each index must be chosen as the key field and it must be of
      type SearchFieldDataType.String. Key fields can be used to look up documents directly and update or delete
      specific documents. Default is False
     :type key: bool
-    :ivar hidden: A value indicating whether the field can be returned in a search result.
+    :param hidden: A value indicating whether the field can be returned in a search result.
      You can enable this option if you want to use a field (for example, margin) as a filter,
      sorting, or scoring mechanism but do not want the field to be visible to the end user. This
      property must be False for key fields. This property can be changed on existing fields.
      Enabling this property does not cause any increase in index storage requirements. Default is
      False.
     :type hidden: bool
-    :ivar searchable: A value indicating whether the field is full-text searchable. This means it
+    :param searchable: A value indicating whether the field is full-text searchable. This means it
      will undergo analysis such as word-breaking during indexing. If you set a searchable field to a
      value like "sunny day", internally it will be split into the individual tokens "sunny" and
      "day". This enables full-text searches for these terms. Note: searchable fields
@@ -351,22 +351,22 @@ def SearchableField(**kw):
      index and you don't need a field to be included in searches, set searchable to false. Default
      is True.
     :type searchable: bool
-    :ivar filterable: A value indicating whether to enable the field to be referenced in $filter
+    :param filterable: A value indicating whether to enable the field to be referenced in $filter
      queries. filterable differs from searchable in how strings are handled. Fields that are
      filterable do not undergo word-breaking, so comparisons are for exact matches only. For example,
      if you set such a field f to "sunny day", $filter=f eq 'sunny' will find no matches, but
      $filter=f eq 'sunny day' will. Default is False.
     :type filterable: bool
-    :ivar sortable: A value indicating whether to enable the field to be referenced in $orderby
+    :param sortable: A value indicating whether to enable the field to be referenced in $orderby
      expressions. By default Azure Cognitive Search sorts results by score, but in many experiences
      users will want to sort by fields in the documents.  The default is true False.
     :type sortable: bool
-    :ivar facetable: A value indicating whether to enable the field to be referenced in facet
+    :param facetable: A value indicating whether to enable the field to be referenced in facet
      queries. Typically used in a presentation of search results that includes hit count by category
      (for example, search for digital cameras and see hits by brand, by megapixels, by price, and so
      on). Default is False.
     :type facetable: bool
-    :ivar analyzer_name: The name of the analyzer to use for the field. This option can't be set together
+    :param analyzer_name: The name of the analyzer to use for the field. This option can't be set together
      with either searchAnalyzer or indexAnalyzer. Once the analyzer is chosen, it cannot be changed
      for the field. Possible values include: 'ar.microsoft', 'ar.lucene', 'hy.lucene',
      'bn.microsoft', 'eu.lucene', 'bg.microsoft', 'bg.lucene', 'ca.microsoft', 'ca.lucene', 'zh-
@@ -386,7 +386,7 @@ def SearchableField(**kw):
      'vi.microsoft', 'standard.lucene', 'standardasciifolding.lucene', 'keyword', 'pattern',
      'simple', 'stop', 'whitespace'.
     :type analyzer_name: str or ~azure.search.documents.indexes.models.AnalyzerName
-    :ivar search_analyzer_name: The name of the analyzer used at search time for the field. It must be
+    :param search_analyzer_name: The name of the analyzer used at search time for the field. It must be
      set together with indexAnalyzer and it cannot be set together with the analyzer option. This
      property cannot be set to the name of a language analyzer; use the analyzer property instead
      if you need a language analyzer. This analyzer can be updated on an existing field. Possible
@@ -409,7 +409,7 @@ def SearchableField(**kw):
      'standard.lucene', 'standardasciifolding.lucene', 'keyword', 'pattern', 'simple', 'stop',
      'whitespace'.
     :type search_analyzer_name: str or ~azure.search.documents.indexes.models.AnalyzerName
-    :ivar index_analyzer_name: The name of the analyzer used at indexing time for the field.
+    :param index_analyzer_name: The name of the analyzer used at indexing time for the field.
      It must be set together with searchAnalyzer and it cannot be set together with the analyzer
      option.  This property cannot be set to the name of a language analyzer; use the analyzer
      property instead if you need a language analyzer. Once the analyzer is chosen, it cannot be
@@ -432,7 +432,7 @@ def SearchableField(**kw):
      'standard.lucene', 'standardasciifolding.lucene', 'keyword', 'pattern', 'simple', 'stop',
      'whitespace'.
     :type index_analyzer_name: str or ~azure.search.documents.indexes.models.AnalyzerName
-    :ivar synonym_map_names: A list of the names of synonym maps to associate with this field. Currently
+    :param synonym_map_names: A list of the names of synonym maps to associate with this field. Currently
      only one synonym map per field is supported. Assigning a synonym map to a field ensures that
      query terms targeting that field are expanded at query-time using the rules in the synonym map.
      This attribute can be changed on existing fields.
@@ -463,13 +463,13 @@ def ComplexField(**kw):
     """Configure a Complex or Complex collection field for an Azure Search
     Index
 
-    :ivar name: Required. The name of the field, which must be unique within the fields collection
+    :param name: Required. The name of the field, which must be unique within the fields collection
      of the index or parent field.
     :type name: str
-    :ivar collection: Whether this complex field is a collection (default False)
+    :param collection: Whether this complex field is a collection (default False)
     :type collection: bool
     :type type: str or ~search_service_client.models.DataType
-    :ivar fields: A list of sub-fields
+    :param fields: A list of sub-fields
     :type fields: list[~search_service_client.models.Field]
 
     """
@@ -485,32 +485,32 @@ class SearchIndex(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the index.
+    :param name: Required. The name of the index.
     :type name: str
-    :ivar fields: Required. The fields of the index.
+    :param fields: Required. The fields of the index.
     :type fields: list[~azure.search.documents.indexes.models.SearchField]
-    :ivar scoring_profiles: The scoring profiles for the index.
+    :param scoring_profiles: The scoring profiles for the index.
     :type scoring_profiles: list[~azure.search.documents.indexes.models.ScoringProfile]
-    :ivar default_scoring_profile: The name of the scoring profile to use if none is specified in
+    :param default_scoring_profile: The name of the scoring profile to use if none is specified in
      the query. If this property is not set and no scoring profile is specified in the query, then
      default scoring (tf-idf) will be used.
     :type default_scoring_profile: str
-    :ivar cors_options: Options to control Cross-Origin Resource Sharing (CORS) for the index.
+    :param cors_options: Options to control Cross-Origin Resource Sharing (CORS) for the index.
     :type cors_options: ~azure.search.documents.indexes.models.CorsOptions
-    :ivar suggesters: The suggesters for the index.
+    :param suggesters: The suggesters for the index.
     :type suggesters: list[~azure.search.documents.indexes.models.SearchSuggester]
-    :ivar analyzers: The analyzers for the index.
+    :param analyzers: The analyzers for the index.
     :type analyzers: list[~azure.search.documents.indexes.models.LexicalAnalyzer]
-    :ivar tokenizers: The tokenizers for the index.
+    :param tokenizers: The tokenizers for the index.
     :type tokenizers: list[~azure.search.documents.indexes.models.LexicalTokenizer]
-    :ivar token_filters: The token filters for the index.
+    :param token_filters: The token filters for the index.
     :type token_filters: list[~azure.search.documents.indexes.models.TokenFilter]
-    :ivar char_filters: The character filters for the index.
+    :param char_filters: The character filters for the index.
     :type char_filters: list[~azure.search.documents.indexes.models.CharFilter]
-    :ivar normalizers: The normalizers for the index.
+    :param normalizers: The normalizers for the index.
     :type normalizers:
      list[~azure.search.documents.indexes.models.LexicalNormalizer]
-    :ivar encryption_key: A description of an encryption key that you create in Azure Key Vault.
+    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
      This key is used to provide an additional level of encryption-at-rest for your data when you
      want full assurance that no one, not even Microsoft, can decrypt your data in Azure Cognitive
      Search. Once you have encrypted your data, it will always remain encrypted. Azure Cognitive
@@ -519,7 +519,7 @@ class SearchIndex(msrest.serialization.Model):
      customer-managed keys is not available for free search services, and is only available for paid
      services created on or after January 1, 2019.
     :type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
-    :ivar similarity: The type of similarity algorithm to be used when scoring and ranking the
+    :param similarity: The type of similarity algorithm to be used when scoring and ranking the
      documents matching a search query. The similarity algorithm can only be defined at index
      creation time and cannot be modified on existing indexes. If null, the ClassicSimilarity
      algorithm is used.
diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
index b7e25e01bdfd..36d75590f017 100644
--- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
+++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py
@@ -34,22 +34,22 @@ class SearchIndexerSkillset(_SearchIndexerSkillset):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the skillset.
+    :param name: Required. The name of the skillset.
     :type name: str
-    :ivar description: The description of the skillset.
+    :param description: The description of the skillset.
     :type description: str
-    :ivar skills: Required. A list of skills in the skillset.
+    :param skills: Required. A list of skills in the skillset.
     :type skills: list[~azure.search.documents.indexes.models.SearchIndexerSkill]
-    :ivar cognitive_services_account: Details about cognitive services to be used when running
+    :param cognitive_services_account: Details about cognitive services to be used when running
      skills.
     :type cognitive_services_account:
      ~azure.search.documents.indexes.models.CognitiveServicesAccount
-    :ivar knowledge_store: Definition of additional projections to azure blob, table, or files, of
+    :param knowledge_store: Definition of additional projections to azure blob, table, or files, of
      enriched data.
     :type knowledge_store: ~azure.search.documents.indexes.models.SearchIndexerKnowledgeStore
-    :ivar e_tag: The ETag of the skillset.
+    :param e_tag: The ETag of the skillset.
     :type e_tag: str
-    :ivar encryption_key: A description of an encryption key that you create in Azure Key Vault.
+    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
      This key is used to provide an additional level of encryption-at-rest for your skillset
      definition when you want full assurance that no one, not even Microsoft, can decrypt your
      skillset definition in Azure Cognitive Search. Once you have encrypted your skillset
@@ -118,46 +118,46 @@ class EntityRecognitionSkill(SearchIndexerSkill):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar odata_type: Required. Identifies the concrete type of the skill.Constant filled by
+    :param odata_type: Required. Identifies the concrete type of the skill.Constant filled by
      server.
     :type odata_type: str
-    :ivar name: The name of the skill which uniquely identifies it within the skillset. A skill
+    :param name: The name of the skill which uniquely identifies it within the skillset. A skill
      with no name defined will be given a default name of its 1-based index in the skills array,
      prefixed with the character '#'.
     :type name: str
-    :ivar description: The description of the skill which describes the inputs, outputs, and usage
+    :param description: The description of the skill which describes the inputs, outputs, and usage
      of the skill.
     :type description: str
-    :ivar context: Represents the level at which operations take place, such as the document root
+    :param context: Represents the level at which operations take place, such as the document root
      or document content (for example, /document or /document/content). The default is /document.
     :type context: str
-    :ivar inputs: Required. Inputs of the skills could be a column in the source data set, or the
+    :param inputs: Required. Inputs of the skills could be a column in the source data set, or the
      output of an upstream skill.
     :type inputs: list[~azure.search.documents.indexes.models.InputFieldMappingEntry]
-    :ivar outputs: Required. The output of a skill is either a field in a search index, or a value
+    :param outputs: Required. The output of a skill is either a field in a search index, or a value
      that can be consumed as an input by another skill.
     :type outputs: list[~azure.search.documents.indexes.models.OutputFieldMappingEntry]
-    :ivar categories: A list of entity categories that should be extracted.
+    :param categories: A list of entity categories that should be extracted.
     :type categories: list[str or ~azure.search.documents.indexes.models.EntityCategory]
-    :ivar default_language_code: A value indicating which language code to use. Default is en.
+    :param default_language_code: A value indicating which language code to use. Default is en.
      Possible values include: "ar", "cs", "zh-Hans", "zh-Hant", "da", "nl", "en", "fi", "fr", "de",
      "el", "hu", "it", "ja", "ko", "no", "pl", "pt-PT", "pt-BR", "ru", "es", "sv", "tr".
     :type default_language_code: str or
      ~azure.search.documents.indexes.models.EntityRecognitionSkillLanguage
-    :ivar include_typeless_entities: Determines whether or not to include entities which are well
+    :param include_typeless_entities: Determines whether or not to include entities which are well
      known but don't conform to a pre-defined type. If this configuration is not set (default), set
      to null or set to false, entities which don't conform to one of the pre-defined types will not
      be surfaced. Only valid for skill version 1.
     :type include_typeless_entities: bool
-    :ivar minimum_precision: A value between 0 and 1 that be used to only include entities whose
+    :param minimum_precision: A value between 0 and 1 that be used to only include entities whose
      confidence score is greater than the value specified. If not set (default), or if explicitly
      set to null, all entities will be included.
     :type minimum_precision: float
-    :ivar model_version: The version of the model to use when calling the Text Analytics service.
+    :param model_version: The version of the model to use when calling the Text Analytics service.
      It will default to the latest available when not specified. We recommend you do not specify
      this value unless absolutely necessary. Only valid from skill version 3.
     :type model_version: str
-    :ivar skill_version: The version of the skill to use when calling the Text Analytics service.
+    :param skill_version: The version of the skill to use when calling the Text Analytics service.
      It will default to V1 when not specified.
     :type skill_version: ~azure.search.documents.indexes.models.EntityRecognitionSkillVersion
     """
@@ -265,39 +265,39 @@ class SentimentSkill(SearchIndexerSkill):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar odata_type: Required. Identifies the concrete type of the skill.Constant filled by
+    :param odata_type: Required. Identifies the concrete type of the skill.Constant filled by
      server.
     :type odata_type: str
-    :ivar name: The name of the skill which uniquely identifies it within the skillset. A skill
+    :param name: The name of the skill which uniquely identifies it within the skillset. A skill
      with no name defined will be given a default name of its 1-based index in the skills array,
      prefixed with the character '#'.
     :type name: str
-    :ivar description: The description of the skill which describes the inputs, outputs, and usage
+    :param description: The description of the skill which describes the inputs, outputs, and usage
      of the skill.
     :type description: str
-    :ivar context: Represents the level at which operations take place, such as the document root
+    :param context: Represents the level at which operations take place, such as the document root
      or document content (for example, /document or /document/content). The default is /document.
     :type context: str
-    :ivar inputs: Required. Inputs of the skills could be a column in the source data set, or the
+    :param inputs: Required. Inputs of the skills could be a column in the source data set, or the
      output of an upstream skill.
     :type inputs: list[~azure.search.documents.indexes.models.InputFieldMappingEntry]
-    :ivar outputs: Required. The output of a skill is either a field in a search index, or a value
+    :param outputs: Required. The output of a skill is either a field in a search index, or a value
      that can be consumed as an input by another skill.
     :type outputs: list[~azure.search.documents.indexes.models.OutputFieldMappingEntry]
-    :ivar default_language_code: A value indicating which language code to use. Default is en.
+    :param default_language_code: A value indicating which language code to use. Default is en.
      Possible values include: "da", "nl", "en", "fi", "fr", "de", "el", "it", "no", "pl", "pt-PT",
      "ru", "es", "sv", "tr".
     :type default_language_code: str or
      ~azure.search.documents.indexes.models.SentimentSkillLanguage
-    :ivar include_opinion_mining: If set to true, the skill output will include information from
+    :param include_opinion_mining: If set to true, the skill output will include information from
      Text Analytics for opinion mining, namely targets (nouns or verbs) and their associated
      assessment (adjective) in the text. Default is false.
     :type include_opinion_mining: bool
-    :ivar model_version: The version of the model to use when calling the Text Analytics service.
+    :param model_version: The version of the model to use when calling the Text Analytics service.
      It will default to the latest available when not specified. We recommend you do not specify
      this value unless absolutely necessary.
     :type model_version: str
-    :ivar skill_version: The version of the skill to use when calling the Text Analytics service.
+    :param skill_version: The version of the skill to use when calling the Text Analytics service.
      It will default to V1 when not specified.
     :type skill_version: ~azure.search.documents.indexes.models.SentimentSkillVersion
     """
@@ -380,9 +380,9 @@ class AnalyzeTextOptions(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar text: Required. The text to break into tokens.
+    :param text: Required. The text to break into tokens.
     :type text: str
-    :ivar analyzer_name: The name of the analyzer to use to break the given text. If this parameter is
+    :param analyzer_name: The name of the analyzer to use to break the given text. If this parameter is
      not specified, you must specify a tokenizer instead. The tokenizer and analyzer parameters are
      mutually exclusive. Possible values include: "ar.microsoft", "ar.lucene", "hy.lucene",
      "bn.microsoft", "eu.lucene", "bg.microsoft", "bg.lucene", "ca.microsoft", "ca.lucene", "zh-
@@ -402,19 +402,19 @@ class AnalyzeTextOptions(msrest.serialization.Model):
      "vi.microsoft", "standard.lucene", "standardasciifolding.lucene", "keyword", "pattern",
      "simple", "stop", "whitespace".
     :type analyzer_name: str or ~azure.search.documents.indexes.models.LexicalAnalyzerName
-    :ivar tokenizer_name: The name of the tokenizer to use to break the given text. If this parameter
+    :param tokenizer_name: The name of the tokenizer to use to break the given text. If this parameter
      is not specified, you must specify an analyzer instead. The tokenizer and analyzer parameters
      are mutually exclusive. Possible values include: "classic", "edgeNGram", "keyword_v2",
      "letter", "lowercase", "microsoft_language_tokenizer", "microsoft_language_stemming_tokenizer",
      "nGram", "path_hierarchy_v2", "pattern", "standard_v2", "uax_url_email", "whitespace".
     :type tokenizer_name: str or ~azure.search.documents.indexes.models.LexicalTokenizerName
-    :ivar normalizer_name: The name of the normalizer to use to normalize the given text. Possible
+    :param normalizer_name: The name of the normalizer to use to normalize the given text. Possible
      values include: "asciifolding", "elision", "lowercase", "standard", "uppercase".
     :type normalizer_name: str or ~azure.search.documents.indexes.models.LexicalNormalizerName
-    :ivar token_filters: An optional list of token filters to use when breaking the given text.
+    :param token_filters: An optional list of token filters to use when breaking the given text.
      This parameter can only be set when using the tokenizer parameter.
     :type token_filters: list[str or ~azure.search.documents.indexes.models.TokenFilterName]
-    :ivar char_filters: An optional list of character filters to use when breaking the given text.
+    :param char_filters: An optional list of character filters to use when breaking the given text.
      This parameter can only be set when using the tokenizer parameter.
     :type char_filters: list[str]
     """
@@ -460,24 +460,24 @@ class CustomAnalyzer(LexicalAnalyzer):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar odata_type: Required. Identifies the concrete type of the analyzer.Constant filled by
+    :param odata_type: Required. Identifies the concrete type of the analyzer.Constant filled by
      server.
     :type odata_type: str
-    :ivar name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
+    :param name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
      dashes or underscores, can only start and end with alphanumeric characters, and is limited to
      128 characters.
     :type name: str
-    :ivar tokenizer_name: Required. The name of the tokenizer to use to divide continuous text into a
+    :param tokenizer_name: Required. The name of the tokenizer to use to divide continuous text into a
      sequence of tokens, such as breaking a sentence into words. Possible values include: "classic",
      "edgeNGram", "keyword_v2", "letter", "lowercase", "microsoft_language_tokenizer",
      "microsoft_language_stemming_tokenizer", "nGram", "path_hierarchy_v2", "pattern",
      "standard_v2", "uax_url_email", "whitespace".
     :type tokenizer_name: str or ~azure.search.documents.indexes.models.LexicalTokenizerName
-    :ivar token_filters: A list of token filters used to filter out or modify the tokens generated
+    :param token_filters: A list of token filters used to filter out or modify the tokens generated
      by a tokenizer. For example, you can specify a lowercase filter that converts all characters to
      lowercase. The filters are run in the order in which they are listed.
     :type token_filters: list[str or ~azure.search.documents.indexes.models.TokenFilterName]
-    :ivar char_filters: A list of character filters used to prepare input text before it is
+    :param char_filters: A list of character filters used to prepare input text before it is
      processed by the tokenizer. For instance, they can replace certain characters or symbols. The
      filters are run in the order in which they are listed.
     :type char_filters: list[str]
@@ -532,20 +532,20 @@ class PatternAnalyzer(LexicalAnalyzer):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
+    :param name: Required. The name of the analyzer. It must only contain letters, digits, spaces,
      dashes or underscores, can only start and end with alphanumeric characters, and is limited to
      128 characters.
     :type name: str
-    :ivar lower_case_terms: A value indicating whether terms should be lower-cased. Default is
+    :param lower_case_terms: A value indicating whether terms should be lower-cased. Default is
      true.
     :type lower_case_terms: bool
-    :ivar pattern: A regular expression to match token separators. Default is an
+    :param pattern: A regular expression to match token separators. Default is an
      expression that matches one or more white space characters.
     :type pattern: str
-    :ivar flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
+    :param flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
      'CASE_INSENSITIVE', 'COMMENTS', 'DOTALL', 'LITERAL', 'MULTILINE', 'UNICODE_CASE', 'UNIX_LINES'.
     :type flags: list[str] or list[~search_service_client.models.RegexFlags]
-    :ivar stopwords: A list of stopwords.
+    :param stopwords: A list of stopwords.
     :type stopwords: list[str]
     """
 
@@ -604,17 +604,17 @@ class PatternTokenizer(LexicalTokenizer):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the tokenizer. It must only contain letters, digits, spaces,
+    :param name: Required. The name of the tokenizer. It must only contain letters, digits, spaces,
      dashes or underscores, can only start and end with alphanumeric characters, and is limited to
      128 characters.
     :type name: str
-    :ivar pattern: A regular expression to match token separators. Default is an
+    :param pattern: A regular expression to match token separators. Default is an
      expression that matches one or more white space characters.
     :type pattern: str
-    :ivar flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
+    :param flags: List of regular expression flags. Possible values of each flag include: 'CANON_EQ',
      'CASE_INSENSITIVE', 'COMMENTS', 'DOTALL', 'LITERAL', 'MULTILINE', 'UNICODE_CASE', 'UNIX_LINES'.
     :type flags: list[str] or list[~search_service_client.models.RegexFlags]
-    :ivar group: The zero-based ordinal of the matching group in the regular expression to
+    :param group: The zero-based ordinal of the matching group in the regular expression to
      extract into tokens. Use -1 if you want to use the entire pattern to split the input into
      tokens, irrespective of matching groups. Default is -1.
     :type group: int
@@ -671,21 +671,21 @@ class SearchResourceEncryptionKey(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar key_name: Required. The name of your Azure Key Vault key to be used to encrypt your data
+    :param key_name: Required. The name of your Azure Key Vault key to be used to encrypt your data
      at rest.
     :type key_name: str
-    :ivar key_version: Required. The version of your Azure Key Vault key to be used to encrypt
+    :param key_version: Required. The version of your Azure Key Vault key to be used to encrypt
      your data at rest.
     :type key_version: str
-    :ivar vault_uri: Required. The URI of your Azure Key Vault, also referred to as DNS name, that
+    :param vault_uri: Required. The URI of your Azure Key Vault, also referred to as DNS name, that
      contains the key to be used to encrypt your data at rest. An example URI might be https://my-
      keyvault-name.vault.azure.net.
     :type vault_uri: str
-    :ivar application_id: Required. An AAD Application ID that was granted the required access
+    :param application_id: Required. An AAD Application ID that was granted the required access
      permissions to the Azure Key Vault that is to be used when encrypting your data at rest. The
      Application ID should not be confused with the Object ID for your AAD Application.
     :type application_id: str
-    :ivar application_secret: The authentication key of the specified AAD application.
+    :param application_secret: The authentication key of the specified AAD application.
     :type application_secret: str
     """
 
@@ -756,15 +756,15 @@ class SynonymMap(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the synonym map.
+    :param name: Required. The name of the synonym map.
     :type name: str
     :ivar format: Required. The format of the synonym map. Only the 'solr' format is currently
      supported. Default value: "solr".
     :vartype format: str
-    :ivar synonyms: Required. A series of synonym rules in the specified synonym map format. The
+    :param synonyms: Required. A series of synonym rules in the specified synonym map format. The
      rules must be separated by newlines.
     :type synonyms: list[str]
-    :ivar encryption_key: A description of an encryption key that you create in Azure Key Vault.
+    :param encryption_key: A description of an encryption key that you create in Azure Key Vault.
      This key is used to provide an additional level of encryption-at-rest for your data when you
      want full assurance that no one, not even Microsoft, can decrypt your data in Azure Cognitive
      Search. Once you have encrypted your data, it will always remain encrypted. Azure Cognitive
@@ -773,7 +773,7 @@ class SynonymMap(msrest.serialization.Model):
      customer-managed keys is not available for free search services, and is only available for paid
      services created on or after January 1, 2019.
     :type encryption_key: ~azure.search.documents.indexes.models.SearchResourceEncryptionKey
-    :ivar e_tag: The ETag of the synonym map.
+    :param e_tag: The ETag of the synonym map.
     :type e_tag: str
     """
 
@@ -833,23 +833,23 @@ class SearchIndexerDataSourceConnection(msrest.serialization.Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar name: Required. The name of the datasource connection.
+    :param name: Required. The name of the datasource connection.
     :type name: str
-    :ivar description: The description of the datasource connection.
+    :param description: The description of the datasource connection.
     :type description: str
-    :ivar type: Required. The type of the datasource connection. Possible values include: "azuresql",
+    :param type: Required. The type of the datasource connection. Possible values include: "azuresql",
      "cosmosdb", "azureblob", "azuretable", "mysql", "adlsgen2".
     :type type: str or ~azure.search.documents.indexes.models.SearchIndexerDataSourceType
-    :ivar connection_string: The connection string for the datasource connection.
+    :param connection_string: The connection string for the datasource connection.
     :type connection_string: str
-    :ivar container: Required. The data container for the datasource connection.
+    :param container: Required. The data container for the datasource connection.
     :type container: ~azure.search.documents.indexes.models.SearchIndexerDataContainer
-    :ivar data_change_detection_policy: The data change detection policy for the datasource connection.
+    :param data_change_detection_policy: The data change detection policy for the datasource connection.
     :type data_change_detection_policy: ~azure.search.documents.models.DataChangeDetectionPolicy
-    :ivar data_deletion_detection_policy: The data deletion detection policy for the datasource connection.
+    :param data_deletion_detection_policy: The data deletion detection policy for the datasource connection.
     :type data_deletion_detection_policy:
      ~azure.search.documents.models.DataDeletionDetectionPolicy
-    :ivar e_tag: The ETag of the data source.
+    :param e_tag: The ETag of the data source.
     :type e_tag: str
     """