diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py
index 895f4c610006..d5147078df38 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py
@@ -512,7 +512,7 @@ class CookiesMatchConditionParameters(Model):
     :ivar odatatype: Required.  Default value:
      "#Microsoft.Azure.Cdn.Models.DeliveryRuleCookiesConditionParameters" .
     :vartype odatatype: str
-    :param selector: Required. Name of Cookies to be matched
+    :param selector: Name of Cookies to be matched
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith',
@@ -520,8 +520,8 @@ class CookiesMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.CookiesOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -529,9 +529,7 @@ class CookiesMatchConditionParameters(Model):
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
-        'selector': {'required': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -2043,15 +2041,14 @@ class HttpVersionMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     """
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -2111,8 +2108,8 @@ class IsDeviceMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -2121,7 +2118,6 @@ class IsDeviceMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -2167,8 +2163,7 @@ class KeyVaultCertificateSourceParameters(Model):
     :param secret_name: Required. The name of Key Vault Secret (representing
      the full certificate PFX) in Key Vault.
     :type secret_name: str
-    :param secret_version: Required. The version(GUID) of Key Vault Secret in
-     Key Vault.
+    :param secret_version: The version(GUID) of Key Vault Secret in Key Vault.
     :type secret_version: str
     :ivar update_rule: Required. Describes the action that shall be taken when
      the certificate is updated in Key Vault. Default value: "NoAction" .
@@ -2184,7 +2179,6 @@ class KeyVaultCertificateSourceParameters(Model):
         'resource_group_name': {'required': True},
         'vault_name': {'required': True},
         'secret_name': {'required': True},
-        'secret_version': {'required': True},
         'update_rule': {'required': True, 'constant': True},
         'delete_rule': {'required': True, 'constant': True},
     }
@@ -2995,7 +2989,7 @@ class PostArgsMatchConditionParameters(Model):
     :ivar odatatype: Required.  Default value:
      "#Microsoft.Azure.Cdn.Models.DeliveryRulePostArgsConditionParameters" .
     :vartype odatatype: str
-    :param selector: Required. Name of PostArg to be matched
+    :param selector: Name of PostArg to be matched
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith',
@@ -3003,8 +2997,8 @@ class PostArgsMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.PostArgsOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3012,9 +3006,7 @@ class PostArgsMatchConditionParameters(Model):
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
-        'selector': {'required': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3151,8 +3143,8 @@ class QueryStringMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.QueryStringOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3161,7 +3153,6 @@ class QueryStringMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3266,9 +3257,9 @@ class RemoteAddressMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RemoteAddressOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. Match values to match against. The operator
-     will apply to each value in here with OR semantics. If any of them match
-     the variable with the given operator this match condition is considered a
+    :param match_values: Match values to match against. The operator will
+     apply to each value in here with OR semantics. If any of them match the
+     variable with the given operator this match condition is considered a
      match.
     :type match_values: list[str]
     :param transforms: List of transforms
@@ -3278,7 +3269,6 @@ class RemoteAddressMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3316,8 +3306,8 @@ class RequestBodyMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RequestBodyOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3326,7 +3316,6 @@ class RequestBodyMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3359,7 +3348,7 @@ class RequestHeaderMatchConditionParameters(Model):
      "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestHeaderConditionParameters"
      .
     :vartype odatatype: str
-    :param selector: Required. Name of Header to be matched
+    :param selector: Name of Header to be matched
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith',
@@ -3367,8 +3356,8 @@ class RequestHeaderMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RequestHeaderOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3376,9 +3365,7 @@ class RequestHeaderMatchConditionParameters(Model):
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
-        'selector': {'required': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3418,15 +3405,14 @@ class RequestMethodMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     """
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3463,15 +3449,14 @@ class RequestSchemeMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     """
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3508,8 +3493,8 @@ class RequestUriMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RequestUriOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3518,7 +3503,6 @@ class RequestUriMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3714,8 +3698,8 @@ class UrlFileExtensionMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.UrlFileExtensionOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3724,7 +3708,6 @@ class UrlFileExtensionMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3762,8 +3745,8 @@ class UrlFileNameMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.UrlFileNameOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3772,7 +3755,6 @@ class UrlFileNameMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3812,8 +3794,8 @@ class UrlPathMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.UrlPathOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3822,7 +3804,6 @@ class UrlPathMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py
index 35d4b4930f18..2919c254cab2 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py
@@ -512,7 +512,7 @@ class CookiesMatchConditionParameters(Model):
     :ivar odatatype: Required.  Default value:
      "#Microsoft.Azure.Cdn.Models.DeliveryRuleCookiesConditionParameters" .
     :vartype odatatype: str
-    :param selector: Required. Name of Cookies to be matched
+    :param selector: Name of Cookies to be matched
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith',
@@ -520,8 +520,8 @@ class CookiesMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.CookiesOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -529,9 +529,7 @@ class CookiesMatchConditionParameters(Model):
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
-        'selector': {'required': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -545,7 +543,7 @@ class CookiesMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleCookiesConditionParameters"
 
-    def __init__(self, *, selector: str, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, selector: str=None, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(CookiesMatchConditionParameters, self).__init__(**kwargs)
         self.selector = selector
         self.operator = operator
@@ -2043,15 +2041,14 @@ class HttpVersionMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     """
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -2065,7 +2062,7 @@ class HttpVersionMatchConditionParameters(Model):
 
     operator = "Equal"
 
-    def __init__(self, *, match_values, negate_condition: bool=None, **kwargs) -> None:
+    def __init__(self, *, negate_condition: bool=None, match_values=None, **kwargs) -> None:
         super(HttpVersionMatchConditionParameters, self).__init__(**kwargs)
         self.negate_condition = negate_condition
         self.match_values = match_values
@@ -2111,8 +2108,8 @@ class IsDeviceMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -2121,7 +2118,6 @@ class IsDeviceMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -2136,7 +2132,7 @@ class IsDeviceMatchConditionParameters(Model):
 
     operator = "Equal"
 
-    def __init__(self, *, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(IsDeviceMatchConditionParameters, self).__init__(**kwargs)
         self.negate_condition = negate_condition
         self.match_values = match_values
@@ -2167,8 +2163,7 @@ class KeyVaultCertificateSourceParameters(Model):
     :param secret_name: Required. The name of Key Vault Secret (representing
      the full certificate PFX) in Key Vault.
     :type secret_name: str
-    :param secret_version: Required. The version(GUID) of Key Vault Secret in
-     Key Vault.
+    :param secret_version: The version(GUID) of Key Vault Secret in Key Vault.
     :type secret_version: str
     :ivar update_rule: Required. Describes the action that shall be taken when
      the certificate is updated in Key Vault. Default value: "NoAction" .
@@ -2184,7 +2179,6 @@ class KeyVaultCertificateSourceParameters(Model):
         'resource_group_name': {'required': True},
         'vault_name': {'required': True},
         'secret_name': {'required': True},
-        'secret_version': {'required': True},
         'update_rule': {'required': True, 'constant': True},
         'delete_rule': {'required': True, 'constant': True},
     }
@@ -2206,7 +2200,7 @@ class KeyVaultCertificateSourceParameters(Model):
 
     delete_rule = "NoAction"
 
-    def __init__(self, *, subscription_id: str, resource_group_name: str, vault_name: str, secret_name: str, secret_version: str, **kwargs) -> None:
+    def __init__(self, *, subscription_id: str, resource_group_name: str, vault_name: str, secret_name: str, secret_version: str=None, **kwargs) -> None:
         super(KeyVaultCertificateSourceParameters, self).__init__(**kwargs)
         self.subscription_id = subscription_id
         self.resource_group_name = resource_group_name
@@ -2995,7 +2989,7 @@ class PostArgsMatchConditionParameters(Model):
     :ivar odatatype: Required.  Default value:
      "#Microsoft.Azure.Cdn.Models.DeliveryRulePostArgsConditionParameters" .
     :vartype odatatype: str
-    :param selector: Required. Name of PostArg to be matched
+    :param selector: Name of PostArg to be matched
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith',
@@ -3003,8 +2997,8 @@ class PostArgsMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.PostArgsOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3012,9 +3006,7 @@ class PostArgsMatchConditionParameters(Model):
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
-        'selector': {'required': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3028,7 +3020,7 @@ class PostArgsMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRulePostArgsConditionParameters"
 
-    def __init__(self, *, selector: str, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, selector: str=None, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(PostArgsMatchConditionParameters, self).__init__(**kwargs)
         self.selector = selector
         self.operator = operator
@@ -3151,8 +3143,8 @@ class QueryStringMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.QueryStringOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3161,7 +3153,6 @@ class QueryStringMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3174,7 +3165,7 @@ class QueryStringMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleQueryStringConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(QueryStringMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
@@ -3266,9 +3257,9 @@ class RemoteAddressMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RemoteAddressOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. Match values to match against. The operator
-     will apply to each value in here with OR semantics. If any of them match
-     the variable with the given operator this match condition is considered a
+    :param match_values: Match values to match against. The operator will
+     apply to each value in here with OR semantics. If any of them match the
+     variable with the given operator this match condition is considered a
      match.
     :type match_values: list[str]
     :param transforms: List of transforms
@@ -3278,7 +3269,6 @@ class RemoteAddressMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3291,7 +3281,7 @@ class RemoteAddressMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleRemoteAddressConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(RemoteAddressMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
@@ -3316,8 +3306,8 @@ class RequestBodyMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RequestBodyOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3326,7 +3316,6 @@ class RequestBodyMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3339,7 +3328,7 @@ class RequestBodyMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestBodyConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(RequestBodyMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
@@ -3359,7 +3348,7 @@ class RequestHeaderMatchConditionParameters(Model):
      "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestHeaderConditionParameters"
      .
     :vartype odatatype: str
-    :param selector: Required. Name of Header to be matched
+    :param selector: Name of Header to be matched
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'Equal', 'Contains', 'BeginsWith', 'EndsWith',
@@ -3367,8 +3356,8 @@ class RequestHeaderMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RequestHeaderOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3376,9 +3365,7 @@ class RequestHeaderMatchConditionParameters(Model):
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
-        'selector': {'required': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3392,7 +3379,7 @@ class RequestHeaderMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestHeaderConditionParameters"
 
-    def __init__(self, *, selector: str, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, selector: str=None, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(RequestHeaderMatchConditionParameters, self).__init__(**kwargs)
         self.selector = selector
         self.operator = operator
@@ -3418,15 +3405,14 @@ class RequestMethodMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     """
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3440,7 +3426,7 @@ class RequestMethodMatchConditionParameters(Model):
 
     operator = "Equal"
 
-    def __init__(self, *, match_values, negate_condition: bool=None, **kwargs) -> None:
+    def __init__(self, *, negate_condition: bool=None, match_values=None, **kwargs) -> None:
         super(RequestMethodMatchConditionParameters, self).__init__(**kwargs)
         self.negate_condition = negate_condition
         self.match_values = match_values
@@ -3463,15 +3449,14 @@ class RequestSchemeMatchConditionParameters(Model):
     :vartype operator: str
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     """
 
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True, 'constant': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3485,7 +3470,7 @@ class RequestSchemeMatchConditionParameters(Model):
 
     operator = "Equal"
 
-    def __init__(self, *, match_values, negate_condition: bool=None, **kwargs) -> None:
+    def __init__(self, *, negate_condition: bool=None, match_values=None, **kwargs) -> None:
         super(RequestSchemeMatchConditionParameters, self).__init__(**kwargs)
         self.negate_condition = negate_condition
         self.match_values = match_values
@@ -3508,8 +3493,8 @@ class RequestUriMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.RequestUriOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3518,7 +3503,6 @@ class RequestUriMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3531,7 +3515,7 @@ class RequestUriMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestUriConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(RequestUriMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
@@ -3714,8 +3698,8 @@ class UrlFileExtensionMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.UrlFileExtensionOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3724,7 +3708,6 @@ class UrlFileExtensionMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3737,7 +3720,7 @@ class UrlFileExtensionMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlFileExtensionMatchConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(UrlFileExtensionMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
@@ -3762,8 +3745,8 @@ class UrlFileNameMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.UrlFileNameOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3772,7 +3755,6 @@ class UrlFileNameMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3785,7 +3767,7 @@ class UrlFileNameMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlFilenameConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(UrlFileNameMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
@@ -3812,8 +3794,8 @@ class UrlPathMatchConditionParameters(Model):
     :type operator: str or ~azure.mgmt.cdn.models.UrlPathOperator
     :param negate_condition: Describes if this is negate condition or not
     :type negate_condition: bool
-    :param match_values: Required. The match value for the condition of the
-     delivery rule
+    :param match_values: The match value for the condition of the delivery
+     rule
     :type match_values: list[str]
     :param transforms: List of transforms
     :type transforms: list[str or ~azure.mgmt.cdn.models.Transform]
@@ -3822,7 +3804,6 @@ class UrlPathMatchConditionParameters(Model):
     _validation = {
         'odatatype': {'required': True, 'constant': True},
         'operator': {'required': True},
-        'match_values': {'required': True},
     }
 
     _attribute_map = {
@@ -3835,7 +3816,7 @@ class UrlPathMatchConditionParameters(Model):
 
     odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlPathMatchConditionParameters"
 
-    def __init__(self, *, operator, match_values, negate_condition: bool=None, transforms=None, **kwargs) -> None:
+    def __init__(self, *, operator, negate_condition: bool=None, match_values=None, transforms=None, **kwargs) -> None:
         super(UrlPathMatchConditionParameters, self).__init__(**kwargs)
         self.operator = operator
         self.negate_condition = negate_condition
diff --git a/sdk/cdn/azure-mgmt-cdn/setup.py b/sdk/cdn/azure-mgmt-cdn/setup.py
index 6b7a76e367f5..5d51c73ccf6d 100644
--- a/sdk/cdn/azure-mgmt-cdn/setup.py
+++ b/sdk/cdn/azure-mgmt-cdn/setup.py
@@ -36,7 +36,7 @@
     pass
 
 # Version extraction inspired from 'requests'
-with open(os.path.join(package_folder_path, 'version.py')
+with open(os.path.join(package_folder_path, 'version.py') 
           if os.path.exists(os.path.join(package_folder_path, 'version.py'))
           else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
     version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',