diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 271bbce4e36c..c39dffcab083 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -228,7 +228,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241009.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241009.4" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json
index 76c6c33de092..d11c42a1a6c4 100644
--- a/eng/emitter-package-lock.json
+++ b/eng/emitter-package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@azure-tools/typespec-csharp": "0.2.0-beta.20241009.1"
+        "@azure-tools/typespec-csharp": "0.2.0-beta.20241009.4"
       },
       "devDependencies": {
         "@azure-tools/typespec-autorest": "0.46.0",
@@ -22,9 +22,9 @@
       }
     },
     "node_modules/@autorest/csharp": {
-      "version": "3.0.0-beta.20241009.1",
-      "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20241009.1.tgz",
-      "integrity": "sha512-ELTmhuE+Wk7pWkmcK5X0Sn5ovs4M9fncL02uvvANDVaWfae3iBJY+jfPIjbDaIcZsSxrrnXP2iy+8n0xSRyNPg=="
+      "version": "3.0.0-beta.20241009.4",
+      "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20241009.4.tgz",
+      "integrity": "sha512-pBsPfw1f3p6EmQ2yKdbpwUIKIOoqJHk0qhr5O2Kwp8rg0/bx9yUMRk74VBd2mIknLF5OOWhV99oUjnX1USJMSA=="
     },
     "node_modules/@azure-tools/typespec-autorest": {
       "version": "0.46.0",
@@ -117,12 +117,12 @@
       }
     },
     "node_modules/@azure-tools/typespec-csharp": {
-      "version": "0.2.0-beta.20241009.1",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-beta.20241009.1.tgz",
-      "integrity": "sha512-n+3U0ZUZZGwClVkbwyK+Zbs9jcQt5PyrMDhh98R+WQrVgyuHFUEtUMEz8VW5IaryGiFQ7CgRluh9OzkUc2ZViA==",
+      "version": "0.2.0-beta.20241009.4",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-beta.20241009.4.tgz",
+      "integrity": "sha512-pA/iB/5C1cu+/eRjuEMxTbsLIoppq7i1CErmZcnso8r/7UWHPHiSINe1o9j20WU2KC3gQp8SaTmBeL1fes8q/A==",
       "dependencies": {
-        "@autorest/csharp": "3.0.0-beta.20241009.1",
-        "@typespec/http-client-csharp": "0.1.9-alpha.20240925.1",
+        "@autorest/csharp": "3.0.0-beta.20241009.4",
+        "@typespec/http-client-csharp": "0.1.9-alpha.20241009.1",
         "json-serialize-refs": "0.1.0-0"
       },
       "peerDependencies": {
@@ -265,9 +265,9 @@
       }
     },
     "node_modules/@typespec/http-client-csharp": {
-      "version": "0.1.9-alpha.20240925.1",
-      "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20240925.1.tgz",
-      "integrity": "sha512-lQaWMaTSTxIxWLO9q6Z11YqyT+E1Ij5jiwnqNyycfLMDcfQj4hN/K4jCrS9SBI2Sr43H02mReqRJXAxp4fz7vQ==",
+      "version": "0.1.9-alpha.20241009.1",
+      "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20241009.1.tgz",
+      "integrity": "sha512-58J4RsAuqzDdxvX0RalpUGCfxEEw0M2IpCWsM5kd4WS2ZQ2CghUk9k0c3kwMRsyv/esNAIQIJ87eq7LI9wRY3A==",
       "dependencies": {
         "json-serialize-refs": "0.1.0-0"
       },
diff --git a/eng/emitter-package.json b/eng/emitter-package.json
index a9cca2a96246..3690648e4a45 100644
--- a/eng/emitter-package.json
+++ b/eng/emitter-package.json
@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-csharp": "0.2.0-beta.20241009.1"
+    "@azure-tools/typespec-csharp": "0.2.0-beta.20241009.4"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.46.0",
diff --git a/sdk/communication/Azure.Communication.Messages/tspCodeModel.json b/sdk/communication/Azure.Communication.Messages/tspCodeModel.json
index 9fe924877754..e3335a719bf8 100644
--- a/sdk/communication/Azure.Communication.Messages/tspCodeModel.json
+++ b/sdk/communication/Azure.Communication.Messages/tspCodeModel.json
@@ -547,6 +547,7 @@
     "optional": false,
     "readOnly": false,
     "discriminator": true,
+    "flatten": false,
     "decorators": [],
     "crossLanguageDefinitionId": "Azure.Communication.MessagesService.NotificationContent.kind"
    },
@@ -574,6 +575,7 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Communication.MessagesService.NotificationContent.channelRegistrationId"
     },
@@ -600,6 +602,7 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Communication.MessagesService.NotificationContent.to"
     },
@@ -644,6 +647,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": true,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.TextNotificationContent.kind"
       },
@@ -663,6 +667,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": false,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.TextNotificationContent.content"
       }
@@ -703,6 +708,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": true,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MediaNotificationContent.kind"
       },
@@ -722,6 +728,7 @@
        "optional": true,
        "readOnly": false,
        "discriminator": false,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MediaNotificationContent.content"
       },
@@ -741,6 +748,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": false,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MediaNotificationContent.mediaUri"
       }
@@ -781,6 +789,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": true,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.TemplateNotificationContent.kind"
       },
@@ -815,6 +824,7 @@
           "optional": false,
           "readOnly": false,
           "discriminator": false,
+          "flatten": false,
           "decorators": [],
           "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplate.name"
          },
@@ -834,6 +844,7 @@
           "optional": false,
           "readOnly": false,
           "discriminator": false,
+          "flatten": false,
           "decorators": [],
           "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplate.language"
          },
@@ -867,6 +878,7 @@
              "optional": false,
              "readOnly": false,
              "discriminator": true,
+             "flatten": false,
              "decorators": [],
              "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateValue.kind"
             },
@@ -887,6 +899,7 @@
               "optional": false,
               "readOnly": false,
               "discriminator": false,
+              "flatten": false,
               "decorators": [],
               "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateValue.name"
              },
@@ -931,6 +944,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": true,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateText.kind"
                },
@@ -950,6 +964,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateText.text"
                }
@@ -990,6 +1005,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": true,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateImage.kind"
                },
@@ -1009,6 +1025,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateImage.url"
                },
@@ -1028,6 +1045,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateImage.caption"
                },
@@ -1047,6 +1065,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateImage.fileName"
                }
@@ -1087,6 +1106,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": true,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateDocument.kind"
                },
@@ -1106,6 +1126,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateDocument.url"
                },
@@ -1125,6 +1146,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateDocument.caption"
                },
@@ -1144,6 +1166,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateDocument.fileName"
                }
@@ -1184,6 +1207,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": true,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateVideo.kind"
                },
@@ -1203,6 +1227,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateVideo.url"
                },
@@ -1222,6 +1247,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateVideo.caption"
                },
@@ -1241,6 +1267,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateVideo.fileName"
                }
@@ -1281,6 +1308,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": true,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateLocation.kind"
                },
@@ -1300,6 +1328,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateLocation.locationName"
                },
@@ -1319,6 +1348,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateLocation.address"
                },
@@ -1338,6 +1368,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateLocation.latitude"
                },
@@ -1357,6 +1388,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateLocation.longitude"
                }
@@ -1397,6 +1429,7 @@
                 "optional": false,
                 "readOnly": false,
                 "discriminator": true,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateQuickAction.kind"
                },
@@ -1416,6 +1449,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateQuickAction.text"
                },
@@ -1435,6 +1469,7 @@
                 "optional": true,
                 "readOnly": false,
                 "discriminator": false,
+                "flatten": false,
                 "decorators": [],
                 "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateQuickAction.payload"
                }
@@ -1448,6 +1483,7 @@
           "optional": true,
           "readOnly": false,
           "discriminator": false,
+          "flatten": false,
           "decorators": [],
           "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplate.values"
          },
@@ -1477,6 +1513,7 @@
             "optional": false,
             "readOnly": false,
             "discriminator": true,
+            "flatten": false,
             "decorators": [],
             "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateBindings.kind"
            },
@@ -1522,6 +1559,7 @@
                "optional": false,
                "readOnly": false,
                "discriminator": true,
+               "flatten": false,
                "decorators": [],
                "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindings.kind"
               },
@@ -1560,6 +1598,7 @@
                    "optional": false,
                    "readOnly": false,
                    "discriminator": false,
+                   "flatten": false,
                    "decorators": [],
                    "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindingsComponent.refValue"
                   }
@@ -1571,6 +1610,7 @@
                "optional": true,
                "readOnly": false,
                "discriminator": false,
+               "flatten": false,
                "decorators": [],
                "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindings.header"
               },
@@ -1593,6 +1633,7 @@
                "optional": true,
                "readOnly": false,
                "discriminator": false,
+               "flatten": false,
                "decorators": [],
                "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindings.body"
               },
@@ -1615,6 +1656,7 @@
                "optional": true,
                "readOnly": false,
                "discriminator": false,
+               "flatten": false,
                "decorators": [],
                "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindings.footer"
               },
@@ -1649,6 +1691,7 @@
                    "optional": false,
                    "readOnly": false,
                    "discriminator": false,
+                   "flatten": false,
                    "decorators": [],
                    "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindingsButton.subType"
                   },
@@ -1668,6 +1711,7 @@
                    "optional": false,
                    "readOnly": false,
                    "discriminator": false,
+                   "flatten": false,
                    "decorators": [],
                    "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindingsButton.refValue"
                   }
@@ -1679,6 +1723,7 @@
                "optional": true,
                "readOnly": false,
                "discriminator": false,
+               "flatten": false,
                "decorators": [],
                "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateBindings.buttons"
               }
@@ -1689,6 +1734,7 @@
           "optional": true,
           "readOnly": false,
           "discriminator": false,
+          "flatten": false,
           "decorators": [],
           "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplate.bindings"
          }
@@ -1697,6 +1743,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": false,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.TemplateNotificationContent.template"
       }
@@ -1793,6 +1840,7 @@
          "optional": false,
          "readOnly": false,
          "discriminator": false,
+         "flatten": false,
          "decorators": [],
          "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageReceipt.messageId"
         },
@@ -1812,6 +1860,7 @@
          "optional": false,
          "readOnly": false,
          "discriminator": false,
+         "flatten": false,
          "decorators": [],
          "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageReceipt.to"
         }
@@ -1823,6 +1872,7 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Communication.MessagesService.SendMessageResult.receipts"
     }
@@ -1851,6 +1901,7 @@
     "optional": false,
     "readOnly": false,
     "discriminator": true,
+    "flatten": false,
     "decorators": [],
     "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateItem.kind"
    },
@@ -1871,6 +1922,7 @@
      "optional": false,
      "readOnly": true,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateItem.name"
     },
@@ -1890,6 +1942,7 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateItem.language"
     },
@@ -1905,6 +1958,7 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Communication.MessagesService.MessageTemplateItem.status"
     },
@@ -1943,6 +1997,7 @@
        "optional": true,
        "readOnly": false,
        "discriminator": false,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateItem.content"
       },
@@ -1968,6 +2023,7 @@
        "optional": false,
        "readOnly": false,
        "discriminator": true,
+       "flatten": false,
        "decorators": [],
        "crossLanguageDefinitionId": "Azure.Communication.MessagesService.WhatsAppMessageTemplateItem.kind"
       }
@@ -2006,6 +2062,7 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Core.Foundations.CustomPage.value"
     },
@@ -2032,6 +2089,7 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "Azure.Core.Foundations.CustomPage.nextLink"
     }