diff --git a/custom-words.txt b/custom-words.txt
index 018290fd6dae..6375ed01acf9 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -38,6 +38,7 @@ adminmanagement
 ADSIs
 ADTO
 adultscore
+afd
 affinitized
 AFRINIC
 agentpool
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json
index ba0c4bbbcf11..5cdbc7fe7366 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json
@@ -297,6 +297,12 @@
               "$ref": "#/definitions/AFDDomain"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/AFDDomain"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -417,6 +423,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -651,6 +660,12 @@
               "$ref": "#/definitions/AFDEndpoint"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/AFDEndpoint"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -771,6 +786,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -1132,6 +1150,12 @@
               "$ref": "#/definitions/AFDOriginGroup"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/AFDOriginGroup"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -1252,6 +1276,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -1506,6 +1533,12 @@
               "$ref": "#/definitions/AFDOrigin"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/AFDOrigin"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -1640,6 +1673,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -1838,6 +1874,12 @@
               "$ref": "#/definitions/Route"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Route"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -1972,6 +2014,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -2149,6 +2194,12 @@
               "$ref": "#/definitions/RuleSet"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/RuleSet"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -2453,6 +2504,12 @@
               "$ref": "#/definitions/Rule"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Rule"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -2587,6 +2644,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -2764,6 +2824,12 @@
               "$ref": "#/definitions/SecurityPolicy"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/SecurityPolicy"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -2806,12 +2872,12 @@
             "type": "string"
           },
           {
-            "name": "securityPolicyParameters",
+            "name": "securityPolicyProperties",
             "in": "body",
             "description": "Security policy update properties",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters"
+              "$ref": "#/definitions/SecurityPolicyProperties"
             }
           },
           {
@@ -2884,6 +2950,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -3061,6 +3130,12 @@
               "$ref": "#/definitions/Secret"
             }
           },
+          "202": {
+            "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Secret"
+            }
+          },
           "default": {
             "description": "CDN error response describing why the operation failed.",
             "schema": {
@@ -3181,6 +3256,9 @@
         ],
         "responses": {
           "200": {
+            "description": "OK. The request has succeeded."
+          },
+          "202": {
             "description": "Accepted"
           },
           "204": {
@@ -3449,7 +3527,8 @@
             "name": "maxRanking",
             "in": "query",
             "required": true,
-            "type": "number"
+            "type": "integer",
+            "format": "int32"
           },
           {
             "name": "dateTimeBegin",
@@ -3767,7 +3846,8 @@
             "name": "maxRanking",
             "in": "query",
             "required": true,
-            "type": "number"
+            "type": "integer",
+            "format": "int32"
           },
           {
             "name": "rankings",
@@ -4148,7 +4228,7 @@
       "properties": {
         "parameters": {
           "description": "object which contains security policy parameters",
-          "$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters"
+          "$ref": "#/definitions/SecurityPolicyParameters"
         }
       }
     },
@@ -4460,9 +4540,6 @@
       "allOf": [
         {
           "$ref": "#/definitions/SecretParameters"
-        },
-        {
-          "$ref": "#/definitions/Certificate"
         }
       ]
     },
@@ -4473,9 +4550,6 @@
       "allOf": [
         {
           "$ref": "#/definitions/SecretParameters"
-        },
-        {
-          "$ref": "#/definitions/Certificate"
         }
       ],
       "required": [
@@ -4931,12 +5005,17 @@
           }
         },
         "queryStringCachingBehavior": {
-          "description": "Defines how AzureFrontDoor caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.",
-          "$ref": "./cdn.json#/definitions/QueryStringCachingBehavior"
-        },
-        "optimizationType": {
-          "description": "Specifies what scenario the customer wants this AzureFrontDoor endpoint to optimize for, e.g. Download, Media services. With this information, AzureFrontDoor can apply scenario driven optimization.",
-          "$ref": "./cdn.json#/definitions/OptimizationType"
+          "description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.",
+          "enum": [
+            "IgnoreQueryString",
+            "UseQueryString",
+            "NotSet"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "afdQueryStringCachingBehavior",
+            "modelAsString": false
+          }
         },
         "forwardingProtocol": {
           "description": "Protocol this rule will use when forwarding traffic to backends.",
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json
index cca23a4999a4..ac7ad359abcd 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json
@@ -72,6 +72,33 @@
           "deploymentStatus": "NotStarted"
         }
       }
