diff --git a/sdk/resourcemanager/ci.mgmt.yml b/sdk/resourcemanager/ci.mgmt.yml
index d8bf790b5988..f28c28a5d39c 100644
--- a/sdk/resourcemanager/ci.mgmt.yml
+++ b/sdk/resourcemanager/ci.mgmt.yml
@@ -79,7 +79,6 @@ trigger:
     - sdk/dnsresolver/Azure.ResourceManager.DnsResolver
     - sdk/dynatrace/Azure.ResourceManager.Dynatrace
     - sdk/edgeorder/Azure.ResourceManager.EdgeOrder
-    - sdk/iotoperations/Azure.ResourceManager.IotOperations
     - sdk/edgezones/Azure.ResourceManager.EdgeZones
     - sdk/elastic/Azure.ResourceManager.Elastic
     - sdk/elasticsan/Azure.ResourceManager.ElasticSan
@@ -108,6 +107,7 @@ trigger:
     - sdk/iot/Azure.ResourceManager.IotFirmwareDefense
     - sdk/iotcentral/Azure.ResourceManager.IotCentral
     - sdk/iothub/Azure.ResourceManager.IotHub
+    - sdk/iotoperations/Azure.ResourceManager.IotOperations
     - sdk/keyvault/Azure.ResourceManager.KeyVault
     - sdk/kubernetesconfiguration/Azure.ResourceManager.KubernetesConfiguration
     - sdk/kusto/Azure.ResourceManager.Kusto
@@ -285,7 +285,6 @@ pr:
     - sdk/dnsresolver/Azure.ResourceManager.DnsResolver
     - sdk/dynatrace/Azure.ResourceManager.Dynatrace
     - sdk/edgeorder/Azure.ResourceManager.EdgeOrder
-    - sdk/iotoperations/Azure.ResourceManager.IotOperations
     - sdk/edgezones/Azure.ResourceManager.EdgeZones
     - sdk/elastic/Azure.ResourceManager.Elastic
     - sdk/elasticsan/Azure.ResourceManager.ElasticSan
@@ -314,6 +313,7 @@ pr:
     - sdk/iot/Azure.ResourceManager.IotFirmwareDefense
     - sdk/iotcentral/Azure.ResourceManager.IotCentral
     - sdk/iothub/Azure.ResourceManager.IotHub
+    - sdk/iotoperations/Azure.ResourceManager.IotOperations
     - sdk/keyvault/Azure.ResourceManager.KeyVault
     - sdk/kubernetesconfiguration/Azure.ResourceManager.KubernetesConfiguration
     - sdk/kusto/Azure.ResourceManager.Kusto
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.Serialization.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.Serialization.cs
index 1761ceeb3c3b..06ec77a6748c 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.Serialization.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.Serialization.cs
@@ -36,8 +36,11 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 throw new FormatException($"The model {nameof(WhatIfChange)} does not support writing '{format}' format.");
             }
 
-            writer.WritePropertyName("resourceId"u8);
-            writer.WriteStringValue(ResourceId);
+            if (Optional.IsDefined(ResourceId))
+            {
+                writer.WritePropertyName("resourceId"u8);
+                writer.WriteStringValue(ResourceId);
+            }
             if (Optional.IsDefined(DeploymentId))
             {
                 writer.WritePropertyName("deploymentId"u8);
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.cs
index 5b12fce886a2..b9db76967bf5 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Models/WhatIfChange.cs
@@ -46,14 +46,9 @@ public partial class WhatIfChange
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of <see cref="WhatIfChange"/>. </summary>
-        /// <param name="resourceId"> Resource ID. </param>
         /// <param name="changeType"> Type of change that will be made to the resource when the deployment is executed. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="resourceId"/> is null. </exception>
-        internal WhatIfChange(string resourceId, WhatIfChangeType changeType)
+        internal WhatIfChange(WhatIfChangeType changeType)
         {
-            Argument.AssertNotNull(resourceId, nameof(resourceId));
-
-            ResourceId = resourceId;
             ChangeType = changeType;
             Delta = new ChangeTrackingList<WhatIfPropertyChange>();
         }
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/autorest.md b/sdk/resources/Azure.ResourceManager.Resources/src/autorest.md
index 07733e3f4250..2ae36fad0734 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/autorest.md
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/autorest.md
@@ -690,11 +690,11 @@ These settings apply only when `--tag=package-resources-2022-04` is specified on
 
 ```yaml $(tag) == 'package-resources-2022-04'
 input-file:
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Resources/stable/2021-05-01/templateSpecs.json
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Resources/stable/2024-11-01/resources.json
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Resources/stable/2023-11-01/bicepClient.json#
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Resources/stable/2024-03-01/deploymentStacks.json
-    - https://github.com/Azure/azure-rest-api-specs/blob/5e5d8196f6ba69545a9c4882ab4769d108b513c9/specification/resources/resource-manager/Microsoft.Resources/stable/2024-08-01/dataBoundaries.json
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Resources/stable/2021-05-01/templateSpecs.json
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Resources/stable/2024-11-01/resources.json
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Resources/stable/2023-11-01/bicepClient.json#
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Resources/stable/2024-03-01/deploymentStacks.json
+    - https://github.com/Azure/azure-rest-api-specs/blob/b87c15a22eedf83e0001b4f511f9dd1e1cb23b3d/specification/resources/resource-manager/Microsoft.Resources/stable/2024-08-01/dataBoundaries.json
 ```
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 2ca0501b60bd..4e749e6b85b1 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -12,6 +12,8 @@ trigger:
     - sdk/storage/Azure.Storage.DataMovement/
     - sdk/storage/Azure.Storage.DataMovement.Blobs/
     - sdk/storage/Azure.Storage.DataMovement.Files/
+    exclude:
+    - sdk/storage/Azure.ResourceManager.Storage/
     - sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/
     exclude:
     - sdk/storage/Azure.ResourceManager.Storage/