diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_CreateOrUpdate.json
index 7e80830891c5..4e84f85d13cd 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_CreateOrUpdate.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_CreateOrUpdate.json
@@ -23,6 +23,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/customRollouts/brazilUsShoeBoxTesting",
         "name": "Microsoft.Contoso/brazilUsShoeBoxTesting",
         "type": "Microsoft.ProviderHub/providerRegistrations/customRollouts",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "provisioningState": "Succeeded",
           "specification": {
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_Get.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_Get.json
index cf7a428009af..3fe51c5d4ab8 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_Get.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_Get.json
@@ -12,6 +12,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/customRollouts/canaryTesting99",
         "name": "Microsoft.Contoso/canaryTesting99",
         "type": "Microsoft.ProviderHub/providerRegistrations/customRollouts",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "provisioningState": "Completed",
           "specification": {
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_ListByProviderRegistration.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_ListByProviderRegistration.json
index a14ead2b17e3..a1ddcbd2f76d 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_ListByProviderRegistration.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/CustomRollouts_ListByProviderRegistration.json
@@ -13,6 +13,14 @@
             "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/customRollouts/canaryTesting99",
             "name": "Microsoft.Contoso/canaryTesting99",
             "type": "Microsoft.ProviderHub/providerRegistrations/customRollouts",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            },
             "properties": {
               "provisioningState": "Succeeded",
               "specification": {
@@ -35,6 +43,14 @@
             "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/customRollouts/brazilustesting",
             "name": "Microsoft.Contoso/brazilustesting",
             "type": "Microsoft.ProviderHub/providerRegistrations/customRollouts",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            },
             "properties": {
               "provisioningState": "Failed",
               "specification": {
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_CreateOrUpdate.json
index 7836ee7306f8..52a3ddfb802d 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_CreateOrUpdate.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_CreateOrUpdate.json
@@ -33,6 +33,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/defaultRollouts/2020week10",
         "name": "Microsoft.Contoso/2020week10",
         "type": "Microsoft.ProviderHub/providerRegistrations/defaultRollouts",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "provisioningState": "RolloutInProgress",
           "specification": {
@@ -103,6 +111,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/defaultRollouts/2020week10",
         "name": "Microsoft.Contoso/2020week10",
         "type": "Microsoft.ProviderHub/providerRegistrations/defaultRollouts",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "provisioningState": "RolloutInProgress",
           "specification": {
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_Get.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_Get.json
index fbb418ce9778..5d8fa9aeb239 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_Get.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_Get.json
@@ -12,6 +12,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/defaultRollouts/2020week10",
         "name": "Microsoft.Contoso/2020week10",
         "type": "Microsoft.ProviderHub/providerRegistrations/defaultRollouts",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "provisioningState": "Cancelled",
           "specification": {
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_ListByProviderRegistration.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_ListByProviderRegistration.json
index 2a4c07b49637..7ab210079c9a 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_ListByProviderRegistration.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/DefaultRollouts_ListByProviderRegistration.json
@@ -13,6 +13,14 @@
             "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/defaultRollouts/2020week01",
             "name": "Microsoft.Contoso/2020week01",
             "type": "Microsoft.ProviderHub/providerRegistrations/defaultRollouts",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            },
             "properties": {
               "provisioningState": "Succeeded",
               "specification": {
@@ -79,6 +87,14 @@
             "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/defaultRollouts/2020week10",
             "name": "Microsoft.Contoso/2020week10",
             "type": "Microsoft.ProviderHub/providerRegistrations/defaultRollouts",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            },
             "properties": {
               "provisioningState": "Cancelled",
               "specification": {
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_CreateOrUpdate.json
index 0eb58680e30d..62897789a7c9 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_CreateOrUpdate.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_CreateOrUpdate.json
@@ -37,6 +37,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/notificationregistrations/fooNotificationRegistration",
         "type": "Microsoft.ProviderHub/providerRegistrations/notificationregistrations",
         "name": "fooNotificationRegistration",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "notificationMode": "EventHub",
           "messageScope": "RegisteredSubscriptions",
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_Get.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_Get.json
index e4e201d10e20..7cba399a6ebd 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_Get.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_Get.json
@@ -12,6 +12,14 @@
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/notificationregistrations/fooNotificationRegistration",
         "type": "Microsoft.ProviderHub/providerRegistrations/notificationregistrations",
         "name": "fooNotificationRegistration",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        },
         "properties": {
           "notificationMode": "EventHub",
           "messageScope": "RegisteredSubscriptions",
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_ListByProviderRegistration.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_ListByProviderRegistration.json
index 191983a40da2..88cb9dcde8a7 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_ListByProviderRegistration.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/NotificationRegistrations_ListByProviderRegistration.json
@@ -11,6 +11,14 @@
         "value": [
           {
             "name": "fooNotificationRegistration",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            },
             "properties": {
               "notificationMode": "EventHub",
               "messageScope": "RegisteredSubscriptions",
@@ -37,6 +45,14 @@
           },
           {
             "name": "barNotificationRegistration",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            },
             "properties": {
               "notificationMode": "EventHub",
               "messageScope": "RegisteredSubscriptions",
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_CreateOrUpdate.json
index 90e871a7baf4..c421ec33a475 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_CreateOrUpdate.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_CreateOrUpdate.json
@@ -62,6 +62,14 @@
           "providerVersion": "2.0",
           "providerType": "Internal, Hidden",
           "provisioningState": "Succeeded"
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
         }
       }
     },
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_Get.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_Get.json
index f2031bd51aa8..36525992e782 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_Get.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_Get.json
@@ -46,6 +46,14 @@
             }
           ],
           "metadata": null
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
         }
       }
     }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_List.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_List.json
index a0ad9677589d..818ff0d5ac7e 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_List.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ProviderRegistrations_List.json
@@ -46,6 +46,14 @@
                 }
               ],
               "provisioningState": "Succeeded"
+            },
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
             }
           }
         ]
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_CreateOrUpdate.json
index fa433b0d8c98..101ae54cdb0f 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_CreateOrUpdate.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_CreateOrUpdate.json
@@ -20,8 +20,7 @@
             ],
             "requiredFeatures": [
               "<feature flag>"
-            ],
-            "endpointType": "Production"
+            ]
           }
         ],
         "resourceConcurrencyControlOptions": {
@@ -55,6 +54,11 @@
           "incidentRoutingTeam": "",
           "incidentContactEmail": "helpme@contoso.com",
           "resourceAccessPolicy": "NotSpecified"
+        },
+        "openApiConfiguration": {
+          "validation": {
+            "allowNoncompliantCollectionResponse": true
+          }
         }
       }
     }
@@ -127,9 +131,22 @@
             "incidentRoutingTeam": "",
             "incidentContactEmail": "helpme@contoso.com",
             "resourceAccessPolicy": "NotSpecified"
+          },
+          "openApiConfiguration": {
+            "validation": {
+              "allowNoncompliantCollectionResponse": true
+            }
           }
         },
-        "name": "employees"
+        "name": "employees",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     },
     "201": {
@@ -160,19 +177,6 @@
               "requiredFeatures": [
                 "Microsoft.Contoso/RPaaSSampleApp"
               ]
-            },
-            {
-              "apiVersions": [
-                "2021-06-01-preview"
-              ],
-              "locations": [
-                "East US 2 EUAP",
-                "Central US EUAP"
-              ],
-              "requiredFeatures": [
-                "Microsoft.Contoso/RPaaSSampleApp"
-              ],
-              "endpointType": "Canary"
             }
           ],
           "swaggerSpecifications": [
@@ -211,9 +215,22 @@
             "incidentRoutingTeam": "",
             "incidentContactEmail": "helpme@contoso.com",
             "resourceAccessPolicy": "NotSpecified"
+          },
+          "openApiConfiguration": {
+            "validation": {
+              "allowNoncompliantCollectionResponse": true
+            }
           }
         },
-        "name": "employees"
+        "name": "employees",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     }
   }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_Get.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_Get.json
