diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs
index d02ce8908a3f..04e38a517947 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.Serialization.cs
@@ -34,26 +34,14 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 throw new FormatException($"The model {nameof(AppConfigurationKeyValueDeletedEventData)} does not support writing '{format}' format.");
             }
 
-            if (Optional.IsDefined(Key))
-            {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            if (Optional.IsDefined(Label))
-            {
-                writer.WritePropertyName("label"u8);
-                writer.WriteStringValue(Label);
-            }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(SyncToken))
-            {
-                writer.WritePropertyName("syncToken"u8);
-                writer.WriteStringValue(SyncToken);
-            }
+            writer.WritePropertyName("key"u8);
+            writer.WriteStringValue(Key);
+            writer.WritePropertyName("label"u8);
+            writer.WriteStringValue(Label);
+            writer.WritePropertyName("etag"u8);
+            writer.WriteStringValue(Etag);
+            writer.WritePropertyName("syncToken"u8);
+            writer.WriteStringValue(SyncToken);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs
index b920a0b33dd2..7a4cf1ce7212 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueDeletedEventData.cs
@@ -46,8 +46,22 @@ public partial class AppConfigurationKeyValueDeletedEventData
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueDeletedEventData"/>. </summary>
-        internal AppConfigurationKeyValueDeletedEventData()
+        /// <param name="key"> The key used to identify the key-value that was deleted. </param>
+        /// <param name="label"> The label, if any, used to identify the key-value that was deleted. </param>
+        /// <param name="etag"> The etag representing the key-value that was deleted. </param>
+        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="key"/>, <paramref name="label"/>, <paramref name="etag"/> or <paramref name="syncToken"/> is null. </exception>
+        internal AppConfigurationKeyValueDeletedEventData(string key, string label, string etag, string syncToken)
         {
+            Argument.AssertNotNull(key, nameof(key));
+            Argument.AssertNotNull(label, nameof(label));
+            Argument.AssertNotNull(etag, nameof(etag));
+            Argument.AssertNotNull(syncToken, nameof(syncToken));
+
+            Key = key;
+            Label = label;
+            Etag = etag;
+            SyncToken = syncToken;
         }
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueDeletedEventData"/>. </summary>
@@ -65,6 +79,11 @@ internal AppConfigurationKeyValueDeletedEventData(string key, string label, stri
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
+        /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueDeletedEventData"/> for deserialization. </summary>
+        internal AppConfigurationKeyValueDeletedEventData()
+        {
+        }
+
         /// <summary> The key used to identify the key-value that was deleted. </summary>
         public string Key { get; }
         /// <summary> The label, if any, used to identify the key-value that was deleted. </summary>
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs
index 73f91a283b8c..7c9fc82e85e3 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.Serialization.cs
@@ -34,26 +34,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 throw new FormatException($"The model {nameof(AppConfigurationKeyValueModifiedEventData)} does not support writing '{format}' format.");
             }
 
-            if (Optional.IsDefined(Key))
-            {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            if (Optional.IsDefined(Label))
+            writer.WritePropertyName("key"u8);
+            writer.WriteStringValue(Key);
+            if (Label != null)
             {
                 writer.WritePropertyName("label"u8);
                 writer.WriteStringValue(Label);
             }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(SyncToken))
+            else
             {
-                writer.WritePropertyName("syncToken"u8);
-                writer.WriteStringValue(SyncToken);
+                writer.WriteNull("label");
             }
+            writer.WritePropertyName("etag"u8);
+            writer.WriteStringValue(Etag);
+            writer.WritePropertyName("syncToken"u8);
+            writer.WriteStringValue(SyncToken);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -106,6 +101,11 @@ internal static AppConfigurationKeyValueModifiedEventData DeserializeAppConfigur
                 }
                 if (property.NameEquals("label"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        label = null;
+                        continue;
+                    }
                     label = property.Value.GetString();
                     continue;
                 }
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs
index e03cb8ded63b..1dcc27c11d46 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationKeyValueModifiedEventData.cs
@@ -46,8 +46,21 @@ public partial class AppConfigurationKeyValueModifiedEventData
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueModifiedEventData"/>. </summary>
-        internal AppConfigurationKeyValueModifiedEventData()
+        /// <param name="key"> The key used to identify the key-value that was modified. </param>
+        /// <param name="label"> The label, if any, used to identify the key-value that was modified. </param>
+        /// <param name="etag"> The etag representing the new state of the key-value. </param>
+        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="key"/>, <paramref name="etag"/> or <paramref name="syncToken"/> is null. </exception>
+        internal AppConfigurationKeyValueModifiedEventData(string key, string label, string etag, string syncToken)
         {
+            Argument.AssertNotNull(key, nameof(key));
+            Argument.AssertNotNull(etag, nameof(etag));
+            Argument.AssertNotNull(syncToken, nameof(syncToken));
+
+            Key = key;
+            Label = label;
+            Etag = etag;
+            SyncToken = syncToken;
         }
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueModifiedEventData"/>. </summary>
@@ -65,6 +78,11 @@ internal AppConfigurationKeyValueModifiedEventData(string key, string label, str
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
+        /// <summary> Initializes a new instance of <see cref="AppConfigurationKeyValueModifiedEventData"/> for deserialization. </summary>
+        internal AppConfigurationKeyValueModifiedEventData()
+        {
+        }
+
         /// <summary> The key used to identify the key-value that was modified. </summary>
         public string Key { get; }
         /// <summary> The label, if any, used to identify the key-value that was modified. </summary>
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs
index 319beef466ce..d5d7832fa69b 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotCreatedEventData.cs
@@ -14,8 +14,15 @@ namespace Azure.Messaging.EventGrid.SystemEvents
     public partial class AppConfigurationSnapshotCreatedEventData : AppConfigurationSnapshotEventData
     {
         /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotCreatedEventData"/>. </summary>
-        internal AppConfigurationSnapshotCreatedEventData()
+        /// <param name="name"> The name of the snapshot. </param>
+        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
+        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="etag"/> or <paramref name="syncToken"/> is null. </exception>
+        internal AppConfigurationSnapshotCreatedEventData(string name, string etag, string syncToken) : base(name, etag, syncToken)
         {
+            Argument.AssertNotNull(name, nameof(name));
+            Argument.AssertNotNull(etag, nameof(etag));
+            Argument.AssertNotNull(syncToken, nameof(syncToken));
         }
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotCreatedEventData"/>. </summary>
@@ -26,5 +33,10 @@ internal AppConfigurationSnapshotCreatedEventData()
         internal AppConfigurationSnapshotCreatedEventData(string name, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(name, etag, syncToken, serializedAdditionalRawData)
         {
         }
+
+        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotCreatedEventData"/> for deserialization. </summary>
+        internal AppConfigurationSnapshotCreatedEventData()
+        {
+        }
     }
 }
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs
index 540ed46bcbaf..58a167be5027 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.Serialization.cs
@@ -34,21 +34,12 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 throw new FormatException($"The model {nameof(AppConfigurationSnapshotEventData)} does not support writing '{format}' format.");
             }
 
