diff --git a/.github/actions/setup-node-install-deps/action.yaml b/.github/actions/setup-node-install-deps/action.yaml
index c34d9a0c8596..6c99a0ee1280 100644
--- a/.github/actions/setup-node-install-deps/action.yaml
+++ b/.github/actions/setup-node-install-deps/action.yaml
@@ -7,7 +7,7 @@ inputs:
     default: 22.x
   install-command:
     description: "Command to install dependencies"
-    default: "npm ci"
+    default: "npm install --no-package-lock --force"
   working-directory:
     description: "Working directory"
     default: "."
diff --git a/.github/workflows/typespec-validation-all.yaml b/.github/workflows/typespec-validation-all.yaml
index 283f6786dae6..2129b7d81775 100644
--- a/.github/workflows/typespec-validation-all.yaml
+++ b/.github/workflows/typespec-validation-all.yaml
@@ -74,7 +74,7 @@ jobs:
 
       - name: git merge origin/main
         run: |
-          git merge --no-commit -Xours origin/main
+          git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge --no-commit -Xours origin/main
           git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" commit --allow-empty -m "Merge origin/main"
 
       - name: Setup Node and install deps
diff --git a/.github/workflows/typespec-validation.yaml b/.github/workflows/typespec-validation.yaml
index 63318fae9373..fd8201f31213 100644
--- a/.github/workflows/typespec-validation.yaml
+++ b/.github/workflows/typespec-validation.yaml
@@ -18,7 +18,7 @@ jobs:
 
       - name: git merge origin/main
         run: |
-          git merge --no-commit -Xours origin/main
+          git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge --no-commit -Xours origin/main
           git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" commit --allow-empty -m "Merge origin/main"
 
       - name: Setup Node and install deps
diff --git a/eng/pipelines/templates/steps/npm-install.yml b/eng/pipelines/templates/steps/npm-install.yml
index 54baf281b53a..21e9acb50165 100644
--- a/eng/pipelines/templates/steps/npm-install.yml
+++ b/eng/pipelines/templates/steps/npm-install.yml
@@ -11,8 +11,8 @@ steps:
     parameters:
       NodeVersion: ${{ parameters.NodeVersion }}
 
-  - script: npm install --no-package-lock
-    displayName: npm install --no-package-lock
+  - script: npm install --no-package-lock --force
+    displayName: npm install --no-package-lock --force
     workingDirectory: ${{ parameters.WorkingDirectory }}
 
   - script: npm ls -a || true
diff --git a/package.json b/package.json
index 4095f764b88c..fbfad785904c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "@azure-tools/typespec-autorest": "next",
     "@azure-tools/typespec-azure-core": "next",
     "@azure-tools/typespec-azure-portal-core": "next",
-    "@azure-tools/typespec-azure-resource-manager": "next",
+    "@azure-tools/typespec-azure-resource-manager": "https://pkg.pr.new/Azure/typespec-azure/@azure-tools/typespec-azure-resource-manager@3138",
     "@azure-tools/typespec-azure-rulesets": "next",
     "@azure-tools/typespec-client-generator-cli": "0.27.0",
     "@azure-tools/typespec-client-generator-core": "next",
@@ -34,7 +34,7 @@
     "@azure-tools/typespec-autorest": "next",
     "@azure-tools/typespec-azure-core": "next",
     "@azure-tools/typespec-azure-portal-core": "next",
-    "@azure-tools/typespec-azure-resource-manager": "next",
+    "@azure-tools/typespec-azure-resource-manager": "https://pkg.pr.new/Azure/typespec-azure/@azure-tools/typespec-azure-resource-manager@3138",
     "@azure-tools/typespec-client-generator-core": "next",
     "@azure-tools/typespec-azure-rulesets": "next",
     "@typespec/asset-emitter": "next",
diff --git a/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/preview/2025-04-11-preview/azuredatatransfer.json b/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/preview/2025-04-11-preview/azuredatatransfer.json
index ad1c6745adc0..e618ba97cd59 100644
--- a/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/preview/2025-04-11-preview/azuredatatransfer.json
+++ b/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/preview/2025-04-11-preview/azuredatatransfer.json
@@ -2809,6 +2809,10 @@
       "type": "string",
       "description": "Represents an Azure Resource Type."
     },
+    "Azure.Core.azureLocation": {
+      "type": "string",
+      "description": "Represents an Azure geography region where supported resource providers live."
+    },
     "Connection": {
       "type": "object",
       "description": "The connection resource definition.",
@@ -3811,7 +3815,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",
@@ -4047,7 +4051,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",
diff --git a/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/stable/2025-05-21/azuredatatransfer.json b/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/stable/2025-05-21/azuredatatransfer.json
index b7ffdf26de19..80da7258379b 100644
--- a/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/stable/2025-05-21/azuredatatransfer.json
+++ b/specification/azuredatatransfer/resource-manager/Microsoft.AzureDataTransfer/stable/2025-05-21/azuredatatransfer.json
@@ -2809,6 +2809,10 @@
       "type": "string",
       "description": "Represents an Azure Resource Type."
     },
+    "Azure.Core.azureLocation": {
+      "type": "string",
+      "description": "Represents an Azure geography region where supported resource providers live."
+    },
     "Connection": {
       "type": "object",
       "description": "The connection resource definition.",
@@ -3811,7 +3815,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",
@@ -4047,7 +4051,7 @@
           }
         },
         "location": {
-          "type": "string",
+          "$ref": "#/definitions/Azure.Core.azureLocation",
           "description": "The geo-location where the resource lives",
           "x-ms-mutability": [
             "read",