index 0ab19048a42c..1a772e784399 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_Get.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_Get.json
@@ -72,9 +72,22 @@
             "incidentRoutingTeam": "",
             "incidentContactEmail": "helpme@contoso.com",
             "resourceAccessPolicy": "NotSpecified"
+          },
+          "openApiConfiguration": {
+            "validation": {
+              "allowNoncompliantCollectionResponse": false
+            }
           }
         },
-        "name": "employees"
+        "name": "employees",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     }
   }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_ListByProviderRegistration.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_ListByProviderRegistration.json
index 2f8d7e2e51c4..7af5619015eb 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_ListByProviderRegistration.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/ResourceTypeRegistrations_ListByProviderRegistration.json
@@ -73,9 +73,22 @@
                 "incidentRoutingTeam": "",
                 "incidentContactEmail": "helpme@contoso.com",
                 "resourceAccessPolicy": "NotSpecified"
+              },
+              "openApiConfiguration": {
+                "validation": {
+                  "allowNoncompliantCollectionResponse": false
+                }
               }
             },
-            "name": "employees"
+            "name": "employees",
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+            }
           }
         ]
       }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json
index 3d9dda128fba..9962b47bacb4 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdate.json
@@ -31,7 +31,15 @@
       "body": {
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/",
         "name": "Microsoft.Contoso/",
-        "type": "Microsoft.ProviderHub/providerRegistrations/"
+        "type": "Microsoft.ProviderHub/providerRegistrations/",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     }
   }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json
index 80d5a76eb35c..144031b9da8f 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeFirst.json
@@ -32,7 +32,15 @@
       "body": {
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/",
         "name": "Microsoft.Contoso/",
-        "type": "Microsoft.ProviderHub/providerRegistrations/"
+        "type": "Microsoft.ProviderHub/providerRegistrations/",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     }
   }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json
index 978d209db248..c9bbd2a2e45a 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeSecond.json
@@ -33,7 +33,15 @@
       "body": {
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/",
         "name": "Microsoft.Contoso/",
-        "type": "Microsoft.ProviderHub/providerRegistrations/"
+        "type": "Microsoft.ProviderHub/providerRegistrations/",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     }
   }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json
index 9d7c44624f0a..fbb79b66259b 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_CreateOrUpdateNestedResourceTypeThird.json
@@ -34,7 +34,15 @@
       "body": {
         "id": "/subscriptions/ab7a8701-f7ef-471a-a2f4-d0ebbf494f77providers/Microsoft.ProviderHub/providerRegistrations/Microsoft.Contoso/",
         "name": "Microsoft.Contoso/",
-        "type": "Microsoft.ProviderHub/providerRegistrations/"
+        "type": "Microsoft.ProviderHub/providerRegistrations/",
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
+        }
       }
     }
   }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_Get.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_Get.json
index 4020c4e0b0cb..31d706af9a58 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_Get.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_Get.json
@@ -28,6 +28,14 @@
               ]
             }
           ]
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
         }
       }
     }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeFirst.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeFirst.json
index 58eedd1bddac..65dcf73ffd4b 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeFirst.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeFirst.json
@@ -29,6 +29,14 @@
               ]
             }
           ]
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
         }
       }
     }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeSecond.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeSecond.json
index 17d31b41514e..24a6b44aaf56 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeSecond.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeSecond.json
@@ -30,6 +30,14 @@
               ]
             }
           ]
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
         }
       }
     }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeThird.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeThird.json
index 6f2078d52d38..71bd93be92db 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeThird.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_GetNestedResourceTypeThird.json
@@ -31,6 +31,14 @@
               ]
             }
           ]
+        },
+        "systemData": {
+          "createdBy": "string",
+          "createdByType": "User",
+          "createdAt": "2020-02-01T01:01:01.1075056Z",
+          "lastModifiedBy": "string",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
         }
       }
     }
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrations.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrations.json
index a1685f6484cc..49c4c5e57242 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrations.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrations.json
@@ -29,6 +29,14 @@
                   ]
                 }
               ]