-            if (Optional.IsDefined(Name))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(Name);
-            }
-            if (Optional.IsDefined(Etag))
-            {
-                writer.WritePropertyName("etag"u8);
-                writer.WriteStringValue(Etag);
-            }
-            if (Optional.IsDefined(SyncToken))
-            {
-                writer.WritePropertyName("syncToken"u8);
-                writer.WriteStringValue(SyncToken);
-            }
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            writer.WritePropertyName("etag"u8);
+            writer.WriteStringValue(Etag);
+            writer.WritePropertyName("syncToken"u8);
+            writer.WriteStringValue(SyncToken);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs
index a64d0e66a4fc..43c5283bd828 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotEventData.cs
@@ -46,8 +46,19 @@ public partial class AppConfigurationSnapshotEventData
         private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotEventData"/>. </summary>
-        internal AppConfigurationSnapshotEventData()
+        /// <param name="name"> The name of the snapshot. </param>
+        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
+        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="etag"/> or <paramref name="syncToken"/> is null. </exception>
+        internal AppConfigurationSnapshotEventData(string name, string etag, string syncToken)
         {
+            Argument.AssertNotNull(name, nameof(name));
+            Argument.AssertNotNull(etag, nameof(etag));
+            Argument.AssertNotNull(syncToken, nameof(syncToken));
+
+            Name = name;
+            Etag = etag;
+            SyncToken = syncToken;
         }
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotEventData"/>. </summary>
@@ -63,6 +74,11 @@ internal AppConfigurationSnapshotEventData(string name, string etag, string sync
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
+        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotEventData"/> for deserialization. </summary>
+        internal AppConfigurationSnapshotEventData()
+        {
+        }
+
         /// <summary> The name of the snapshot. </summary>
         public string Name { get; }
         /// <summary> The etag representing the new state of the snapshot. </summary>
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs
index cd89dfdb11d1..b2164f525aa9 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/src/Generated/AppConfigurationSnapshotModifiedEventData.cs
@@ -14,8 +14,15 @@ namespace Azure.Messaging.EventGrid.SystemEvents
     public partial class AppConfigurationSnapshotModifiedEventData : AppConfigurationSnapshotEventData
     {
         /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotModifiedEventData"/>. </summary>
-        internal AppConfigurationSnapshotModifiedEventData()
+        /// <param name="name"> The name of the snapshot. </param>
+        /// <param name="etag"> The etag representing the new state of the snapshot. </param>
+        /// <param name="syncToken"> The sync token representing the server state after the event. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="etag"/> or <paramref name="syncToken"/> is null. </exception>
+        internal AppConfigurationSnapshotModifiedEventData(string name, string etag, string syncToken) : base(name, etag, syncToken)
         {
+            Argument.AssertNotNull(name, nameof(name));
+            Argument.AssertNotNull(etag, nameof(etag));
+            Argument.AssertNotNull(syncToken, nameof(syncToken));
         }
 
         /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotModifiedEventData"/>. </summary>
@@ -26,5 +33,10 @@ internal AppConfigurationSnapshotModifiedEventData()
         internal AppConfigurationSnapshotModifiedEventData(string name, string etag, string syncToken, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(name, etag, syncToken, serializedAdditionalRawData)
         {
         }
+
+        /// <summary> Initializes a new instance of <see cref="AppConfigurationSnapshotModifiedEventData"/> for deserialization. </summary>
+        internal AppConfigurationSnapshotModifiedEventData()
+        {
+        }
     }
 }
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml
index d1155a2c95e9..9b69ef4c7ff5 100644
--- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml
+++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml
@@ -1,3 +1,4 @@
+directory: specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents
+commit: 6afaa933b9f65673fb7ce3943ff0e31dc9b68467
 repo: Azure/azure-rest-api-specs
-directory: "specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents"
-commit: 8af03db33a90581edffb8a32fea562f36b7c61a8
+additionalDirectories: