diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/common/v1/definitions.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/common/v1/definitions.json
index 632741319486..cbaaec913549 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/common/v1/definitions.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/common/v1/definitions.json
@@ -35,7 +35,8 @@
       "x-ms-enum": {
         "name": "AuthenticationMode",
         "modelAsString": true
-      }
+      },
+      "default": "ConnectionString"
     },
     "Resource": {
       "type": "object",
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2020-03-01-preview/clusters.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2020-03-01-preview/clusters.json
index c06405bb7968..1d1740c1541c 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2020-03-01-preview/clusters.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2020-03-01-preview/clusters.json
@@ -498,7 +498,7 @@
           "type": "integer",
           "format": "int32",
           "minimum": 36,
-          "maximum": 216
+          "maximum": 396
         }
       }
     },
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/examples/Input_Create_Reference_File.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/examples/Input_Create_Reference_File.json
new file mode 100644
index 000000000000..b593b05a1f0b
--- /dev/null
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/examples/Input_Create_Reference_File.json
@@ -0,0 +1,60 @@
+{
+  "parameters": {
+    "api-version": "2020-03-01",
+    "subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
+    "resourceGroupName": "sjrg8440",
+    "jobName": "sj9597",
+    "inputName": "input7225",
+    "input": {
+      "properties": {
+        "type": "Reference",
+        "datasource": {
+          "type": "File",
+          "properties": {
+            "path": "my/path"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
+        "name": "input7225",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
+        "properties": {
+          "type": "Reference",
+          "datasource": {
+            "type": "File",
+            "properties": {
+              "path": "my/path"
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "headers": {
+        "ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
+        "name": "input7225",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
+        "properties": {
+          "type": "Reference",
+          "datasource": {
+            "type": "File",
+            "properties": {
+              "path": "my/path"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/inputs.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/inputs.json
index 4a246448c8da..0ecc594b9b5e 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/inputs.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/inputs.json
@@ -58,6 +58,9 @@
           },
           "Create an Event Grid input": {
             "$ref": "./examples/Input_Create_EventGrid.json"
+          },
+          "Create a reference file input": {
+            "$ref": "./examples/Input_Create_Reference_File.json"
           }
         },
         "parameters": [
@@ -690,6 +693,33 @@
         "type"
       ]
     },
+    "FileReferenceInputDataSource": {
+      "type": "object",
+      "description": "Describes a file input data source that contains reference data.",
+      "x-ms-discriminator-value": "File",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ReferenceInputDataSource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/FileReferenceInputDataSourceProperties",
+          "description": "The properties that are associated with a file input containing reference data. Required on PUT (CreateOrReplace) requests.",
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "FileReferenceInputDataSourceProperties": {
+      "type": "object",
+      "description": "The properties that are associated with a file input containing reference data.",
+      "properties": {
+        "path": {
+          "type": "string",
+          "description": "The path of the file."
+        }
+      }
+    },
     "BlobReferenceInputDataSource": {
       "type": "object",
       "description": "Describes a blob input data source that contains reference data.",
@@ -1185,7 +1215,8 @@
       "x-ms-enum": {
         "name": "CompressionType",
         "modelAsString": true
-      }
+      },
+      "default": "None"
     },
     "AzureSqlReferenceInputDataSource": {
       "type": "object",
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/streamingjobs.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/streamingjobs.json
index bf56d8b827a6..55fcf3c27d72 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/streamingjobs.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/streamingjobs.json
@@ -936,11 +936,13 @@
       "properties": {
         "tenantId": {
           "type": "string",
-          "description": "The tenantId of the identity."
+          "description": "The tenantId of the identity.",
+          "readOnly": true
         },
         "principalId": {
           "type": "string",
-          "description": "The principalId of the identity."
+          "description": "The principalId of the identity.",
+          "readOnly": true
         },
         "type": {
           "type": "string",
@@ -1007,7 +1009,7 @@
         "Nonblocking"
       ],
       "x-ms-enum": {
-        "name": "RefreshType",
+        "name": "UpdatableUdfRefreshType",
         "modelAsString": true
       }
     }
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/transformations.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/transformations.json
index ea984fd8c45c..91763726ec02 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/transformations.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/preview/2021-10-01-preview/transformations.json
@@ -261,7 +261,8 @@
         "streamingUnits": {
           "type": "integer",
           "format": "int32",
-          "description": "Specifies the number of streaming units that the streaming job uses."
+          "description": "Specifies the number of streaming units that the streaming job uses.",
+          "default": 3
         },
         "validStreamingUnits": {
           "type": "array",
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/clusters.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/clusters.json
index 3ae5ccff6c58..7ec5dcafdb4f 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/clusters.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/clusters.json
@@ -505,7 +505,7 @@
           "type": "integer",
           "format": "int32",
           "minimum": 36,
-          "maximum": 216
+          "maximum": 396
         }
       }
     },
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_GatewayMessageBus.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_GatewayMessageBus.json
new file mode 100644
index 000000000000..60ee2b82c07e
--- /dev/null
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_GatewayMessageBus.json
@@ -0,0 +1,60 @@
+{
+  "parameters": {
+    "api-version": "2021-10-01-preview",
+    "subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
+    "resourceGroupName": "sjrg3467",
+    "jobName": "sj9742",
+    "inputName": "input7970",
+    "input": {
+      "properties": {
+        "type": "Stream",
+        "datasource": {
+          "type": "GatewayMessageBus",
+          "properties": {
+            "topic": "EdgeTopic1"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "ETag": "bd8009b3-8165-4bd3-aad2-29a2b378dd14"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg3467/providers/Microsoft.StreamAnalytics/streamingjobs/sj9742/inputs/input7970",
+        "name": "input7970",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
+        "properties": {
+          "type": "Stream",
+          "datasource": {
+            "type": "GatewayMessageBus",
+            "properties": {
+              "topic": "EdgeTopic1"
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "headers": {
+        "ETag": "bd8009b3-8165-4bd3-aad2-29a2b378dd14"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg3467/providers/Microsoft.StreamAnalytics/streamingjobs/sj9742/inputs/input7970",
+        "name": "input7970",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
+        "properties": {
+          "type": "Stream",
+          "datasource": {
+            "type": "GatewayMessageBus",
+            "properties": {
+              "topic": "EdgeTopic1"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_Reference_File.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_Reference_File.json
new file mode 100644
index 000000000000..b593b05a1f0b
--- /dev/null
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Input_Create_Reference_File.json
@@ -0,0 +1,60 @@
+{
+  "parameters": {
+    "api-version": "2020-03-01",
+    "subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
+    "resourceGroupName": "sjrg8440",
+    "jobName": "sj9597",
+    "inputName": "input7225",
+    "input": {
+      "properties": {
+        "type": "Reference",
+        "datasource": {
+          "type": "File",
+          "properties": {
+            "path": "my/path"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
+        "name": "input7225",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
+        "properties": {
+          "type": "Reference",
+          "datasource": {
+            "type": "File",
+            "properties": {
+              "path": "my/path"
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "headers": {
+        "ETag": "c987701d-4039-47aa-a115-ad84f67d07c5"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg8440/providers/Microsoft.StreamAnalytics/streamingjobs/sj9597/inputs/input7225",
+        "name": "input7225",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/inputs",
+        "properties": {
+          "type": "Reference",
+          "datasource": {
+            "type": "File",
+            "properties": {
+              "path": "my/path"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Output_Create_GatewayMessageBus.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Output_Create_GatewayMessageBus.json
new file mode 100644
index 000000000000..7fc9e0200cb6
--- /dev/null
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/examples/Output_Create_GatewayMessageBus.json
@@ -0,0 +1,57 @@
+{
+  "parameters": {
+    "api-version": "2021-10-01-preview",
+    "subscriptionId": "56b5e0a9-b645-407d-99b0-c64f86013e3d",
+    "resourceGroupName": "sjrg7983",
+    "jobName": "sj2331",
+    "outputName": "output3022",
+    "output": {
+      "properties": {
+        "datasource": {
+          "type": "GatewayMessageBus",
+          "properties": {
+            "topic": "EdgeTopic1"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {
+        "ETag": "ccf8b864-259e-43c5-a628-ba10858b2c07"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg7983/providers/Microsoft.StreamAnalytics/streamingjobs/sj2331/outputs/output3022",
+        "name": "output3022",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/outputs",
+        "properties": {
+          "datasource": {
+            "type": "GatewayMessageBus",
+            "properties": {
+              "topic": "EdgeTopic1"
+            }
+          }
+        }
+      }
+    },
+    "200": {
+      "headers": {
+        "ETag": "ccf8b864-259e-43c5-a628-ba10858b2c07"
+      },
+      "body": {
+        "id": "/subscriptions/56b5e0a9-b645-407d-99b0-c64f86013e3d/resourceGroups/sjrg7983/providers/Microsoft.StreamAnalytics/streamingjobs/sj2331/outputs/output3022",
+        "name": "output3022",
+        "type": "Microsoft.StreamAnalytics/streamingjobs/outputs",
+        "properties": {
+          "datasource": {
+            "type": "GatewayMessageBus",
+            "properties": {
+              "topic": "EdgeTopic1"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/inputs.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/inputs.json
index 0588368d5806..098dc213290e 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/inputs.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/inputs.json
@@ -52,6 +52,12 @@
           },
           "Create a stream IoT Hub input with Avro serialization": {
             "$ref": "./examples/Input_Create_Stream_IoTHub_Avro.json"
+          },
+          "Create a Gateway Message Bus input": {
+            "$ref": "./examples/Input_Create_GatewayMessageBus.json"
+          },
+          "Create a reference file input": {
+            "$ref": "./examples/Input_Create_Reference_File.json"
           }
         },
         "parameters": [
@@ -657,6 +663,33 @@
         "type"
       ]
     },
+    "FileReferenceInputDataSource": {
+      "type": "object",
+      "description": "Describes a file input data source that contains reference data.",
+      "x-ms-discriminator-value": "File",
+      "allOf": [
+        {
+          "$ref": "#/definitions/ReferenceInputDataSource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/FileReferenceInputDataSourceProperties",
+          "description": "The properties that are associated with a file input containing reference data. Required on PUT (CreateOrReplace) requests.",
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "FileReferenceInputDataSourceProperties": {
+      "type": "object",
+      "description": "The properties that are associated with a file input containing reference data.",
+      "properties": {
+        "path": {
+          "type": "string",
+          "description": "The path of the file."
+        }
+      }
+    },
     "BlobReferenceInputDataSource": {
       "type": "object",
       "description": "Describes a blob input data source that contains reference data.",
@@ -1060,7 +1093,8 @@
       "x-ms-enum": {
         "name": "CompressionType",
         "modelAsString": true
-      }
+      },
+      "default": "None"
     },
     "AzureSqlReferenceInputDataSource": {
       "type": "object",
@@ -1123,6 +1157,42 @@
         }
       }
     },
+    "GatewayMessageBusStreamInputDataSource": {
+      "description": "Describes a blob input data source that contains stream data.",
+      "type": "object",
+      "x-ms-discriminator-value": "GatewayMessageBus",
+      "allOf": [
+        {
+          "$ref": "#/definitions/StreamInputDataSource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/GatewayMessageBusStreamInputDataSourceProperties",
+          "description": "The properties that are associated with a gateway message bus input containing stream data.",
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "GatewayMessageBusStreamInputDataSourceProperties": {
+      "description": "The properties that are associated with a gateway message bus input containing stream data.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/GatewayMessageBusSourceProperties"
+        }
+      ]
+    },
+    "GatewayMessageBusSourceProperties": {
+      "description": "The properties that are associated with a gateway message bus datasource.",
+      "type": "object",
+      "properties": {
+        "topic": {
+          "type": "string",
+          "description": "The name of the Service Bus topic."
+        }
+      }
+    },
     "RefreshType": {
       "type": "string",
       "description": "Indicates the type of data refresh option.",
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/outputs.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/outputs.json
index 1e5ac0667c8e..51845944f6fd 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/outputs.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/outputs.json
@@ -73,6 +73,9 @@
           },
           "Create an Azure Data Lake Store output with JSON serialization": {
             "$ref": "./examples/Output_Create_AzureDataLakeStore_JSON.json"
+          },
+          "Create a Gateway Message Bus output": {
+            "$ref": "./examples/Output_Create_GatewayMessageBus.json"
           }
         },
         "parameters": [
@@ -567,7 +570,13 @@
         {
           "$ref": "./inputs.json#/definitions/BlobDataSourceProperties"
         }
-      ]
+      ],
+      "properties": {
+        "blobPathPrefix": {
+          "type": "string",
+          "description": "Blob path prefix."
+        }
+      }
     },
     "AzureTableOutputDataSource": {
       "type": "object",
@@ -1041,6 +1050,32 @@
         }
       }
     },
+    "GatewayMessageBusOutputDataSource": {
+      "type": "object",
+      "description": "Describes a Gateway Message Bus output data source.",
+      "x-ms-discriminator-value": "GatewayMessageBus",
+      "allOf": [
+        {
+          "$ref": "#/definitions/OutputDataSource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/GatewayMessageBusOutputDataSourceProperties",
+          "description": "The properties that are associated with a Gateway Message Bus output. Required on PUT (CreateOrReplace) requests.",
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "GatewayMessageBusOutputDataSourceProperties": {
+      "type": "object",
+      "description": "The properties that are associated with a Gateway Message Bus.",
+      "allOf": [
+        {
+          "$ref": "./inputs.json#/definitions/GatewayMessageBusSourceProperties"
+        }
+      ]
+    },
     "OutputListResult": {
       "type": "object",
       "properties": {
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/streamingjobs.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/streamingjobs.json
index 5ffcdc4a0348..8ac7fcbb86e9 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/streamingjobs.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/streamingjobs.json
@@ -935,11 +935,13 @@
       "properties": {
         "tenantId": {
           "type": "string",
-          "description": "The identity tenantId"
+          "description": "The identity tenantId",
+          "readOnly": true
         },
         "principalId": {
           "type": "string",
-          "description": "The identity principal ID"
+          "description": "The identity principal ID",
+          "readOnly": true
         },
         "type": {
           "type": "string",
diff --git a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/transformations.json b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/transformations.json
index c62eea89d688..f10accae8fb4 100644
--- a/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/transformations.json
+++ b/specification/streamanalytics/resource-manager/Microsoft.StreamAnalytics/stable/2020-03-01/transformations.json
@@ -261,7 +261,8 @@
         "streamingUnits": {
           "type": "integer",
           "format": "int32",
-          "description": "Specifies the number of streaming units that the streaming job uses."
+          "description": "Specifies the number of streaming units that the streaming job uses.",
+          "default": 3
         },
         "validStreamingUnits": {
           "type": "array",