+            },
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
             }
           }
         ]
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeFirst.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeFirst.json
index d4a69bb4e362..7c3c4815df58 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeFirst.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeFirst.json
@@ -30,6 +30,14 @@
                   ]
                 }
               ]
+            },
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
             }
           }
         ]
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeSecond.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeSecond.json
index 759da8e45a9f..a312436580fa 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeSecond.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeSecond.json
@@ -32,6 +32,14 @@
                   ]
                 }
               ]
+            },
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
             }
           }
         ]
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeThird.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeThird.json
index 2cd2dfc5db7c..a641d3ecffc8 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeThird.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/examples/Skus_ListByResourceTypeRegistrationsNestedResourceTypeThird.json
@@ -33,6 +33,14 @@
                   ]
                 }
               ]
+            },
+            "systemData": {
+              "createdBy": "string",
+              "createdByType": "User",
+              "createdAt": "2020-02-01T01:01:01.1075056Z",
+              "lastModifiedBy": "string",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-02-01T01:01:01.1075056Z"
             }
           }
         ]
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json
index 00535a63c1ae..4695d71164b8 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/preview/2021-06-01-preview/providerhub.json
@@ -2377,6 +2377,10 @@
             }
           ],
           "description": "Properties of the rollout."
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -2641,6 +2645,10 @@
             }
           ],
           "description": "Properties of the rollout."
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -3557,6 +3565,10 @@
               "$ref": "#/definitions/NotificationRegistrationProperties"
             }
           ]
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -4159,6 +4171,10 @@
               "$ref": "#/definitions/ProviderRegistrationProperties"
             }
           ]
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -4607,6 +4623,9 @@
               "$ref": "#/definitions/ResourceProviderManagement"
             }
           ]
+        },
+        "openApiConfiguration": {
+          "$ref": "#/definitions/OpenApiConfiguration"
         }
       }
     },
@@ -4624,6 +4643,10 @@
               "$ref": "#/definitions/ResourceTypeRegistrationProperties"
             }
           ]
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -4860,6 +4883,10 @@
               "$ref": "#/definitions/ResourceTypeSku"
             }
           ]
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/systemData",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -4879,6 +4906,23 @@
         }
       }
     },
+    "OpenApiConfiguration": {
+      "type": "object",
+      "properties": {
+        "validation": {
+          "$ref": "#/definitions/OpenApiValidation"
+        }
+      }
+    },
+    "OpenApiValidation": {
+      "type": "object",
+      "properties": {
+        "allowNoncompliantCollectionResponse": {
+          "description": "Indicates whether a non compliance response is allowed for a LIST call",
+          "type": "boolean"
+        }
+      }
+    },
     "ResourceManagementEntity": {
       "required": [
         "resourceId"
diff --git a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json
index c0d4179fb1b1..c3c23e46a2ca 100644
--- a/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json
+++ b/specification/providerhub/resource-manager/Microsoft.ProviderHub/stable/2020-11-20/providerhub.json
@@ -3461,6 +3461,28 @@
           "items": {
             "$ref": "#/definitions/NotificationEndpoint"
           }
+        },
+        "provisioningState": {
+          "enum": [
+            "NotSpecified",
+            "Accepted",
+            "Running",
+            "Creating",
+            "Created",
+            "Deleting",
+            "Deleted",
+            "Canceled",
+            "Failed",
+            "Succeeded",
+            "MovingResources",
+            "TransientFailure",
+            "RolloutInProgress"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "ProvisioningState",
+            "modelAsString": true
+          }
         }
       }
     },
@@ -4526,6 +4548,28 @@
           "items": {
             "$ref": "#/definitions/SkuSetting"
           }
+        },
+        "provisioningState": {
+          "enum": [
+            "NotSpecified",
+            "Accepted",
+            "Running",
+            "Creating",
+            "Created",
+            "Deleting",
+            "Deleted",
+            "Canceled",
+            "Failed",
+            "Succeeded",
+            "MovingResources",
+            "TransientFailure",
+            "RolloutInProgress"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "ProvisioningState",
+            "modelAsString": true
+          }
         }
       }
     },