+    },
+    "202": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/domains/domain1",
+        "name": "domain1",
+        "type": "Microsoft.Cdn/Profiles/CustomDomains",
+        "properties": {
+          "hostName": "www.contoso.com",
+          "tlsSettings": {
+            "certificateType": "ManagedCertificate",
+            "minimumTlsVersion": "TLS12",
+            "secret": {
+              "id": ""
+            }
+          },
+          "azureDnsZone": {
+            "id": ""
+          },
+          "validationProperties": {
+            "validationToken": "",
+            "expirationDate": ""
+          },
+          "domainValidationState": "Submitting",
+          "provisioningState": "Updating",
+          "deploymentStatus": "NotStarted"
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json
index 38d320c0f1fa..f233c45af357 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json
@@ -8,6 +8,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json
index 8abf3e6dd3fd..f20efbe3ee41 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json
@@ -46,6 +46,22 @@
           "deploymentStatus": "NotStarted"
         }
       }
+    },
+    "202": {
+      "body": {
+        "name": "endpoint1",
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afdEndpoints/endpoint1",
+        "type": "Microsoft.Cdn/profiles/afdEndpoints",
+        "tags": {},
+        "location": "CentralUs",
+        "properties": {
+          "hostName": "endpoint1.azureedge.net",
+          "originResponseTimeoutSeconds": 30,
+          "enabledState": "Enabled",
+          "provisioningState": "Creating",
+          "deploymentStatus": "NotStarted"
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json
index c571c70d52c3..605da1b63877 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json
@@ -8,6 +8,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json
index 3f5156a1b004..6ad670e4b279 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json
@@ -70,6 +70,30 @@
           "deploymentStatus": "NotStarted"
         }
       }
+    },
+    "202": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/origingroups/origingroup1",
+        "type": "Microsoft.Cdn/profiles/origingroups",
+        "name": "origingroup1",
+        "properties": {
+          "loadBalancingSettings": {
+            "sampleSize": 3,
+            "successfulSamplesRequired": 3,
+            "additionalLatencyInMilliseconds": 1000
+          },
+          "healthProbeSettings": {
+            "probePath": "/path1",
+            "probeRequestType": "HEAD",
+            "probeProtocol": "Http",
+            "probeIntervalInSeconds": 10
+          },
+          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
+          "provisioningState": "Succeeded",
+          "deploymentStatus": "NotStarted"
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json
index b80edaab2cdf..a87851b7b7b2 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json
@@ -8,6 +8,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json
index ecce3ed86a3e..90d449ea6c26 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json
@@ -52,6 +52,24 @@
           "deploymentStatus": "NotStarted"
         }
       }
+    },
+    "202": {
+      "body": {
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/origingroups/origingroup1/origins/origin1",
+        "type": "Microsoft.Cdn/profiles/origingroups/origins",
+        "name": "origin1",
+        "properties": {
+          "hostName": "host1.blob.core.windows.net",
+          "httpPort": 80,
+          "httpsPort": 443,
+          "originHostHeader": "host1.foo.com",
+          "priority": null,
+          "weight": null,
+          "enabledState": "Enabled",
+          "provisioningState": "Succeeded",
+          "deploymentStatus": "NotStarted"
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json
index fb3830579403..9fdf16cd95a9 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json
@@ -9,6 +9,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json
index 1e2dd06b6037..11f98fed0027 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json
@@ -37,7 +37,6 @@
           "isCompressionEnabled": true
         },
         "queryStringCachingBehavior": "IgnoreQueryString",
-        "optimizationType": "DynamicSiteAcceleration",
         "forwardingProtocol": "MatchRequest",
         "linkToDefaultDomain": "Enabled",
         "httpsRedirect": "Enabled",
@@ -81,7 +80,6 @@
             "isCompressionEnabled": true
           },
           "queryStringCachingBehavior": "IgnoreQueryString",
-          "optimizationType": "DynamicSiteAcceleration",
           "forwardingProtocol": "MatchRequest",
           "linkToDefaultDomain": "Enabled",
           "httpsRedirect": "Enabled",
@@ -126,7 +124,50 @@
             "isCompressionEnabled": true
           },
           "queryStringCachingBehavior": "IgnoreQueryString",
-          "optimizationType": "DynamicSiteAcceleration",
+          "forwardingProtocol": "MatchRequest",
+          "linkToDefaultDomain": "Enabled",
+          "httpsRedirect": "Enabled",
+          "enabledState": "Enabled",
+          "provisioningState": "Creating",
+          "deploymentStatus": "NotStarted"
+        }
+      }
+    },
+    "202": {
+      "body": {
+        "name": "route1",
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afdendpoints/endpoint1/routes/route1",
+        "type": "Microsoft.Cdn/profiles/afdendpoints/routes",
+        "properties": {
+          "customDomains": [
+            {
+              "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/customDomains/domain1"
+            }
+          ],
+          "originGroup": {
+            "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/originGroups/originGroup1"
+          },
+          "originPath": null,
+          "ruleSets": [
+            {
+              "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/ruleSets/ruleSet1"
+            }
+          ],
+          "supportedProtocols": [
+            "Https",
+            "Http"
+          ],
+          "patternsToMatch": [
+            "/*"
+          ],
+          "compressionSettings": {
+            "contentTypesToCompress": [
+              "text/html",
+              "application/octet-stream"
+            ],
+            "isCompressionEnabled": true
+          },
+          "queryStringCachingBehavior": "IgnoreQueryString",
           "forwardingProtocol": "MatchRequest",
           "linkToDefaultDomain": "Enabled",
           "httpsRedirect": "Enabled",
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json
index ac780fb5573e..b23efb044f8e 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json
@@ -9,6 +9,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json
index f67ed9182cc5..19e7d4264281 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json
@@ -43,7 +43,6 @@
             "isCompressionEnabled": true
           },
           "queryStringCachingBehavior": "IgnoreQueryString",
-          "optimizationType": "DynamicSiteAcceleration",
           "forwardingProtocol": "MatchRequest",
           "linkToDefaultDomain": "Enabled",
           "httpsRedirect": "Enabled",
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json
index 782b0b8c46f3..eee9b5c490bf 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json
@@ -44,7 +44,6 @@
                 "isCompressionEnabled": true
               },
               "queryStringCachingBehavior": "IgnoreQueryString",
-              "optimizationType": "DynamicSiteAcceleration",
               "forwardingProtocol": "MatchRequest",
               "linkToDefaultDomain": "Enabled",
               "httpsRedirect": "Enabled",
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json
index 102f6a3baf43..87e91a83a923 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json
@@ -37,7 +37,6 @@
           "isCompressionEnabled": true
         },
         "queryStringCachingBehavior": "IgnoreQueryString",
-        "optimizationType": "DynamicSiteAcceleration",
         "forwardingProtocol": "MatchRequest",
         "linkToDefaultDomain": "Enabled",
         "httpsRedirect": "Enabled",
@@ -81,7 +80,6 @@
             "isCompressionEnabled": true
           },
           "queryStringCachingBehavior": "IgnoreQueryString",
-          "optimizationType": "DynamicSiteAcceleration",
           "forwardingProtocol": "MatchRequest",
           "linkToDefaultDomain": "Enabled",
           "httpsRedirect": "Enabled",
@@ -126,7 +124,6 @@
             "isCompressionEnabled": true
           },
           "queryStringCachingBehavior": "IgnoreQueryString",
-          "optimizationType": "DynamicSiteAcceleration",
           "forwardingProtocol": "MatchRequest",
           "linkToDefaultDomain": "Enabled",
           "httpsRedirect": "Enabled",
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json
index 793b1a05514a..ea41f23ccdac 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json
@@ -31,6 +31,17 @@
           "deploymentStatus": "NotStarted"
         }
       }
+    },
+    "202": {
+      "body": {
+        "name": "ruleSet1",
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/rulesets/ruleSet1",
+        "type": "Microsoft.Cdn/profiles/rulesets",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "deploymentStatus": "NotStarted"
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json
index 954581d4d4b5..5e6f24136ee2 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json
@@ -104,6 +104,40 @@
           ]
         }
       }
+    },
+    "202": {
+      "body": {
+        "name": "rule1",
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/ruleSets/ruleSet1/rules/rule1",
+        "type": "Microsoft.Cdn/profiles/ruleSets/rules",
+        "properties": {
+          "order": 1,
+          "conditions": [
+            {
+              "name": "RequestMethod",
+              "parameters": {
+                "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters",
+                "operator": "Equal",
+                "matchValues": [
+                  "GET"
+                ],
+                "negateCondition": false
+              }
+            }
+          ],
+          "actions": [
+            {
+              "name": "ModifyResponseHeader",
+              "parameters": {
+                "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters",
+                "headerAction": "Overwrite",
+                "headerName": "X-CDN",
+                "value": "MSFT"
+              }
+            }
+          ]
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json
index 06ed6ae89044..c3ea629d2bd7 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json
@@ -9,6 +9,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json
index 490b7cb8ee66..8e702054ba5e 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json
@@ -9,15 +9,12 @@
       "properties": {
         "parameters": {
           "type": "CustomerCertificate",
-          "subject": "www.foo.contoso.com",
           "subjectAlternativeNames": [
             "foo.contoso.com",
             "www3.foo.contoso.com"
           ],
           "secretVersion": "67c452f83c804aed80aa3a21e523c226",
           "certificateAuthority": "Symantec",
-          "expirationDate": "2020-11-03T12:10:13",
-          "thumbprint": "fjio4pu930t2909irf2304809",
           "secretSource": {
             "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
           },
@@ -35,15 +32,12 @@
         "properties": {
           "parameters": {
             "type": "CustomerCertificate",
-            "subject": "www.foo.contoso.com",
             "subjectAlternativeNames": [
               "foo.contoso.com",
               "www3.foo.contoso.com"
             ],
             "secretVersion": "67c452f83c804aed80aa3a21e523c226",
             "certificateAuthority": "Symantec",
-            "expirationDate": "2020-11-03T12:10:13",
-            "thumbprint": "fjio4pu930t2909irf2304809",
             "secretSource": {
               "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
             },
@@ -62,15 +56,36 @@
         "properties": {
           "parameters": {
             "type": "CustomerCertificate",
-            "subject": "www.foo.contoso.com",
             "subjectAlternativeNames": [
               "foo.contoso.com",
               "www3.foo.contoso.com"
             ],
             "secretVersion": "67c452f83c804aed80aa3a21e523c226",
             "certificateAuthority": "Symantec",
-            "expirationDate": "2020-11-03T12:10:13",
-            "thumbprint": "fjio4pu930t2909irf2304809",
+            "secretSource": {
+              "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
+            },
+            "useLatestVersion": false
+          },
+          "provisioningState": "Succeeded",
+          "deploymentStatus": "NotStarted"
+        }
+      }
+    },
+    "202": {
+      "body": {
+        "name": "secret1",
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/secrets/secret1",
+        "type": "Microsoft.Cdn/profiles/secrets",
+        "properties": {
+          "parameters": {
+            "type": "CustomerCertificate",
+            "subjectAlternativeNames": [
+              "foo.contoso.com",
+              "www3.foo.contoso.com"
+            ],
+            "secretVersion": "67c452f83c804aed80aa3a21e523c226",
+            "certificateAuthority": "Symantec",
             "secretSource": {
               "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
             },
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json
index d605d3376be5..15ecc49306c0 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json
@@ -8,6 +8,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json
index 1cbb7eaa0811..1537e5fcf730 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json
@@ -15,15 +15,12 @@
         "properties": {
           "parameters": {
             "type": "CustomerCertificate",
-            "subject": "www.foo.contoso.com",
             "subjectAlternativeNames": [
               "foo.contoso.com",
               "www3.foo.contoso.com"
             ],
             "secretVersion": "67c452f83c804aed80aa3a21e523c226",
             "certificateAuthority": "Symantec",
-            "expirationDate": "2020-11-03T12:10:13",
-            "thumbprint": "fjio4pu930t2909irf2304809",
             "secretSource": {
               "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
             },
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json
index d62b06e79bef..93411098c05f 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json
@@ -16,15 +16,12 @@
             "properties": {
               "parameters": {
                 "type": "CustomerCertificate",
-                "subject": "www.foo.contoso.com",
                 "subjectAlternativeNames": [
                   "foo.contoso.com",
                   "www3.foo.contoso.com"
                 ],
                 "secretVersion": "67c452f83c804aed80aa3a21e523c226",
                 "certificateAuthority": "Symantec",
-                "expirationDate": "2020-11-03T12:10:13",
-                "thumbprint": "fjio4pu930t2909irf2304809",
                 "secretSource": {
                   "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
                 },
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json
index a1b497d552b8..5568194cfc96 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json
@@ -8,15 +8,12 @@
     "secretProperties": {
       "parameters": {
         "type": "CustomerCertificate",
-        "subject": "www.foo.contoso.com",
         "subjectAlternativeNames": [
           "foo.contoso.com",
           "www3.foo.contoso.com"
         ],
         "secretVersion": "67c452f83c804aed80aa3a21e523c226",
         "certificateAuthority": "Symantec",
-        "expirationDate": "2020-11-03T12:10:13",
-        "thumbprint": "fjio4pu930t2909irf2304809",
         "secretSource": {
           "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
         },
@@ -33,15 +30,12 @@
         "properties": {
           "parameters": {
             "type": "CustomerCertificate",
-            "subject": "www.foo.contoso.com",
             "subjectAlternativeNames": [
               "foo.contoso.com",
               "www3.foo.contoso.com"
             ],
             "secretVersion": "67c452f83c804aed80aa3a21e523c226",
             "certificateAuthority": "Symantec",
-            "expirationDate": "2020-11-03T12:10:13",
-            "thumbprint": "fjio4pu930t2909irf2304809",
             "secretSource": {
               "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
             },
@@ -60,15 +54,12 @@
         "properties": {
           "parameters": {
             "type": "CustomerCertificate",
-            "subject": "www.foo.contoso.com",
             "subjectAlternativeNames": [
               "foo.contoso.com",
               "www3.foo.contoso.com"
             ],
             "secretVersion": "67c452f83c804aed80aa3a21e523c226",
             "certificateAuthority": "Symantec",
-            "expirationDate": "2020-11-03T12:10:13",
-            "thumbprint": "fjio4pu930t2909irf2304809",
             "secretSource": {
               "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName"
             },
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json
index cb0a62d65d2b..7d5965c522a4 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json
@@ -98,6 +98,39 @@
           "provisioningState": "Creating"
         }
       }
+    },
+    "202": {
+      "body": {
+        "name": "securityPolicy1",
+        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/securityPolicies/securityPolicy1",
+        "type": "Microsoft.Cdn/profiles/securityPolicies",
+        "properties": {
+          "parameters": {
+            "type": "WebApplicationFirewall",
+            "wafPolicy": {
+              "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest"
+            },
+            "associations": [
+              {
+                "domains": [
+                  {
+                    "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1"
+                  },
+                  {
+                    "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2"
+                  }
+                ],
+                "patternsToMatch": [
+                  "/images",
+                  "/videos"
+                ]
+              }
+            ]
+          },
+          "deploymentStatus": "NotStarted",
+          "provisioningState": "Creating"
+        }
+      }
     }
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json
index 23195d9576c3..471269f41d67 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json
@@ -8,6 +8,7 @@
   },
   "responses": {
     "200": {},
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json
index 11a78be0ce97..cfcfa9f3e10b 100644
--- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json
+++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json
@@ -5,27 +5,29 @@
     "resourceGroupName": "RG",
     "profileName": "profile1",
     "securityPolicyName": "securityPolicy1",
-    "securityPolicyParameters": {
-      "type": "WebApplicationFirewall",
-      "wafPolicy": {
-        "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest"
-      },
-      "associations": [
-        {
-          "domains": [
-            {
-              "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1"
-            },
-            {
-              "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2"
-            }
-          ],
-          "patternsToMatch": [
-            "/images",
-            "/videos"
-          ]
-        }
-      ]
+    "securityPolicyProperties": {
+      "parameters": {
+        "type": "WebApplicationFirewall",
+        "wafPolicy": {
+          "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest"
+        },
+        "associations": [
+          {
+            "domains": [
+              {
+                "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1"
+              },
+              {
+                "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2"
+              }
+            ],
+            "patternsToMatch": [
+              "/images",
+              "/videos"
+            ]
+          }
+        ]
+      }
     }
   },
   "responses": {