diff --git a/.github/workflows/Assign_Issue_Volunteer.yml b/.github/workflows/Assign_Issue_Volunteer.yml
index 23ef1d16ffc0..fe199038b2e5 100644
--- a/.github/workflows/Assign_Issue_Volunteer.yml
+++ b/.github/workflows/Assign_Issue_Volunteer.yml
@@ -5,6 +5,6 @@ jobs:
   build:
     runs-on: ubuntu-slim
     steps:
-      - uses: bhermann/issue-volunteer@v0.1.12
+      - uses: bhermann/issue-volunteer@v0.1.20
         with:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/Comment_on_Issues.yml b/.github/workflows/Comment_on_Issues.yml
index c408d8b38c84..6a6014f38dcd 100644
--- a/.github/workflows/Comment_on_Issues.yml
+++ b/.github/workflows/Comment_on_Issues.yml
@@ -12,7 +12,7 @@ jobs:
       issues: write
     steps:
       - name: Add Comment
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
diff --git a/.github/workflows/auto_comments.yml b/.github/workflows/auto_comments.yml
index 6cd003a36ae8..9a7664c9007c 100644
--- a/.github/workflows/auto_comments.yml
+++ b/.github/workflows/auto_comments.yml
@@ -17,7 +17,7 @@ jobs:
       # 1) If the comment includes '!notasponsor', delete it using GitHub Script
       - name: Delete !notasponsor comment
         if: contains(github.event.comment.body, '!notasponsor')
-        uses: actions/github-script@v6
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -30,7 +30,7 @@ jobs:
       # 2) Post a sponsor-specific reply
       - name: Reply to !notasponsor
         if: contains(github.event.comment.body, '!notasponsor')
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
@@ -51,7 +51,7 @@ jobs:
       # 3) If the comment includes '!support', classify as a support request
       - name: Reply to !support
         if: contains(github.event.comment.body, '!support')
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
@@ -69,7 +69,7 @@ jobs:
       # 4) If the comment includes '!incomplete', note the bug or feature request is incomplete
       - name: Reply to !incomplete
         if: contains(github.event.comment.body, '!incomplete')
-        uses: peter-evans/create-or-update-comment@v3
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
diff --git a/.github/workflows/cipp_dev_build.yml b/.github/workflows/cipp_dev_build.yml
index 31d0f846d016..432d9363cade 100644
--- a/.github/workflows/cipp_dev_build.yml
+++ b/.github/workflows/cipp_dev_build.yml
@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.1
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.7.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp
diff --git a/.github/workflows/cipp_frontend_build.yml b/.github/workflows/cipp_frontend_build.yml
index d6df65f2320e..5db059b438a8 100644
--- a/.github/workflows/cipp_frontend_build.yml
+++ b/.github/workflows/cipp_frontend_build.yml
@@ -47,7 +47,7 @@ jobs:
 
       # Upload to Azure Blob Storage
       - name: Azure Blob Upload
-        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.1
+        uses: LanceMcCarthy/Action-AzureBlobUpload@v3.7.0
         with:
           connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
           container_name: cipp
diff --git a/.github/workflows/label_sponsor_requests.yml b/.github/workflows/label_sponsor_requests.yml
index bb9d6a31b427..28b84ea4e9b6 100644
--- a/.github/workflows/label_sponsor_requests.yml
+++ b/.github/workflows/label_sponsor_requests.yml
@@ -11,7 +11,7 @@ jobs:
       issues: write
     steps:
       - name: Sponsor Labels
-        uses: JasonEtco/is-sponsor-label-action@v1.2.0
+        uses: JasonEtco/is-sponsor-label-action@v2.0.0
         with:
           label: "Sponsor Priority"
         env:
diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
index 08cce1de130b..15b52ecd4e82 100644
--- a/.github/workflows/pr_check.yml
+++ b/.github/workflows/pr_check.yml
@@ -25,7 +25,7 @@ jobs:
           github.event.pull_request.head.repo.fork == true && 
           ((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
           (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/package.json b/package.json
index d575cae8d4cb..11957bf4dc59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "10.1.1",
+  "version": "10.1.2",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -51,7 +51,7 @@
     "@tiptap/extension-table": "^3.19.0",
     "@tiptap/pm": "^3.4.1",
     "@tiptap/react": "^3.4.1",
-    "@tiptap/starter-kit": "^3.19.0",
+    "@tiptap/starter-kit": "^3.20.0",
     "@uiw/react-json-view": "^2.0.0-alpha.41",
     "@vvo/tzdb": "^6.198.0",
     "apexcharts": "5.3.5",
@@ -61,9 +61,9 @@
     "export-to-csv": "^1.3.0",
     "formik": "2.4.9",
     "gray-matter": "4.0.3",
-    "i18next": "25.5.2",
+    "i18next": "25.8.13",
     "javascript-time-ago": "^2.6.2",
-    "jspdf": "^4.1.0",
+    "jspdf": "^4.2.0",
     "jspdf-autotable": "^5.0.7",
     "leaflet": "^1.9.4",
     "leaflet-defaulticon-compatibility": "^0.1.2",
diff --git a/public/version.json b/public/version.json
index eb5d53d8afba..22ac50c109c0 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "10.1.1"
-}
+  "version": "10.1.2"
+}
\ No newline at end of file
diff --git a/src/components/CippComponents/CippAddUserDrawer.jsx b/src/components/CippComponents/CippAddUserDrawer.jsx
index 6e8e333b317f..297fa91dd58f 100644
--- a/src/components/CippComponents/CippAddUserDrawer.jsx
+++ b/src/components/CippComponents/CippAddUserDrawer.jsx
@@ -18,7 +18,7 @@ export const CippAddUserDrawer = ({
   const userSettingsDefaults = useSettings();
 
   const formControl = useForm({
-    mode: "onBlur",
+    mode: "onChange",
     defaultValues: {
       tenantFilter: userSettingsDefaults.currentTenant,
       usageLocation: userSettingsDefaults.usageLocation,
@@ -52,22 +52,36 @@ export const CippAddUserDrawer = ({
       }
       newFields.tenantFilter = userSettingsDefaults.currentTenant;
 
+      // Preserve the currently selected template when copying properties
+      const currentTemplate = formControl.getValues("userTemplate");
+      if (currentTemplate) {
+        newFields.userTemplate = currentTemplate;
+      }
+
       formControl.reset(newFields);
     }
   }, [formValues]);
 
   useEffect(() => {
     if (createUser.isSuccess) {
-      formControl.reset({
+      const resetValues = {
         tenantFilter: userSettingsDefaults.currentTenant,
         usageLocation: userSettingsDefaults.usageLocation,
-      });
+      };
+
+      // Preserve the default template if it exists
+      const currentTemplate = formControl.getValues("userTemplate");
+      if (currentTemplate?.addedFields?.defaultForTenant) {
+        resetValues.userTemplate = currentTemplate;
+      }
+
+      formControl.reset(resetValues);
     }
   }, [createUser.isSuccess]);
 
-  const handleSubmit = () => {
-    formControl.trigger();
-    if (!isValid) {
+  const handleSubmit = async () => {
+    const isFormValid = await formControl.trigger();
+    if (!isFormValid) {
       return;
     }
     const values = formControl.getValues();
@@ -84,17 +98,40 @@ export const CippAddUserDrawer = ({
 
   const handleCloseDrawer = () => {
     setDrawerVisible(false);
-    formControl.reset({
+    const resetValues = {
       tenantFilter: userSettingsDefaults.currentTenant,
       usageLocation: userSettingsDefaults.usageLocation,
-    });
+    };
+
+    // Preserve the default template if it exists
+    const currentTemplate = formControl.getValues("userTemplate");
+    if (currentTemplate?.addedFields?.defaultForTenant) {
+      resetValues.userTemplate = currentTemplate;
+    }
+
+    formControl.reset(resetValues);
+  };
+
+  const handleOpenDrawer = () => {
+    const resetValues = {
+      tenantFilter: userSettingsDefaults.currentTenant,
+      usageLocation: userSettingsDefaults.usageLocation,
+    };
+
+    const currentTemplate = formControl.getValues("userTemplate");
+    if (currentTemplate?.addedFields?.defaultForTenant) {
+      resetValues.userTemplate = currentTemplate;
+    }
+
+    formControl.reset(resetValues);
+    setDrawerVisible(true);
   };
 
   return (
     <>
       <PermissionButton
         requiredPermissions={requiredPermissions}
-        onClick={() => setDrawerVisible(true)}
+        onClick={handleOpenDrawer}
         startIcon={<PersonAdd />}
       >
         {buttonText}
@@ -117,8 +154,8 @@ export const CippAddUserDrawer = ({
                 {createUser.isPending
                   ? "Creating User..."
                   : createUser.isSuccess
-                  ? "Create Another User"
-                  : "Create User"}
+                    ? "Create Another User"
+                    : "Create User"}
               </Button>
               <Button variant="outlined" onClick={handleCloseDrawer}>
                 Close
diff --git a/src/components/CippComponents/CippIntunePolicyActions.jsx b/src/components/CippComponents/CippIntunePolicyActions.jsx
new file mode 100644
index 000000000000..531245e94625
--- /dev/null
+++ b/src/components/CippComponents/CippIntunePolicyActions.jsx
@@ -0,0 +1,238 @@
+import { Book, LaptopChromebook } from "@mui/icons-material";
+import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline";
+
+const assignmentModeOptions = [
+  { label: "Replace existing assignments", value: "replace" },
+  { label: "Append to existing assignments", value: "append" },
+];
+
+const assignmentFilterTypeOptions = [
+  { label: "Include - Apply policy to devices matching filter", value: "include" },
+  { label: "Exclude - Apply policy to devices NOT matching filter", value: "exclude" },
+];
+
+/**
+ * Get assignment actions for Intune policies
+ * @param {string} tenant - The tenant filter
+ * @param {string} policyType - The policy type (URLName, deviceCompliancePolicies, etc.)
+ * @param {object} options - Additional options
+ * @param {string} options.platformType - Platform type for app protection policies (deviceAppManagement)
+ * @param {boolean} options.includeCreateTemplate - Whether to include create template action (default: true)
+ * @param {boolean} options.includeDelete - Whether to include delete action (default: true)
+ * @param {string} options.deleteUrlName - URLName for delete action (default: same as policyType)
+ * @param {object} options.templateData - Data for template creation
+ * @returns {Array} Array of action objects
+ */
+export const useCippIntunePolicyActions = (tenant, policyType, options = {}) => {
+  const {
+    platformType = null,
+    includeCreateTemplate = true,
+    includeDelete = true,
+    deleteUrlName = policyType,
+    templateData = null,
+  } = options;
+
+  const getAssignmentFields = () => [
+    {
+      type: "radio",
+      name: "assignmentMode",
+      label: "Assignment mode",
+      options: assignmentModeOptions,
+      defaultValue: "replace",
+      helperText:
+        "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
+    },
+    {
+      type: "autoComplete",
+      name: "assignmentFilter",
+      label: "Assignment Filter (Optional)",
+      multiple: false,
+      creatable: false,
+      api: {
+        url: "/api/ListAssignmentFilters",
+        queryKey: `ListAssignmentFilters-${tenant}`,
+        labelField: (filter) => filter.displayName,
+        valueField: "displayName",
+      },
+    },
+    {
+      type: "radio",
+      name: "assignmentFilterType",
+      label: "Assignment Filter Mode",
+      options: assignmentFilterTypeOptions,
+      defaultValue: "include",
+      helperText: "Choose whether to include or exclude devices matching the filter.",
+    },
+  ];
+
+  const getCustomDataFormatter = (assignTo) => (row, action, formData) => {
+    const rows = Array.isArray(row) ? row : [row];
+    return rows.map((item) => ({
+      tenantFilter: tenant === "AllTenants" && item?.Tenant ? item.Tenant : tenant,
+      ID: item?.id,
+      type: item?.URLName || policyType,
+      ...(platformType && { platformType }),
+      AssignTo: assignTo,
+      assignmentMode: formData?.assignmentMode || "replace",
+      AssignmentFilterName: formData?.assignmentFilter?.value || null,
+      AssignmentFilterType: formData?.assignmentFilter?.value
+        ? formData?.assignmentFilterType || "include"
+        : null,
+    }));
+  };
+
+  const getCustomDataFormatterForGroups = () => (row, action, formData) => {
+    const rows = Array.isArray(row) ? row : [row];
+    const selectedGroups = Array.isArray(formData?.groupTargets) ? formData.groupTargets : [];
+    return rows.map((item) => ({
+      tenantFilter: tenant === "AllTenants" && item?.Tenant ? item.Tenant : tenant,
+      ID: item?.id,
+      type: item?.URLName || policyType,
+      ...(platformType && { platformType }),
+      GroupIds: selectedGroups.map((group) => group.value).filter(Boolean),
+      GroupNames: selectedGroups.map((group) => group.label).filter(Boolean),
+      assignmentMode: formData?.assignmentMode || "replace",
+      AssignmentFilterName: formData?.assignmentFilter?.value || null,
+      AssignmentFilterType: formData?.assignmentFilter?.value
+        ? formData?.assignmentFilterType || "include"
+        : null,
+    }));
+  };
+
+  const actions = [];
+
+  // Create template action
+  if (includeCreateTemplate) {
+    actions.push({
+      label: "Create template based on policy",
+      type: "POST",
+      url: "/api/AddIntuneTemplate",
+      data: templateData || {
+        ID: "id",
+        URLName: policyType === "URLName" ? "URLName" : policyType,
+      },
+      confirmText: "Are you sure you want to create a template based on this policy?",
+      icon: <Book />,
+      color: "info",
+      multiPost: false,
+    });
+  }
+
+  // Assign to All Users
+  actions.push({
+    label: "Assign to All Users",
+    type: "POST",
+    url: "/api/ExecAssignPolicy",
+    data: {
+      AssignTo: "allLicensedUsers",
+      ID: "id",
+      type: policyType === "URLName" ? "URLName" : policyType,
+      ...(platformType && { platformType: "!deviceAppManagement" }),
+    },
+    multiPost: false,
+    fields: getAssignmentFields(),
+    customDataformatter: getCustomDataFormatter("allLicensedUsers"),
+    confirmText: 'Are you sure you want to assign "[displayName]" to all users?',
+    icon: <UserIcon />,
+    color: "info",
+  });
+
+  // Assign to All Devices
+  actions.push({
+    label: "Assign to All Devices",
+    type: "POST",
+    url: "/api/ExecAssignPolicy",
+    data: {
+      AssignTo: "AllDevices",
+      ID: "id",
+      type: policyType === "URLName" ? "URLName" : policyType,
+      ...(platformType && { platformType: "!deviceAppManagement" }),
+    },
+    multiPost: false,
+    fields: getAssignmentFields(),
+    customDataformatter: getCustomDataFormatter("AllDevices"),
+    confirmText: 'Are you sure you want to assign "[displayName]" to all devices?',
+    icon: <LaptopChromebook />,
+    color: "info",
+  });
+
+  // Assign Globally (All Users / All Devices)
+  actions.push({
+    label: "Assign Globally (All Users / All Devices)",
+    type: "POST",
+    url: "/api/ExecAssignPolicy",
+    data: {
+      AssignTo: "AllDevicesAndUsers",
+      ID: "id",
+      type: policyType === "URLName" ? "URLName" : policyType,
+      ...(platformType && { platformType: "!deviceAppManagement" }),
+    },
+    multiPost: false,
+    fields: getAssignmentFields(),
+    customDataformatter: getCustomDataFormatter("AllDevicesAndUsers"),
+    confirmText: 'Are you sure you want to assign "[displayName]" to all users and devices?',
+    icon: <GlobeAltIcon />,
+    color: "info",
+  });
+
+  // Assign to Custom Group
+  actions.push({
+    label: "Assign to Custom Group",
+    type: "POST",
+    url: "/api/ExecAssignPolicy",
+    icon: <UserGroupIcon />,
+    color: "info",
+    confirmText: 'Select the target groups for "[displayName]".',
+    multiPost: false,
+    fields: [
+      {
+        type: "autoComplete",
+        name: "groupTargets",
+        label: "Group(s)",
+        multiple: true,
+        creatable: false,
+        allowResubmit: true,
+        validators: { required: "Please select at least one group" },
+        api: {
+          url: "/api/ListGraphRequest",
+          dataKey: "Results",
+          queryKey: `ListPolicyAssignmentGroups-${tenant}`,
+          labelField: (group) =>
+            group.id ? `${group.displayName} (${group.id})` : group.displayName,
+          valueField: "id",
+          addedField: {
+            description: "description",
+          },
+          data: {
+            Endpoint: "groups",
+            manualPagination: true,
+            $select: "id,displayName,description",
+            $orderby: "displayName",
+            $top: 999,
+            $count: true,
+          },
+        },
+      },
+      ...getAssignmentFields(),
+    ],
+    customDataformatter: getCustomDataFormatterForGroups(),
+  });
+
+  // Delete action
+  if (includeDelete) {
+    actions.push({
+      label: "Delete Policy",
+      type: "POST",
+      url: "/api/RemovePolicy",
+      data: {
+        ID: "id",
+        URLName: deleteUrlName === "URLName" ? "URLName" : deleteUrlName,
+      },
+      confirmText: "Are you sure you want to delete this policy?",
+      icon: <TrashIcon />,
+      color: "danger",
+    });
+  }
+
+  return actions;
+};
diff --git a/src/components/CippComponents/CippMailboxRestoreDrawer.jsx b/src/components/CippComponents/CippMailboxRestoreDrawer.jsx
index 81e03bb4c659..ab8923e2c1b7 100644
--- a/src/components/CippComponents/CippMailboxRestoreDrawer.jsx
+++ b/src/components/CippComponents/CippMailboxRestoreDrawer.jsx
@@ -275,6 +275,7 @@ export const CippMailboxRestoreDrawer = ({
                       ItemCount: "ItemCount",
                     },
                     url: "/api/ListMailboxes",
+                    data: { UseReportDB: true },
                     showRefresh: true,
                   }}
                   validators={{
diff --git a/src/components/CippComponents/CippTransportRuleDrawer.jsx b/src/components/CippComponents/CippTransportRuleDrawer.jsx
index 494ae0fdce1a..54d69cd258f5 100644
--- a/src/components/CippComponents/CippTransportRuleDrawer.jsx
+++ b/src/components/CippComponents/CippTransportRuleDrawer.jsx
@@ -143,6 +143,7 @@ export const CippTransportRuleDrawer = ({
       DeleteMessage: "Delete the message without notifying anyone",
       Quarantine: "Quarantine the message",
       RedirectMessageTo: "Redirect the message to...",
+      RouteMessageOutboundConnector: "Route the message using the connector named...",
       BlindCopyTo: "Add recipients to the Bcc box...",
       CopyTo: "Add recipients to the Cc box...",
       ModerateMessageByUser: "Forward the message for approval to...",
@@ -206,7 +207,7 @@ export const CippTransportRuleDrawer = ({
     // Build form data
     const formData = {
       Name: rule.Name || "",
-      Priority: rule.Priority || "",
+      Priority: rule.Priority ?? "",
       Comments: rule.Comments || "",
       Enabled: boolHelper(rule.State),
       Mode: rule.Mode ? { value: rule.Mode, label: rule.Mode } : { value: "Enforce", label: "Enforce" },
@@ -294,6 +295,8 @@ export const CippTransportRuleDrawer = ({
       if (rule[field] !== null && rule[field] !== undefined && !formData[field]) {
         if (field === "SetSCL" && rule[field] !== null) {
           formData[field] = { value: rule[field].toString(), label: rule[field].toString() };
+        } else if (field === "RouteMessageOutboundConnector") {
+          formData[field] = { value: rule[field], label: rule[field] };
         } else {
           formData[field] = rule[field];
         }
@@ -667,6 +670,7 @@ export const CippTransportRuleDrawer = ({
     { value: "DeleteMessage", label: "Delete the message without notifying anyone" },
     { value: "Quarantine", label: "Quarantine the message" },
     { value: "RedirectMessageTo", label: "Redirect the message to..." },
+    { value: "RouteMessageOutboundConnector", label: "Route the message using the connector named..." },
     { value: "BlindCopyTo", label: "Add recipients to the Bcc box..." },
     { value: "CopyTo", label: "Add recipients to the Cc box..." },
     { value: "ModerateMessageByUser", label: "Forward the message for approval to..." },
@@ -704,6 +708,7 @@ export const CippTransportRuleDrawer = ({
               creatable={true}
               api={{
                 url: "/api/ListGraphRequest",
+                queryKey: `Users-TransportRules-${currentTenant}`,
                 data: {
                   Endpoint: "users",
                   tenantFilter: currentTenant,
@@ -734,6 +739,7 @@ export const CippTransportRuleDrawer = ({
               creatable={true}
               api={{
                 url: "/api/ListGraphRequest",
+                queryKey: `Groups-TransportRules-${currentTenant}`,
                 data: {
                   Endpoint: "groups",
                   tenantFilter: currentTenant,
@@ -950,6 +956,7 @@ export const CippTransportRuleDrawer = ({
               multiple={true}
               api={{
                 url: "/api/ListGraphRequest",
+                queryKey: `Users-TransportRules-${currentTenant}`,
                 data: {
                   Endpoint: "users",
                   tenantFilter: currentTenant,
@@ -964,6 +971,28 @@ export const CippTransportRuleDrawer = ({
           </Grid>
         );
 
+      case "RouteMessageOutboundConnector":
+        return (
+          <Grid size={12} key={actionValue}>
+            <CippFormComponent
+              type="autoComplete"
+              label={actionLabel}
+              name={actionValue}
+              formControl={formControl}
+              multiple={false}
+              creatable={false}
+              api={{
+                url: "/api/ListExchangeConnectors",
+                queryKey: `exchangeConnectors-${currentTenant}`,
+                labelField: (option) => `${option.Name}`,
+                valueField: "Name",
+                dataFilter: (options) =>
+                  options.filter((option) => option.rawData?.cippconnectortype === "outbound"),
+              }}
+            />
+          </Grid>
+        );
+
       case "SetSCL":
         return (
           <Grid size={12} key={actionValue}>
@@ -1260,6 +1289,7 @@ export const CippTransportRuleDrawer = ({
                 type="number"
                 label="Priority"
                 name="Priority"
+                required
                 formControl={formControl}
                 placeholder="0 (lowest priority)"
               />
@@ -1484,4 +1514,4 @@ export const CippTransportRuleDrawer = ({
       </CippOffCanvas>
     </>
   );
-};
\ No newline at end of file
+};
diff --git a/src/components/CippComponents/TenantMetricsGrid.jsx b/src/components/CippComponents/TenantMetricsGrid.jsx
index b8b0cfacc272..323bd44a7f9f 100644
--- a/src/components/CippComponents/TenantMetricsGrid.jsx
+++ b/src/components/CippComponents/TenantMetricsGrid.jsx
@@ -1,4 +1,5 @@
 import { Box, Grid, Tooltip, Avatar, Typography, Skeleton } from "@mui/material";
+import { useRouter } from "next/router";
 import {
   Person as UserIcon,
   PersonOutline as GuestIcon,
@@ -15,53 +16,71 @@ const formatNumber = (num) => {
 };
 
 export const TenantMetricsGrid = ({ data, isLoading }) => {
+  const router = useRouter();
+
   const metrics = [
     {
       label: "Users",
       value: data?.UserCount || 0,
       icon: UserIcon,
       color: "primary",
+      path: "/identity/administration/users",
     },
     {
       label: "Guests",
       value: data?.GuestCount || 0,
       icon: GuestIcon,
       color: "info",
+      path: "/identity/administration/users",
     },
     {
       label: "Groups",
       value: data?.GroupCount || 0,
       icon: GroupIcon,
       color: "secondary",
+      path: "/identity/administration/groups",
     },
     {
       label: "Service Principals",
       value: data?.ApplicationCount || 0,
       icon: AppsIcon,
       color: "error",
+      path: "/tenant/administration/applications/enterprise-apps",
     },
     {
       label: "Devices",
       value: data?.DeviceCount || 0,
       icon: DevicesIcon,
       color: "warning",
+      path: "/identity/administration/devices",
     },
     {
       label: "Managed",
       value: data?.ManagedDeviceCount || 0,
       icon: ManagedIcon,
       color: "success",
+      path: "/identity/administration/devices",
     },
   ];
 
+  const handleClick = (metric) => {
+    if (metric.path) {
+      router.push(metric.path);
+    }
+  };
+
   return (
     <Grid container spacing={2}>
       {metrics.map((metric) => {
         const IconComponent = metric.icon;
         return (
           <Grid key={metric.label} size={{ xs: 6 }}>
-            <Tooltip title={`${metric.value.toLocaleString()} ${metric.label.toLowerCase()}`} arrow>
+            <Tooltip
+              title={`View ${metric.value.toLocaleString()} ${metric.label.toLowerCase()}`}
+              arrow
+            >
               <Box
+                onClick={() => handleClick(metric)}
                 sx={{
                   display: "flex",
                   alignItems: "center",
@@ -70,6 +89,14 @@ export const TenantMetricsGrid = ({ data, isLoading }) => {
                   border: 1,
                   borderColor: "divider",
                   borderRadius: 1,
+                  cursor: "pointer",
+                  transition: "all 0.2s ease-in-out",
+                  "&:hover": {
+                    borderColor: `${metric.color}.main`,
+                    backgroundColor: "action.hover",
+                    transform: "translateY(-2px)",
+                    boxShadow: "0 4px 8px rgba(0,0,0,0.1)",
+                  },
                 }}
               >
                 <Avatar
diff --git a/src/components/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx
index 87e8088861a0..da62276387a8 100644
--- a/src/components/CippFormPages/CippAddEditUser.jsx
+++ b/src/components/CippFormPages/CippAddEditUser.jsx
@@ -76,7 +76,7 @@ const CippAddEditUser = (props) => {
       const tenantGroupsList = tenantGroups?.data || [];
 
       return tenantGroupsList.filter(
-        (tenantGroup) => !userGroups?.data?.some((userGroup) => userGroup.id === tenantGroup.id)
+        (tenantGroup) => !userGroups?.data?.some((userGroup) => userGroup.id === tenantGroup.id),
       );
     }
     return [];
@@ -124,7 +124,7 @@ const CippAddEditUser = (props) => {
           displayName += selectedTemplate.displayName;
         }
 
-        formControl.setValue("displayName", displayName);
+        formControl.setValue("displayName", displayName, { shouldDirty: true });
       }
 
       // Auto-generate username if template has usernameFormat
@@ -139,21 +139,33 @@ const CippAddEditUser = (props) => {
           const generatedUsername = generateUsername(
             formatString,
             watcher.givenName,
-            watcher.surname
+            watcher.surname,
           );
           if (generatedUsername) {
-            formControl.setValue("username", generatedUsername);
+            formControl.setValue("username", generatedUsername, { shouldDirty: true });
           }
         }
       }
     }
   }, [watcher.givenName, watcher.surname, selectedTemplate]);
 
+  // Reset manual flags and selected template when form is reset (fields become empty)
+  useEffect(() => {
+    if (formType === "add" && !watcher.givenName && !watcher.surname && !watcher.userTemplate) {
+      setDisplayNameManuallySet(false);
+      setUsernameManuallySet(false);
+      // Only clear selected template if it's not the default template
+      if (selectedTemplate && !selectedTemplate.defaultForTenant) {
+        setSelectedTemplate(null);
+      }
+    }
+  }, [watcher.givenName, watcher.surname, watcher.userTemplate, formType, selectedTemplate]);
+
   // Auto-select default template for tenant
   useEffect(() => {
     if (formType === "add" && userTemplates.isSuccess && !watcher.userTemplate) {
       const defaultTemplate = userTemplates.data?.find(
-        (template) => template.defaultForTenant === true
+        (template) => template.defaultForTenant === true,
       );
       if (defaultTemplate) {
         formControl.setValue("userTemplate", {
@@ -307,6 +319,8 @@ const CippAddEditUser = (props) => {
           onChange={(e) => {
             setDisplayNameManuallySet(true);
           }}
+          required={true}
+          validators={{ required: "Display Name is required" }}
         />
       </Grid>
       <Grid size={{ md: 6, xs: 12 }}>
@@ -322,6 +336,8 @@ const CippAddEditUser = (props) => {
           onChange={(e) => {
             setUsernameManuallySet(true);
           }}
+          required={true}
+          validators={{ required: "Username is required" }}
         />
       </Grid>
       <Grid size={{ md: 6, xs: 12 }}>
@@ -573,6 +589,9 @@ const CippAddEditUser = (props) => {
           name="setManager"
           label="Set Manager"
           valueField="userPrincipalName"
+          select={
+            "id,userPrincipalName,displayName,givenName,surname,mailNickname,jobTitle,department,streetAddress,city,state,postalCode,companyName,mobilePhone,businessPhones,usageLocation,office"
+          }
           multiple={false}
         />
       </Grid>
@@ -583,6 +602,9 @@ const CippAddEditUser = (props) => {
             name="setSponsor"
             label="Set Sponsor"
             valueField="userPrincipalName"
+            select={
+              "id,userPrincipalName,displayName,givenName,surname,mailNickname,jobTitle,department,streetAddress,city,state,postalCode,companyName,mobilePhone,businessPhones,usageLocation,office"
+            }
             multiple={false}
           />
         </Grid>
@@ -592,6 +614,9 @@ const CippAddEditUser = (props) => {
           formControl={formControl}
           name="copyFrom"
           label="Copy groups from user"
+          select={
+            "id,userPrincipalName,displayName,givenName,surname,mailNickname,jobTitle,department,streetAddress,city,state,postalCode,companyName,mobilePhone,businessPhones,usageLocation,office"
+          }
           multiple={false}
         />
       </Grid>
diff --git a/src/components/CippSettings/CippGDAPResults.jsx b/src/components/CippSettings/CippGDAPResults.jsx
index d1542bacdd96..46d505a4535d 100644
--- a/src/components/CippSettings/CippGDAPResults.jsx
+++ b/src/components/CippSettings/CippGDAPResults.jsx
@@ -57,9 +57,9 @@ export const CippGDAPResults = (props) => {
       resultProperty: "Memberships",
       matchProperty: "displayName",
       match: "^M365 GDAP.+",
-      count: 12,
-      successMessage: "User is a member of the 12 CIPP Recommended GDAP groups",
-      failureMessage: "User is not a member of the 12 CIPP Recommended GDAP groups",
+      count: 15,
+      successMessage: "User is a member of the 15 CIPP Recommended GDAP groups",
+      failureMessage: "User is not a member of the 15 CIPP Recommended GDAP groups",
     },
     {
       resultProperty: "GDAPIssues",
diff --git a/src/components/ExecutiveReportButton.js b/src/components/ExecutiveReportButton.js
index 922a3c550850..19b78ddcdd04 100644
--- a/src/components/ExecutiveReportButton.js
+++ b/src/components/ExecutiveReportButton.js
@@ -44,6 +44,7 @@ const ExecutiveReportDocument = ({
   conditionalAccessData,
   standardsCompareData,
   driftComplianceData,
+  standardTemplatesData,
   sectionConfig = {
     executiveSummary: true,
     securityStandards: true,
@@ -676,7 +677,7 @@ const ExecutiveReportDocument = ({
   });
 
   // PROCESS REAL STANDARDS DATA
-  const processStandardsData = (apiData) => {
+  const processStandardsData = (apiData, standardTemplates) => {
     // Try to fetch standards data dynamically
     let standardsData = null;
     try {
@@ -687,6 +688,65 @@ const ExecutiveReportDocument = ({
       return [];
     }
 
+    // Build a lookup map from template configurations
+    // Format: { "GUID": "Display Name" }
+    const templateDisplayNameMap = {};
+
+    if (standardTemplates && Array.isArray(standardTemplates)) {
+      standardTemplates.forEach((template) => {
+        if (template.standards) {
+          // Process IntuneTemplate arrays
+          if (Array.isArray(template.standards.IntuneTemplate)) {
+            template.standards.IntuneTemplate.forEach((templateItem) => {
+              if (templateItem?.TemplateList?.value && templateItem?.TemplateList?.label) {
+                templateDisplayNameMap[templateItem.TemplateList.value.toLowerCase()] =
+                  templateItem.TemplateList.label;
+              }
+              // Handle TemplateList-Tags expansion
+              const tagTemplates =
+                templateItem?.["TemplateList-Tags"]?.addedFields?.templates ||
+                templateItem?.["TemplateList-Tags"]?.rawData?.templates;
+              if (tagTemplates && Array.isArray(tagTemplates)) {
+                tagTemplates.forEach((expandedTemplate) => {
+                  if (
+                    expandedTemplate?.GUID &&
+                    (expandedTemplate?.displayName || expandedTemplate?.name)
+                  ) {
+                    templateDisplayNameMap[expandedTemplate.GUID.toLowerCase()] =
+                      expandedTemplate.displayName || expandedTemplate.name;
+                  }
+                });
+              }
+            });
+          }
+          // Process ConditionalAccessTemplate arrays
+          if (Array.isArray(template.standards.ConditionalAccessTemplate)) {
+            template.standards.ConditionalAccessTemplate.forEach((templateItem) => {
+              if (templateItem?.TemplateList?.value && templateItem?.TemplateList?.label) {
+                templateDisplayNameMap[templateItem.TemplateList.value.toLowerCase()] =
+                  templateItem.TemplateList.label;
+              }
+              // Handle TemplateList-Tags expansion
+              const tagTemplates =
+                templateItem?.["TemplateList-Tags"]?.addedFields?.templates ||
+                templateItem?.["TemplateList-Tags"]?.rawData?.templates;
+              if (tagTemplates && Array.isArray(tagTemplates)) {
+                tagTemplates.forEach((expandedTemplate) => {
+                  if (
+                    expandedTemplate?.GUID &&
+                    (expandedTemplate?.displayName || expandedTemplate?.name)
+                  ) {
+                    templateDisplayNameMap[expandedTemplate.GUID.toLowerCase()] =
+                      expandedTemplate.displayName || expandedTemplate.name;
+                  }
+                });
+              }
+            });
+          }
+        }
+      });
+    }
+
     const processedStandards = [];
     const tenantData = apiData[0]; // Get the first tenant's data
 
@@ -698,13 +758,43 @@ const ExecutiveReportDocument = ({
         const standardDef = standardsData?.find((std) => std.name === standardKey);
 
         if (standardDef) {
-          // Determine compliance status
+          // Determine compliance status using the same logic as applied-standards.js
           let status = "Review";
-          if (standardValue && typeof standardValue === "object" && standardValue.Value === true) {
-            status = "Compliant";
-          } else if (standardValue && standardValue.Value === true) {
-            status = "Compliant";
+          let isCompliant = false;
+
+          // FIRST: Check if CurrentValue and ExpectedValue exist and match
+          if (
+            standardValue?.CurrentValue !== undefined &&
+            standardValue?.ExpectedValue !== undefined
+          ) {
+            const sortedCurrent =
+              typeof standardValue.CurrentValue === "object" && standardValue.CurrentValue !== null
+                ? Object.keys(standardValue.CurrentValue)
+                    .sort()
+                    .reduce((obj, key) => {
+                      obj[key] = standardValue.CurrentValue[key];
+                      return obj;
+                    }, {})
+                : standardValue.CurrentValue;
+            const sortedExpected =
+              typeof standardValue.ExpectedValue === "object" &&
+              standardValue.ExpectedValue !== null
+                ? Object.keys(standardValue.ExpectedValue)
+                    .sort()
+                    .reduce((obj, key) => {
+                      obj[key] = standardValue.ExpectedValue[key];
+                      return obj;
+                    }, {})
+                : standardValue.ExpectedValue;
+            isCompliant = JSON.stringify(sortedCurrent) === JSON.stringify(sortedExpected);
           }
+          // SECOND: Check if Value is explicitly true
+          else if (standardValue?.Value === true) {
+            isCompliant = true;
+          }
+
+          status = isCompliant ? "Compliant" : "Review";
+
           // Get tags for display - fix the tags access
           const tags =
             standardDef.tag && Array.isArray(standardDef.tag) && standardDef.tag.length > 0
@@ -720,18 +810,70 @@ const ExecutiveReportDocument = ({
         } else {
           // If no definition found, still add it with basic info
           let status = "Review";
-          if (standardValue && typeof standardValue === "object" && standardValue.Value === true) {
-            status = "Compliant";
-          } else if (standardValue && standardValue.Value === true) {
-            status = "Compliant";
+          let isCompliant = false;
+
+          // FIRST: Check if CurrentValue and ExpectedValue exist and match
+          if (
+            standardValue?.CurrentValue !== undefined &&
+            standardValue?.ExpectedValue !== undefined
+          ) {
+            const sortedCurrent =
+              typeof standardValue.CurrentValue === "object" && standardValue.CurrentValue !== null
+                ? Object.keys(standardValue.CurrentValue)
+                    .sort()
+                    .reduce((obj, key) => {
+                      obj[key] = standardValue.CurrentValue[key];
+                      return obj;
+                    }, {})
+                : standardValue.CurrentValue;
+            const sortedExpected =
+              typeof standardValue.ExpectedValue === "object" &&
+              standardValue.ExpectedValue !== null
+                ? Object.keys(standardValue.ExpectedValue)
+                    .sort()
+                    .reduce((obj, key) => {
+                      obj[key] = standardValue.ExpectedValue[key];
+                      return obj;
+                    }, {})
+                : standardValue.ExpectedValue;
+            isCompliant = JSON.stringify(sortedCurrent) === JSON.stringify(sortedExpected);
           }
+          // SECOND: Check if Value is explicitly true
+          else if (standardValue?.Value === true) {
+            isCompliant = true;
+          }
+
+          status = isCompliant ? "Compliant" : "Review";
 
-          // Create a proper name from the key
-          const displayName = standardKey
-            .replace("standards.", "")
-            .replace(/([A-Z])/g, " $1") // Add space before capital letters
-            .replace(/^./, (str) => str.toUpperCase()) // Capitalize first letter
-            .trim();
+          // Create a proper name from the key - handle template types specially
+          let displayName = "";
+
+          // Check if this is an IntuneTemplate or ConditionalAccessTemplate
+          const intuneTemplateMatch = standardKey.match(
+            /^standards\.IntuneTemplate\.([0-9a-f-]+)/i,
+          );
+          const caTemplateMatch = standardKey.match(
+            /^standards\.ConditionalAccessTemplate\.([0-9a-f-]+)/i,
+          );
+
+          if (intuneTemplateMatch) {
+            // IntuneTemplate - look up display name from template configurations
+            const guid = intuneTemplateMatch[1];
+            const lookupName = templateDisplayNameMap[guid.toLowerCase()];
+            displayName = lookupName || `Intune Template - ${guid.substring(0, 8)}`;
+          } else if (caTemplateMatch) {
+            // ConditionalAccessTemplate - look up display name from template configurations
+            const guid = caTemplateMatch[1];
+            const lookupName = templateDisplayNameMap[guid.toLowerCase()];
+            displayName = lookupName || `CA Template - ${guid.substring(0, 8)}`;
+          } else {
+            // Regular standard - use basic name formatting
+            displayName = standardKey
+              .replace("standards.", "")
+              .replace(/([A-Z])/g, " $1") // Add space before capital letters
+              .replace(/^./, (str) => str.toUpperCase()) // Capitalize first letter
+              .trim();
+          }
 
           processedStandards.push({
             name: displayName,
@@ -803,22 +945,22 @@ const ExecutiveReportDocument = ({
         // Collect deviations with pretty names
         if (item.currentDeviations && Array.isArray(item.currentDeviations)) {
           acc.currentDeviations.push(
-            ...processDeviations(item.currentDeviations.filter((dev) => dev !== null))
+            ...processDeviations(item.currentDeviations.filter((dev) => dev !== null)),
           );
         }
         if (item.acceptedDeviations && Array.isArray(item.acceptedDeviations)) {
           acc.acceptedDeviations.push(
-            ...processDeviations(item.acceptedDeviations.filter((dev) => dev !== null))
+            ...processDeviations(item.acceptedDeviations.filter((dev) => dev !== null)),
           );
         }
         if (item.customerSpecificDeviations && Array.isArray(item.customerSpecificDeviations)) {
           acc.customerSpecificDeviations.push(
-            ...processDeviations(item.customerSpecificDeviations.filter((dev) => dev !== null))
+            ...processDeviations(item.customerSpecificDeviations.filter((dev) => dev !== null)),
           );
         }
         if (item.deniedDeviations && Array.isArray(item.deniedDeviations)) {
           acc.deniedDeviations.push(
-            ...processDeviations(item.deniedDeviations.filter((dev) => dev !== null))
+            ...processDeviations(item.deniedDeviations.filter((dev) => dev !== null)),
           );
         }
 
@@ -835,7 +977,7 @@ const ExecutiveReportDocument = ({
         customerSpecificDeviations: [],
         deniedDeviations: [],
         appliedStandards: [],
-      }
+      },
     );
 
     // Get complete list of applied standards from standards comparison data (like policies-deployed)
@@ -871,7 +1013,7 @@ const ExecutiveReportDocument = ({
     return aggregatedData;
   };
 
-  let securityControls = processStandardsData(standardsCompareData);
+  let securityControls = processStandardsData(standardsCompareData, standardTemplatesData);
   let driftComplianceInfo = processDriftComplianceData(driftComplianceData, standardsCompareData);
 
   const getBadgeStyle = (status) => {
@@ -1434,7 +1576,7 @@ const ExecutiveReportDocument = ({
                       } catch (error) {}
 
                       const standardDef = standardsData?.find(
-                        (std) => std.name === deviation.standardName
+                        (std) => std.name === deviation.standardName,
                       );
                       const description =
                         standardDef?.executiveText ||
@@ -1466,7 +1608,7 @@ const ExecutiveReportDocument = ({
                       } catch (error) {}
 
                       const standardDef = standardsData?.find(
-                        (std) => std.name === deviation.standardName
+                        (std) => std.name === deviation.standardName,
                       );
                       const description =
                         standardDef?.executiveText ||
@@ -1502,7 +1644,7 @@ const ExecutiveReportDocument = ({
                         } catch (error) {}
 
                         const standardDef = standardsData?.find(
-                          (std) => std.name === deviation.standardName
+                          (std) => std.name === deviation.standardName,
                         );
                         const description =
                           standardDef?.executiveText ||
@@ -1536,7 +1678,7 @@ const ExecutiveReportDocument = ({
                       } catch (error) {}
 
                       const standardDef = standardsData?.find(
-                        (std) => std.name === deviation.standardName
+                        (std) => std.name === deviation.standardName,
                       );
                       const description =
                         standardDef?.executiveText ||
@@ -1603,7 +1745,7 @@ const ExecutiveReportDocument = ({
                       acc[category].push(standard);
                       return acc;
                     },
-                    {}
+                    {},
                   );
 
                   return Object.entries(groupedStandards).map(([category, standards]) => (
@@ -1998,7 +2140,7 @@ const ExecutiveReportDocument = ({
                               "DEBUG: license.CountUsed is an object:",
                               countUsed,
                               "full license:",
-                              license
+                              license,
                             );
                           }
                           return countUsed;
@@ -2138,8 +2280,11 @@ const ExecutiveReportDocument = ({
                       {
                         deviceData.filter(
                           (device) =>
-                            device.complianceState === "compliant" ||
-                            device.ComplianceState === "compliant"
+                            (
+                              device.complianceState ||
+                              device.ComplianceState ||
+                              ""
+                            ).toLowerCase() === "compliant",
                         ).length
                       }
                     </Text>
@@ -2150,8 +2295,11 @@ const ExecutiveReportDocument = ({
                       {
                         deviceData.filter(
                           (device) =>
-                            device.complianceState !== "compliant" &&
-                            device.ComplianceState !== "compliant"
+                            (
+                              device.complianceState ||
+                              device.ComplianceState ||
+                              ""
+                            ).toLowerCase() !== "compliant",
                         ).length
                       }
                     </Text>
@@ -2162,11 +2310,14 @@ const ExecutiveReportDocument = ({
                       {Math.round(
                         (deviceData.filter(
                           (device) =>
-                            device.complianceState === "Compliant" ||
-                            device.ComplianceState === "Compliant"
+                            (
+                              device.complianceState ||
+                              device.ComplianceState ||
+                              ""
+                            ).toLowerCase() === "compliant",
                         ).length /
                           deviceData.length) *
-                          100
+                          100,
                       )}
                       %
                     </Text>
@@ -2212,13 +2363,18 @@ const ExecutiveReportDocument = ({
                           <Text
                             style={[
                               styles.statusText,
-                              device.complianceState === "compliant"
+                              (
+                                device.complianceState ||
+                                device.ComplianceState ||
+                                ""
+                              ).toLowerCase() === "compliant"
                                 ? styles.statusCompliant
                                 : styles.statusReview,
                             ]}
                           >
                             {(() => {
-                              const complianceState = device.complianceState || "Unknown";
+                              const complianceState =
+                                device.complianceState || device.ComplianceState || "Unknown";
                               if (typeof complianceState === "object") {
                               }
                               return complianceState;
@@ -2440,7 +2596,7 @@ const ExecutiveReportDocument = ({
                     <Text style={styles.statNumber}>
                       {
                         conditionalAccessData.filter(
-                          (policy) => policy.state === "enabledForReportingButNotEnforced"
+                          (policy) => policy.state === "enabledForReportingButNotEnforced",
                         ).length
                       }
                     </Text>
@@ -2451,7 +2607,7 @@ const ExecutiveReportDocument = ({
                       {
                         conditionalAccessData.filter(
                           (policy) =>
-                            policy.builtInControls && policy.builtInControls.includes("mfa")
+                            policy.builtInControls && policy.builtInControls.includes("mfa"),
                         ).length
                       }
                     </Text>
@@ -2485,7 +2641,7 @@ const ExecutiveReportDocument = ({
                       <Text style={styles.recommendationLabel}>Testing Phase:</Text>{" "}
                       {
                         conditionalAccessData.filter(
-                          (policy) => policy.state === "enabledForReportingButNotEnforced"
+                          (policy) => policy.state === "enabledForReportingButNotEnforced",
                         ).length
                       }{" "}
                       policies in report-only mode
@@ -2505,11 +2661,11 @@ const ExecutiveReportDocument = ({
                 <Text style={styles.infoTitle}>Access Control Recommendations</Text>
                 <Text style={styles.infoText}>
                   {conditionalAccessData.filter(
-                    (policy) => policy.state === "enabledForReportingButNotEnforced"
+                    (policy) => policy.state === "enabledForReportingButNotEnforced",
                   ).length > 0
                     ? `Consider activating ${
                         conditionalAccessData.filter(
-                          (policy) => policy.state === "enabledForReportingButNotEnforced"
+                          (policy) => policy.state === "enabledForReportingButNotEnforced",
                         ).length
                       } policies currently in testing mode after ensuring they don't disrupt business operations. `
                     : "Your access controls are properly configured. "}
@@ -2619,6 +2775,14 @@ export const ExecutiveReportButton = (props) => {
     waiting: previewOpen,
   });
 
+  // Load all standard templates to resolve template display names
+  const standardTemplatesData = ApiGetCall({
+    url: `/api/listStandardTemplates`,
+    data: {}, // No templateId filter - get all templates
+    queryKey: `standard-templates-report-all`,
+    waiting: previewOpen,
+  });
+
   // Check if all data is loaded (either successful or failed) - only relevant when preview is open
   const isDataLoading =
     previewOpen &&
@@ -2629,7 +2793,8 @@ export const ExecutiveReportButton = (props) => {
       deviceData.isFetching ||
       conditionalAccessData.isFetching ||
       standardsCompareData.isFetching ||
-      driftComplianceData.isFetching);
+      driftComplianceData.isFetching ||
+      standardTemplatesData.isFetching);
 
   const hasAllDataFinished =
     !previewOpen ||
@@ -2640,7 +2805,8 @@ export const ExecutiveReportButton = (props) => {
       (deviceData.isSuccess || deviceData.isError) &&
       (conditionalAccessData.isSuccess || conditionalAccessData.isError) &&
       (standardsCompareData.isSuccess || standardsCompareData.isError) &&
-      (driftComplianceData.isSuccess || driftComplianceData.isError));
+      (driftComplianceData.isSuccess || driftComplianceData.isError) &&
+      (standardTemplatesData.isSuccess || standardTemplatesData.isError));
 
   // Button is always available now since we don't need to wait for data
   const shouldShowButton = true;
@@ -2698,6 +2864,9 @@ export const ExecutiveReportButton = (props) => {
           }
           standardsCompareData={standardsCompareData.isSuccess ? standardsCompareData?.data : null}
           driftComplianceData={driftComplianceData.isSuccess ? driftComplianceData?.data : null}
+          standardTemplatesData={
+            standardTemplatesData.isSuccess ? standardTemplatesData?.data : null
+          }
           sectionConfig={sectionConfig}
         />
       );
diff --git a/src/data/standards.json b/src/data/standards.json
index 2e766d422fce..a8ebb3288a35 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -3528,6 +3528,34 @@
     "powershellEquivalent": "Graph API",
     "recommendedBy": []
   },
+  {
+    "name": "standards.WindowsBackupRestore",
+    "cat": "Intune Standards",
+    "tag": [],
+    "helpText": "Configures the Windows Backup and Restore enrollment setting in Intune. When enabled, users see a restore page during Windows Autopilot/OOBE that allows them to restore their apps and settings from a previous device backup. **Before you can restore a backup, a policy to enable it on devices must be set up in Settings Catalog.**",
+    "docsDescription": "Configures the Windows Backup and Restore (WBfO) device enrollment setting in Intune. This feature allows users to restore apps and settings from a previous device backup during Windows setup. Enabling this shows a restore page during enrollment (OOBE) so users can migrate their workspace configuration to a new device. More information can be found in [Microsoft's documentation.](https://learn.microsoft.com/en-us/intune/intune-service/enrollment/windows-backup-restore)",
+    "executiveText": "Controls the Windows Backup and Restore for Organizations feature in Intune. When enabled, employees setting up new devices can restore their apps and settings from a previous backup during Windows enrollment. This streamlines device provisioning, reduces setup time for new or replacement devices, and improves the employee experience during device transitions.",
+    "addedComponent": [
+      {
+        "type": "autoComplete",
+        "multiple": false,
+        "creatable": false,
+        "label": "Select value",
+        "name": "standards.WindowsBackupRestore.state",
+        "options": [
+          { "label": "Enabled", "value": "enabled" },
+          { "label": "Disabled", "value": "disabled" },
+          { "label": "Not Configured", "value": "notConfigured" }
+        ]
+      }
+    ],
+    "label": "Set Windows Backup and Restore state",
+    "impact": "Low Impact",
+    "impactColour": "info",
+    "addedDate": "2026-02-26",
+    "powershellEquivalent": "Graph API",
+    "recommendedBy": []
+  },
   {
     "name": "standards.intuneDeviceRetirementDays",
     "cat": "Intune Standards",
@@ -4967,7 +4995,15 @@
         "type": "textField",
         "name": "standards.TeamsFederationConfiguration.DomainList",
         "label": "Domains, Comma separated",
-        "required": false
+        "required": false,
+        "condition": {
+          "field": "standards.TeamsFederationConfiguration.DomainControl.value",
+          "compareType": "isOneOf",
+          "compareValue": [
+            "AllowSpecificExternal",
+            "BlockSpecificExternal"
+          ]
+        }
       }
     ],
     "label": "Federation Configuration for Microsoft Teams",
diff --git a/src/pages/email/administration/mailboxes/index.js b/src/pages/email/administration/mailboxes/index.js
index eb2df5e015ae..19913b56cf8b 100644
--- a/src/pages/email/administration/mailboxes/index.js
+++ b/src/pages/email/administration/mailboxes/index.js
@@ -3,9 +3,26 @@ import { CippTablePage } from "../../../../components/CippComponents/CippTablePa
 import CippExchangeActions from "../../../../components/CippComponents/CippExchangeActions";
 import { CippHVEUserDrawer } from "../../../../components/CippComponents/CippHVEUserDrawer.jsx";
 import { CippSharedMailboxDrawer } from "../../../../components/CippComponents/CippSharedMailboxDrawer.jsx";
+import { Sync, Info } from "@mui/icons-material";
+import { Button, SvgIcon, IconButton, Tooltip } from "@mui/material";
+import { useSettings } from "../../../../hooks/use-settings";
+import { Stack } from "@mui/system";
+import { useDialog } from "../../../../hooks/use-dialog";
+import { CippApiDialog } from "../../../../components/CippComponents/CippApiDialog";
+import { useState } from "react";
+import { CippQueueTracker } from "../../../../components/CippTable/CippQueueTracker";
 
 const Page = () => {
   const pageTitle = "Mailboxes";
+  const currentTenant = useSettings().currentTenant;
+  const syncDialog = useDialog();
+  const [syncQueueId, setSyncQueueId] = useState(null);
+
+  const isAllTenants = currentTenant === "AllTenants";
+
+  const apiData = {
+    UseReportDB: true,
+  };
 
   // Define off-canvas details
   const offCanvas = {
@@ -37,33 +54,89 @@ const Page = () => {
   ];
 
   // Simplified columns for the table
-  const simpleColumns = [
-    "displayName", // Display Name
-    "recipientTypeDetails", // Recipient Type Details
-    "UPN", // User Principal Name
-    "primarySmtpAddress", // Primary Email Address
-    "recipientType", // Recipient Type
-    "AdditionalEmailAddresses", // Additional Email Addresses
-  ];
+  const simpleColumns = isAllTenants
+    ? [
+        "Tenant", // Tenant
+        "displayName", // Display Name
+        "recipientTypeDetails", // Recipient Type Details
+        "UPN", // User Principal Name
+        "primarySmtpAddress", // Primary Email Address
+        "recipientType", // Recipient Type
+        "AdditionalEmailAddresses", // Additional Email Addresses
+        "CacheTimestamp", // Cache Timestamp
+      ]
+    : [
+        "displayName", // Display Name
+        "recipientTypeDetails", // Recipient Type Details
+        "UPN", // User Principal Name
+        "primarySmtpAddress", // Primary Email Address
+        "recipientType", // Recipient Type
+        "AdditionalEmailAddresses", // Additional Email Addresses
+        "CacheTimestamp", // Cache Timestamp
+      ];
 
   return (
-    <CippTablePage
-      title={pageTitle}
-      apiUrl="/api/ListMailboxes"
-      actions={CippExchangeActions()}
-      offCanvas={offCanvas}
-      simpleColumns={simpleColumns}
-      filters={filterList}
-      cardButton={
-        <>
-          <CippSharedMailboxDrawer />
-          <CippHVEUserDrawer />
-        </>
-      }
-    />
+    <>
+      <CippTablePage
+        title={pageTitle}
+        apiUrl="/api/ListMailboxes"
+        apiData={apiData}
+        queryKey={`ListMailboxes-${currentTenant}`}
+        actions={CippExchangeActions()}
+        offCanvas={offCanvas}
+        simpleColumns={simpleColumns}
+        filters={filterList}
+        cardButton={
+          <Stack direction="row" spacing={1} alignItems="center">
+            <CippSharedMailboxDrawer />
+            <CippHVEUserDrawer />
+            <CippQueueTracker
+              queueId={syncQueueId}
+              queryKey={`ListMailboxes-${currentTenant}`}
+              title="Mailboxes Sync"
+            />
+            <Tooltip title="This report displays cached data from the CIPP reporting database. Click the Sync button to update the cache for the current tenant.">
+              <IconButton size="small">
+                <Info fontSize="small" />
+              </IconButton>
+            </Tooltip>
+            <Button
+              startIcon={
+                <SvgIcon fontSize="small">
+                  <Sync />
+                </SvgIcon>
+              }
+              size="xs"
+              onClick={syncDialog.handleOpen}
+            >
+              Sync
+            </Button>
+          </Stack>
+        }
+      />
+      <CippApiDialog
+        createDialog={syncDialog}
+        title="Sync Mailboxes"
+        fields={[]}
+        api={{
+          type: "GET",
+          url: "/api/ExecCIPPDBCache",
+          confirmText: `Run mailboxes cache sync for ${currentTenant}? This will update mailbox data immediately.`,
+          relatedQueryKeys: [`ListMailboxes-${currentTenant}`],
+          data: {
+            Name: "Mailboxes",
+          },
+          onSuccess: (response) => {
+            if (response?.QueueId) {
+              setSyncQueueId(response.QueueId);
+            }
+          },
+        }}
+      />
+    </>
   );
 };
 
-Page.getLayout = (page) => <DashboardLayout allTenantsSupport={false}>{page}</DashboardLayout>;
+Page.getLayout = (page) => <DashboardLayout allTenantsSupport={true}>{page}</DashboardLayout>;
 
 export default Page;
diff --git a/src/pages/email/resources/management/list-rooms/edit.jsx b/src/pages/email/resources/management/list-rooms/edit.jsx
index a8125a3f8be8..9505c7e4c19b 100644
--- a/src/pages/email/resources/management/list-rooms/edit.jsx
+++ b/src/pages/email/resources/management/list-rooms/edit.jsx
@@ -115,6 +115,7 @@ const EditRoomMailbox = () => {
             }
           : null,
       });
+      void formControl.trigger();
     }
   }, [roomInfo.isSuccess, roomInfo.data]);
 
diff --git a/src/pages/email/tools/mailbox-restores/add.jsx b/src/pages/email/tools/mailbox-restores/add.jsx
index a238c0c29b1a..0d9a74ba686a 100644
--- a/src/pages/email/tools/mailbox-restores/add.jsx
+++ b/src/pages/email/tools/mailbox-restores/add.jsx
@@ -126,6 +126,7 @@ const MailboxRestoreForm = () => {
               valueField: "UPN",
               addedField: { displayName: "displayName", ExchangeGuid: "ExchangeGuid" },
               url: "/api/ListMailboxes",
+              data: { UseReportDB: true },
             }}
             validators={{ validate: (value) => (value ? true : "Please select a target mailbox.") }}
           />
diff --git a/src/pages/endpoint/MEM/list-appprotection-policies/index.js b/src/pages/endpoint/MEM/list-appprotection-policies/index.js
index 3fe79bab30da..0c8fc70161fc 100644
--- a/src/pages/endpoint/MEM/list-appprotection-policies/index.js
+++ b/src/pages/endpoint/MEM/list-appprotection-policies/index.js
@@ -1,320 +1,23 @@
 import { Layout as DashboardLayout } from "../../../../layouts/index.js";
 import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx";
-import { Book, LaptopChromebook } from "@mui/icons-material";
-import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline";
 import { PermissionButton } from "../../../../utils/permissions.js";
 import { CippPolicyDeployDrawer } from "../../../../components/CippComponents/CippPolicyDeployDrawer.jsx";
 import { useSettings } from "../../../../hooks/use-settings.js";
-
-const assignmentModeOptions = [
-  { label: "Replace existing assignments", value: "replace" },
-  { label: "Append to existing assignments", value: "append" },
-];
-
-const assignmentFilterTypeOptions = [
-  { label: "Include - Apply policy to devices matching filter", value: "include" },
-  { label: "Exclude - Apply policy to devices NOT matching filter", value: "exclude" },
-];
+import { useCippIntunePolicyActions } from "../../../../components/CippComponents/CippIntunePolicyActions.jsx";
 
 const Page = () => {
   const pageTitle = "App Protection & Configuration Policies";
   const cardButtonPermissions = ["Endpoint.MEM.ReadWrite"];
   const tenant = useSettings().currentTenant;
 
-  const actions = [
-    {
-      label: "Create template based on policy",
-      type: "POST",
-      url: "/api/AddIntuneTemplate",
-      data: {
-        ID: "id",
-        URLName: "URLName",
-      },
-      confirmText: "Are you sure you want to create a template based on this policy?",
-      icon: <Book />,
-      color: "info",
-    },
-    {
-      label: "Assign to All Users",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "allLicensedUsers",
-        ID: "id",
-        type: "URLName",
-        platformType: "!deviceAppManagement",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          platformType: "deviceAppManagement",
-          AssignTo: "allLicensedUsers",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all users?',
-      icon: <UserIcon />,
-      color: "info",
-    },
-    {
-      label: "Assign to All Devices",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "AllDevices",
-        ID: "id",
-        type: "URLName",
-        platformType: "!deviceAppManagement",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          platformType: "deviceAppManagement",
-          AssignTo: "AllDevices",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all devices?',
-      icon: <LaptopChromebook />,
-      color: "info",
+  const actions = useCippIntunePolicyActions(tenant, "URLName", {
+    templateData: {
+      ID: "id",
+      URLName: "managedAppPolicies",
     },
-    {
-      label: "Assign Globally (All Users / All Devices)",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "AllDevicesAndUsers",
-        ID: "id",
-        type: "URLName",
-        platformType: "!deviceAppManagement",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          platformType: "deviceAppManagement",
-          AssignTo: "AllDevicesAndUsers",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all users and devices?',
-      icon: <GlobeAltIcon />,
-      color: "info",
-    },
-    {
-      label: "Assign to Custom Group",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      icon: <UserGroupIcon />,
-      color: "info",
-      confirmText: 'Select the target groups for "[displayName]".',
-      fields: [
-        {
-          type: "autoComplete",
-          name: "groupTargets",
-          label: "Group(s)",
-          multiple: true,
-          creatable: false,
-          allowResubmit: true,
-          validators: { required: "Please select at least one group" },
-          api: {
-            url: "/api/ListGraphRequest",
-            dataKey: "Results",
-            queryKey: `ListPolicyAssignmentGroups-${tenant}`,
-            labelField: (group) =>
-              group.id ? `${group.displayName} (${group.id})` : group.displayName,
-            valueField: "id",
-            addedField: {
-              description: "description",
-            },
-            data: {
-              Endpoint: "groups",
-              manualPagination: true,
-              $select: "id,displayName,description",
-              $orderby: "displayName",
-              $top: 999,
-              $count: true,
-            },
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const selectedGroups = Array.isArray(formData?.groupTargets) ? formData.groupTargets : [];
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          platformType: "deviceAppManagement",
-          GroupIds: selectedGroups.map((group) => group.value).filter(Boolean),
-          GroupNames: selectedGroups.map((group) => group.label).filter(Boolean),
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-    },
-    {
-      label: "Delete Policy",
-      type: "POST",
-      url: "/api/RemovePolicy",
-      data: {
-        ID: "id",
-        URLName: "URLName",
-      },
-      confirmText: "Are you sure you want to delete this policy?",
-      icon: <TrashIcon />,
-      color: "danger",
-    },
-  ];
+    platformType: "deviceAppManagement",
+    deleteUrlName: "URLName",
+  });
 
   const offCanvas = {
     extendedInfoFields: [
diff --git a/src/pages/endpoint/MEM/list-compliance-policies/index.js b/src/pages/endpoint/MEM/list-compliance-policies/index.js
index 54004aef6124..b3394023c492 100644
--- a/src/pages/endpoint/MEM/list-compliance-policies/index.js
+++ b/src/pages/endpoint/MEM/list-compliance-policies/index.js
@@ -1,313 +1,22 @@
 import { Layout as DashboardLayout } from "../../../../layouts/index.js";
 import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx";
-import { Book, LaptopChromebook } from "@mui/icons-material";
-import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline";
 import { PermissionButton } from "../../../../utils/permissions.js";
 import { CippPolicyDeployDrawer } from "../../../../components/CippComponents/CippPolicyDeployDrawer.jsx";
 import { useSettings } from "../../../../hooks/use-settings.js";
-
-const assignmentModeOptions = [
-  { label: "Replace existing assignments", value: "replace" },
-  { label: "Append to existing assignments", value: "append" },
-];
-
-const assignmentFilterTypeOptions = [
-  { label: "Include - Apply policy to devices matching filter", value: "include" },
-  { label: "Exclude - Apply policy to devices NOT matching filter", value: "exclude" },
-];
+import { useCippIntunePolicyActions } from "../../../../components/CippComponents/CippIntunePolicyActions.jsx";
 
 const Page = () => {
   const pageTitle = "Intune Compliance Policies";
   const cardButtonPermissions = ["Endpoint.MEM.ReadWrite"];
   const tenant = useSettings().currentTenant;
 
-  const actions = [
-    {
-      label: "Create template based on policy",
-      type: "POST",
-      url: "/api/AddIntuneTemplate",
-      data: {
-        ID: "id",
-        ODataType: "@odata.type",
-      },
-      confirmText: "Are you sure you want to create a template based on this policy?",
-      icon: <Book />,
-      color: "info",
-    },
-    {
-      label: "Assign to All Users",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "allLicensedUsers",
-        ID: "id",
-        type: "deviceCompliancePolicies",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: "deviceCompliancePolicies",
-          AssignTo: "allLicensedUsers",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all users?',
-      icon: <UserIcon />,
-      color: "info",
-    },
-    {
-      label: "Assign to All Devices",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "AllDevices",
-        ID: "id",
-        type: "deviceCompliancePolicies",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: "deviceCompliancePolicies",
-          AssignTo: "AllDevices",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all devices?',
-      icon: <LaptopChromebook />,
-      color: "info",
+  const actions = useCippIntunePolicyActions(tenant, "deviceCompliancePolicies", {
+    templateData: {
+      ID: "id",
+      ODataType: "@odata.type",
     },
-    {
-      label: "Assign Globally (All Users / All Devices)",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "AllDevicesAndUsers",
-        ID: "id",
-        type: "deviceCompliancePolicies",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: "deviceCompliancePolicies",
-          AssignTo: "AllDevicesAndUsers",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all users and devices?',
-      icon: <GlobeAltIcon />,
-      color: "info",
-    },
-    {
-      label: "Assign to Custom Group",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      icon: <UserGroupIcon />,
-      color: "info",
-      confirmText: 'Select the target groups for "[displayName]".',
-      fields: [
-        {
-          type: "autoComplete",
-          name: "groupTargets",
-          label: "Group(s)",
-          multiple: true,
-          creatable: false,
-          allowResubmit: true,
-          validators: { required: "Please select at least one group" },
-          api: {
-            url: "/api/ListGraphRequest",
-            dataKey: "Results",
-            queryKey: `ListPolicyAssignmentGroups-${tenant}`,
-            labelField: (group) =>
-              group.id ? `${group.displayName} (${group.id})` : group.displayName,
-            valueField: "id",
-            addedField: {
-              description: "description",
-            },
-            data: {
-              Endpoint: "groups",
-              manualPagination: true,
-              $select: "id,displayName,description",
-              $orderby: "displayName",
-              $top: 999,
-              $count: true,
-            },
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const selectedGroups = Array.isArray(formData?.groupTargets) ? formData.groupTargets : [];
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: "deviceCompliancePolicies",
-          GroupIds: selectedGroups.map((group) => group.value).filter(Boolean),
-          GroupNames: selectedGroups.map((group) => group.label).filter(Boolean),
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-    },
-    {
-      label: "Delete Policy",
-      type: "POST",
-      url: "/api/RemovePolicy",
-      data: {
-        ID: "id",
-        URLName: "deviceCompliancePolicies",
-      },
-      confirmText: "Are you sure you want to delete this policy?",
-      icon: <TrashIcon />,
-      color: "danger",
-    },
-  ];
+    deleteUrlName: "deviceCompliancePolicies",
+  });
 
   const offCanvas = {
     extendedInfoFields: [
diff --git a/src/pages/endpoint/MEM/list-policies/index.js b/src/pages/endpoint/MEM/list-policies/index.js
index 375d4b69d1cd..1b4d2d2c97bc 100644
--- a/src/pages/endpoint/MEM/list-policies/index.js
+++ b/src/pages/endpoint/MEM/list-policies/index.js
@@ -1,313 +1,22 @@
 import { Layout as DashboardLayout } from "../../../../layouts/index.js";
 import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx";
-import { Book, LaptopChromebook } from "@mui/icons-material";
-import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline";
 import { PermissionButton } from "../../../../utils/permissions.js";
 import { CippPolicyDeployDrawer } from "../../../../components/CippComponents/CippPolicyDeployDrawer.jsx";
 import { useSettings } from "../../../../hooks/use-settings.js";
-
-const assignmentModeOptions = [
-  { label: "Replace existing assignments", value: "replace" },
-  { label: "Append to existing assignments", value: "append" },
-];
-
-const assignmentFilterTypeOptions = [
-  { label: "Include - Apply policy to devices matching filter", value: "include" },
-  { label: "Exclude - Apply policy to devices NOT matching filter", value: "exclude" },
-];
+import { useCippIntunePolicyActions } from "../../../../components/CippComponents/CippIntunePolicyActions.jsx";
 
 const Page = () => {
   const pageTitle = "Configuration Policies";
   const cardButtonPermissions = ["Endpoint.MEM.ReadWrite"];
   const tenant = useSettings().currentTenant;
 
-  const actions = [
-    {
-      label: "Create template based on policy",
-      type: "POST",
-      url: "/api/AddIntuneTemplate",
-      data: {
-        ID: "id",
-        URLName: "URLName",
-      },
-      confirmText: "Are you sure you want to create a template based on this policy?",
-      icon: <Book />,
-      color: "info",
-    },
-    {
-      label: "Assign to All Users",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "allLicensedUsers",
-        ID: "id",
-        type: "URLName",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          AssignTo: "allLicensedUsers",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all users?',
-      icon: <UserIcon />,
-      color: "info",
-    },
-    {
-      label: "Assign to All Devices",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "AllDevices",
-        ID: "id",
-        type: "URLName",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          AssignTo: "AllDevices",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all devices?',
-      icon: <LaptopChromebook />,
-      color: "info",
+  const actions = useCippIntunePolicyActions(tenant, "URLName", {
+    templateData: {
+      ID: "id",
+      URLName: "URLName",
     },
-    {
-      label: "Assign Globally (All Users / All Devices)",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      data: {
-        AssignTo: "AllDevicesAndUsers",
-        ID: "id",
-        type: "URLName",
-      },
-      fields: [
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          AssignTo: "AllDevicesAndUsers",
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-      confirmText: 'Are you sure you want to assign "[displayName]" to all users and devices?',
-      icon: <GlobeAltIcon />,
-      color: "info",
-    },
-    {
-      label: "Assign to Custom Group",
-      type: "POST",
-      url: "/api/ExecAssignPolicy",
-      icon: <UserGroupIcon />,
-      color: "info",
-      confirmText: 'Select the target groups for "[displayName]".',
-      fields: [
-        {
-          type: "autoComplete",
-          name: "groupTargets",
-          label: "Group(s)",
-          multiple: true,
-          creatable: false,
-          allowResubmit: true,
-          validators: { required: "Please select at least one group" },
-          api: {
-            url: "/api/ListGraphRequest",
-            dataKey: "Results",
-            queryKey: `ListPolicyAssignmentGroups-${tenant}`,
-            labelField: (group) =>
-              group.id ? `${group.displayName} (${group.id})` : group.displayName,
-            valueField: "id",
-            addedField: {
-              description: "description",
-            },
-            data: {
-              Endpoint: "groups",
-              manualPagination: true,
-              $select: "id,displayName,description",
-              $orderby: "displayName",
-              $top: 999,
-              $count: true,
-            },
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentMode",
-          label: "Assignment mode",
-          options: assignmentModeOptions,
-          defaultValue: "replace",
-          helperText:
-            "Replace will overwrite existing assignments. Append keeps current assignments and adds/overwrites only for the selected groups.",
-        },
-        {
-          type: "autoComplete",
-          name: "assignmentFilter",
-          label: "Assignment Filter (Optional)",
-          multiple: false,
-          creatable: false,
-          api: {
-            url: "/api/ListAssignmentFilters",
-            queryKey: `ListAssignmentFilters-${tenant}`,
-            labelField: (filter) => filter.displayName,
-            valueField: "displayName",
-          },
-        },
-        {
-          type: "radio",
-          name: "assignmentFilterType",
-          label: "Assignment Filter Mode",
-          options: assignmentFilterTypeOptions,
-          defaultValue: "include",
-          helperText: "Choose whether to include or exclude devices matching the filter.",
-        },
-      ],
-      customDataformatter: (row, action, formData) => {
-        const selectedGroups = Array.isArray(formData?.groupTargets) ? formData.groupTargets : [];
-        const tenantFilterValue = tenant === "AllTenants" && row?.Tenant ? row.Tenant : tenant;
-        return {
-          tenantFilter: tenantFilterValue,
-          ID: row?.id,
-          type: row?.URLName,
-          GroupIds: selectedGroups.map((group) => group.value).filter(Boolean),
-          GroupNames: selectedGroups.map((group) => group.label).filter(Boolean),
-          assignmentMode: formData?.assignmentMode || "replace",
-          AssignmentFilterName: formData?.assignmentFilter?.value || null,
-          AssignmentFilterType: formData?.assignmentFilter?.value
-            ? formData?.assignmentFilterType || "include"
-            : null,
-        };
-      },
-    },
-    {
-      label: "Delete Policy",
-      type: "POST",
-      url: "/api/RemovePolicy",
-      data: {
-        ID: "id",
-        URLName: "URLName",
-      },
-      confirmText: "Are you sure you want to delete this policy?",
-      icon: <TrashIcon />,
-      color: "danger",
-    },
-  ];
+    deleteUrlName: "URLName",
+  });
 
   const offCanvas = {
     extendedInfoFields: [
diff --git a/src/pages/identity/administration/users/add.jsx b/src/pages/identity/administration/users/add.jsx
index eabb890fa965..28606efc90ba 100644
--- a/src/pages/identity/administration/users/add.jsx
+++ b/src/pages/identity/administration/users/add.jsx
@@ -37,6 +37,12 @@ const Page = () => {
       }
       newFields.tenantFilter = userSettingsDefaults.currentTenant;
 
+      // Preserve the currently selected template when copying properties
+      const currentTemplate = formControl.getValues("userTemplate");
+      if (currentTemplate) {
+        newFields.userTemplate = currentTemplate;
+      }
+
       formControl.reset(newFields);
     }
   }, [formValues]);
diff --git a/src/pages/tenant/manage/applied-standards.js b/src/pages/tenant/manage/applied-standards.js
index c17dc52e67cb..61bce5fda961 100644
--- a/src/pages/tenant/manage/applied-standards.js
+++ b/src/pages/tenant/manage/applied-standards.js
@@ -1779,7 +1779,8 @@ const Page = () => {
                               </Box>
                             ) : (
                               <Alert severity="info">
-                                This data has not yet been collected. Collect the data by selecting Refresh Data from the Actions dropdown on the top of the page.
+                                This data has not yet been collected. Collect the data by selecting
+                                Refresh Data from the Actions dropdown on the top of the page.
                               </Alert>
                             )}
 
@@ -2187,7 +2188,7 @@ const Page = () => {
                                                   textTransform: "uppercase",
                                                   letterSpacing: 0.5,
                                                   display: "block",
-                                                  mb: 1,
+                                                  mb: 2,
                                                 }}
                                               >
                                                 Current Configuration
@@ -2481,13 +2482,7 @@ const Page = () => {
                                       standard.currentTenantValue.CurrentValue !== null ? (
                                         <Stack
                                           spacing={2}
-                                          sx={{
-                                            mt:
-                                              standard.currentTenantValue?.Value === false ||
-                                              standard.currentTenantValue === false
-                                                ? 1
-                                                : 2,
-                                          }}
+                                          
                                         >
                                           <Typography
                                             variant="caption"
@@ -2597,15 +2592,7 @@ const Page = () => {
                                           })}
                                         </Stack>
                                       ) : (
-                                        <Box
-                                          sx={{
-                                            mt:
-                                              standard.currentTenantValue?.Value === false ||
-                                              standard.currentTenantValue === false
-                                                ? 1
-                                                : 2,
-                                          }}
-                                        >
+                                        <Box>
                                           <Typography
                                             variant="caption"
                                             sx={{
@@ -2614,7 +2601,7 @@ const Page = () => {
                                               textTransform: "uppercase",
                                               letterSpacing: 0.5,
                                               display: "block",
-                                              mb: 1,
+                                              mb: 2,
                                             }}
                                           >
                                             Current Configuration
diff --git a/src/pages/tenant/manage/drift.js b/src/pages/tenant/manage/drift.js
index 85ddc2871f88..e2ad9865383b 100644
--- a/src/pages/tenant/manage/drift.js
+++ b/src/pages/tenant/manage/drift.js
@@ -1316,6 +1316,11 @@ const ManageDriftPage = () => {
     }
   }, [templateId]);
 
+  // Effect to clear selected items when tenant changes
+  useEffect(() => {
+    setSelectedItems([]);
+  }, [tenantFilter]);
+
   // Add action buttons to each deviation item
   const deviationItemsWithActions = actualDeviationItems.map((item) => {
     return {
@@ -1959,6 +1964,10 @@ const ManageDriftPage = () => {
                     ? "for this tenant"
                     : "this deviation"
             }?`,
+            onSuccess: () => {
+              // Clear selected items after successful action
+              setSelectedItems([]);
+            },
           }}
           row={actionData.data}
           relatedQueryKeys={[`TenantDrift-${tenantFilter}`]}
diff --git a/src/pages/tenant/manage/edit.js b/src/pages/tenant/manage/edit.js
index fdc18281a1f8..b96994fe7069 100644
--- a/src/pages/tenant/manage/edit.js
+++ b/src/pages/tenant/manage/edit.js
@@ -136,6 +136,15 @@ const Page = () => {
     };
 
     offboardingFormControl.reset({ offboardingDefaults: defaultOffboardingValues });
+
+    updateOffboardingDefaults.mutate({
+      url: "/api/EditTenantOffboardingDefaults",
+      data: {
+        customerId: tenantDetails.data?.id || currentTenant,
+        defaultDomainName: tenantDetails.data?.defaultDomainName || currentTenant,
+        offboardingDefaults: null,
+      },
+    });
   };
 
   const title = "Manage Tenant";
@@ -275,7 +284,8 @@ const Page = () => {
                   onClick={offboardingFormControl.handleSubmit((values) => {
                     const offboardingSettings = values.offboardingDefaults || values;
                     const formattedValues = {
-                      customerId: currentTenant,
+                      customerId: tenantDetails.data?.id || currentTenant,
+                      defaultDomainName: tenantDetails.data?.defaultDomainName || currentTenant,
                       offboardingDefaults: offboardingSettings,
                     };
                     updateOffboardingDefaults.mutate({
@@ -309,6 +319,7 @@ const Page = () => {
                   <Button
                     variant="outlined"
                     onClick={handleResetOffboardingDefaults}
+                    disabled={updateOffboardingDefaults.isPending || tenantDetails.isFetching}
                     sx={{ mr: 2 }}
                   >
                     Reset All to Off
diff --git a/yarn.lock b/yarn.lock
index 435c9b238443..33f7f0fb0628 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -931,10 +931,10 @@
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
     "@babel/plugin-transform-typescript" "^7.28.5"
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.27.6", "@babel/runtime@^7.28.3", "@babel/runtime@^7.28.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
-  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.13", "@babel/runtime@^7.27.6", "@babel/runtime@^7.28.3", "@babel/runtime@^7.28.4", "@babel/runtime@^7.28.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.28.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.6.tgz#d267a43cb1836dc4d182cce93ae75ba954ef6d2b"
+  integrity sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==
 
 "@babel/template@^7.27.1", "@babel/template@^7.27.2":
   version "7.27.2"
@@ -2255,20 +2255,20 @@
   resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.11.2.tgz#00409e743ac4eea9afe5b7708594d5fcebb00212"
   integrity sha512-vTtpNt7mKCiZ1pwU9hfKPhpdVO2sVzFQsxoVBGtOSHxlrRRzYr8iQ2TlwbAcRYCcEiZ9ECAM8kBzH0v2+VzfKw==
 
-"@tiptap/core@^3.19.0", "@tiptap/core@^3.4.1":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-3.19.0.tgz#dca483b50e1b8a596f695aecde387a79fe7da717"
-  integrity sha512-bpqELwPW+DG8gWiD8iiFtSl4vIBooG5uVJod92Qxn3rA9nFatyXRr4kNbMJmOZ66ezUvmCjXVe/5/G4i5cyzKA==
+"@tiptap/core@^3.20.0", "@tiptap/core@^3.4.1":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-3.20.0.tgz#dac72894d83829f2fbbabee2e90a748d7c1479ee"
+  integrity sha512-aC9aROgia/SpJqhsXFiX9TsligL8d+oeoI8W3u00WI45s0VfsqjgeKQLDLF7Tu7hC+7F02teC84SAHuup003VQ==
 
-"@tiptap/extension-blockquote@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-3.19.0.tgz#86c52e8e3b6d1e072ae0d9c895723034a1e37096"
-  integrity sha512-y3UfqY9KD5XwWz3ndiiJ089Ij2QKeiXy/g1/tlAN/F1AaWsnkHEHMLxCP1BIqmMpwsX7rZjMLN7G5Lp7c9682A==
+"@tiptap/extension-blockquote@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-3.20.0.tgz#92e4a8ed00cf4fcab056766b848fc0a551847e5b"
+  integrity sha512-LQzn6aGtL4WXz2+rYshl/7/VnP2qJTpD7fWL96GXAzhqviPEY1bJES7poqJb3MU/gzl8VJUVzVzU1VoVfUKlbA==
 
-"@tiptap/extension-bold@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-3.19.0.tgz#ef0ddfd9b242ef9c25e3348aef9bf2dc681cdc19"
-  integrity sha512-UZgb1d0XK4J/JRIZ7jW+s4S6KjuEDT2z1PPM6ugcgofgJkWQvRZelCPbmtSFd3kwsD+zr9UPVgTh9YIuGQ8t+Q==
+"@tiptap/extension-bold@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-3.20.0.tgz#4298d24cb6c7759f6233eec5e24e9fd7c7efdf38"
+  integrity sha512-sQklEWiyf58yDjiHtm5vmkVjfIc/cBuSusmCsQ0q9vGYnEF1iOHKhGpvnCeEXNeqF3fiJQRlquzt/6ymle3Iwg==
 
 "@tiptap/extension-bubble-menu@^3.13.0":
   version "3.13.0"
@@ -2277,127 +2277,127 @@
   dependencies:
     "@floating-ui/dom" "^1.0.0"
 
-"@tiptap/extension-bullet-list@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-3.19.0.tgz#acf12e952b6a5873dc20b58530f2f524807bbd6f"
-  integrity sha512-F9uNnqd0xkJbMmRxVI5RuVxwB9JaCH/xtRqOUNQZnRBt7IdAElCY+Dvb4hMCtiNv+enGM/RFGJuFHR9TxmI7rw==
+"@tiptap/extension-bullet-list@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-3.20.0.tgz#57bcba5988990f39cb71c7901173da9b4979523b"
+  integrity sha512-OcKMeopBbqWzhSi6o8nNz0aayogg1sfOAhto3NxJu3Ya32dwBFqmHXSYM6uW4jOphNvVPyjiq9aNRh3qTdd1dw==
 
-"@tiptap/extension-code-block@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-3.19.0.tgz#71a7a362b3fa68c1789c8b9ac224ca89eb410630"
-  integrity sha512-b/2qR+tMn8MQb+eaFYgVk4qXnLNkkRYmwELQ8LEtEDQPxa5Vl7J3eu8+4OyoIFhZrNDZvvoEp80kHMCP8sI6rg==
+"@tiptap/extension-code-block@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-3.20.0.tgz#5c00e8ae017c32ff4dd629447635a25fcb9d0f52"
+  integrity sha512-lBbmNek14aCjrHcBcq3PRqWfNLvC6bcRa2Osc6e/LtmXlcpype4f6n+Yx+WZ+f2uUh0UmDRCz7BEyUETEsDmlQ==
 
-"@tiptap/extension-code@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-3.19.0.tgz#15d53c139ad64d1debcc08c7ca5afbcc8e531f0b"
-  integrity sha512-2kqqQIXBXj2Or+4qeY3WoE7msK+XaHKL6EKOcKlOP2BW8eYqNTPzNSL+PfBDQ3snA7ljZQkTs/j4GYDj90vR1A==
+"@tiptap/extension-code@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-3.20.0.tgz#6aa18bc21ed8a3a6a899653c48add1cecc64783d"
+  integrity sha512-TYDWFeSQ9umiyrqsT6VecbuhL8XIHkUhO+gEk0sVvH67ZLwjFDhAIIgWIr1/dbIGPcvMZM19E7xUUhAdIaXaOQ==
 
-"@tiptap/extension-document@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-3.19.0.tgz#dfa6889cff748d489e0bc1028918bf4571372ba5"
-  integrity sha512-AOf0kHKSFO0ymjVgYSYDncRXTITdTcrj1tqxVazrmO60KNl1Rc2dAggDvIVTEBy5NvceF0scc7q3sE/5ZtVV7A==
+"@tiptap/extension-document@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-3.20.0.tgz#e10f92139c97354ab917f3095d4011d6703528f6"
+  integrity sha512-oJfLIG3vAtZo/wg29WiBcyWt22KUgddpP8wqtCE+kY5Dw8znLR9ehNmVWlSWJA5OJUMO0ntAHx4bBT+I2MBd5w==
 
-"@tiptap/extension-dropcursor@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-3.19.0.tgz#fbef441944842f23fe0a35154b519103166a4848"
-  integrity sha512-sf3dEZXiLvsGqVK2maUIzXY6qtYYCvBumag7+VPTMGQ0D4hiZ1X/4ukt4+6VXDg5R2WP1CoIt/QvUetUjWNhbQ==
+"@tiptap/extension-dropcursor@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-3.20.0.tgz#459d6c5d7e5f4dc1152246901387e000596fbb40"
+  integrity sha512-d+cxplRlktVgZPwatnc34IArlppM0IFKS1J5wLk+ba1jidizsbMVh45tP/BTK2flhyfRqcNoB5R0TArhUpbkNQ==
 
 "@tiptap/extension-floating-menu@^3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-3.13.0.tgz#03d03292add49d1b380cdb1ff3890b2956d4e3f5"
   integrity sha512-OsezV2cMofZM4c13gvgi93IEYBUzZgnu8BXTYZQiQYekz4bX4uulBmLa1KOA9EN71FzS+SoLkXHU0YzlbLjlxA==
 
-"@tiptap/extension-gapcursor@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-3.19.0.tgz#64e5462a4ab2f0bd110738410dcbf3597d76349f"
-  integrity sha512-w7DACS4oSZaDWjz7gropZHPc9oXqC9yERZTcjWxyORuuIh1JFf0TRYspleK+OK28plK/IftojD/yUDn1MTRhvA==
+"@tiptap/extension-gapcursor@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-3.20.0.tgz#df89dd19417c020c6e9529e2db5077d08353e4a1"
+  integrity sha512-P/LasfvG9/qFq43ZAlNbAnPnXC+/RJf49buTrhtFvI9Zg0+Lbpjx1oh6oMHB19T88Y28KtrckfFZ8aTSUWDq6w==
 
-"@tiptap/extension-hard-break@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-3.19.0.tgz#7120524cec9ed4b957963693cb4c57cbecbaecf8"
-  integrity sha512-lAmQraYhPS5hafvCl74xDB5+bLuNwBKIEsVoim35I0sDJj5nTrfhaZgMJ91VamMvT+6FF5f1dvBlxBxAWa8jew==
+"@tiptap/extension-hard-break@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-3.20.0.tgz#fff1553d3b41ad32d3979d618f0f894cee926f46"
+  integrity sha512-rqvhMOw4f+XQmEthncbvDjgLH6fz8L9splnKZC7OeS0eX8b0qd7+xI1u5kyxF3KA2Z0BnigES++jjWuecqV6mA==
 
-"@tiptap/extension-heading@^3.19.0", "@tiptap/extension-heading@^3.4.1":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-3.19.0.tgz#d0bc93426c01a2ed36b9124c1a8205ab3945e77a"
-  integrity sha512-uLpLlfyp086WYNOc0ekm1gIZNlEDfmzOhKzB0Hbyi6jDagTS+p9mxUNYeYOn9jPUxpFov43+Wm/4E24oY6B+TQ==
+"@tiptap/extension-heading@^3.20.0", "@tiptap/extension-heading@^3.4.1":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-3.20.0.tgz#a16dbb625d91556399912fa110b04b2ad2dfd2e3"
+  integrity sha512-JgJhurnCe3eN6a0lEsNQM/46R1bcwzwWWZEFDSb1P9dR8+t1/5v7cMZWsSInpD7R4/74iJn0+M5hcXLwCmBmYA==
 
-"@tiptap/extension-horizontal-rule@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.19.0.tgz#0e77078fcd53beca786277ce83d259e2103cc361"
-  integrity sha512-iqUHmgMGhMgYGwG6L/4JdelVQ5Mstb4qHcgTGd/4dkcUOepILvhdxajPle7OEdf9sRgjQO6uoAU5BVZVC26+ng==
+"@tiptap/extension-horizontal-rule@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.20.0.tgz#53ffe2f9b9627f27f85b02d75878583dfb044107"
+  integrity sha512-6uvcutFMv+9wPZgptDkbRDjAm3YVxlibmkhWD5GuaWwS9L/yUtobpI3GycujRSUZ8D3q6Q9J7LqpmQtQRTalWA==
 
 "@tiptap/extension-image@^3.4.1":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-3.13.0.tgz#55edb952e86c2ebed436cd53def8b2e743d71d7e"
   integrity sha512-223uzLUkIa1rkK7aQK3AcIXe6LbCtmnpVb7sY5OEp+LpSaSPyXwyrZ4A0EO1o98qXG68/0B2OqMntFtA9c5Fbw==
 
-"@tiptap/extension-italic@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-3.19.0.tgz#af2a9c095ec846e379041f3e17e1dd101a5a4bf8"
-  integrity sha512-6GffxOnS/tWyCbDkirWNZITiXRta9wrCmrfa4rh+v32wfaOL1RRQNyqo9qN6Wjyl1R42Js+yXTzTTzZsOaLMYA==
+"@tiptap/extension-italic@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-3.20.0.tgz#176c2080a75082d296797618c2ed84e9defc7ef9"
+  integrity sha512-/DhnKQF8yN8RxtuL8abZ28wd5281EaGoE2Oha35zXSOF1vNYnbyt8Ymkv/7u1BcWEWTvRPgaju0YCGXisPRLYw==
 
-"@tiptap/extension-link@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-3.19.0.tgz#e8e656735bda6ca1d4b6577821e06274ab0ff6c8"
-  integrity sha512-HEGDJnnCPfr7KWu7Dsq+eRRe/mBCsv6DuI+7fhOCLDJjjKzNgrX2abbo/zG3D/4lCVFaVb+qawgJubgqXR/Smw==
+"@tiptap/extension-link@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-3.20.0.tgz#b3f2d89aabb88ed1eb66925e59fe82d1d2b866e9"
+  integrity sha512-qI/5A+R0ZWBxo/8HxSn1uOyr7odr3xHBZ/gzOR1GUJaZqjlJxkWFX0RtXMbLKEGEvT25o345cF7b0wFznEh8qA==
   dependencies:
     linkifyjs "^4.3.2"
 
-"@tiptap/extension-list-item@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-3.19.0.tgz#b2218ff6be694b581fd7d817810a33ee1c218311"
-  integrity sha512-VsSKuJz4/Tb6ZmFkXqWpDYkRzmaLTyE6dNSEpNmUpmZ32sMqo58mt11/huADNwfBFB0Ve7siH/VnFNIJYY3xvg==
+"@tiptap/extension-list-item@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-3.20.0.tgz#60ec36a3326d3bf28982b653b63f6cab5c7d9d9f"
+  integrity sha512-qEtjaaGPuqaFB4VpLrGDoIe9RHnckxPfu6d3rc22ap6TAHCDyRv05CEyJogqccnFceG/v5WN4znUBER8RWnWHA==
 
-"@tiptap/extension-list-keymap@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-keymap/-/extension-list-keymap-3.19.0.tgz#41b87b154560aad92e779bff5c6e32e125b792ea"
-  integrity sha512-bxgmAgA3RzBGA0GyTwS2CC1c+QjkJJq9hC+S6PSOWELGRiTbwDN3MANksFXLjntkTa0N5fOnL27vBHtMStURqw==
+"@tiptap/extension-list-keymap@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list-keymap/-/extension-list-keymap-3.20.0.tgz#3e49292b0cdf0a7b6d8f08ae5acdd7014c15cdc1"
+  integrity sha512-Z4GvKy04Ms4cLFN+CY6wXswd36xYsT2p/YL0V89LYFMZTerOeTjFYlndzn6svqL8NV1PRT5Diw4WTTxJSmcJPA==
 
-"@tiptap/extension-list@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-list/-/extension-list-3.19.0.tgz#737dcb56ba9838a4431c1afb035bd622fab46d21"
-  integrity sha512-N6nKbFB2VwMsPlCw67RlAtYSK48TAsAUgjnD+vd3ieSlIufdQnLXDFUP6hFKx9mwoUVUgZGz02RA6bkxOdYyTw==
+"@tiptap/extension-list@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-list/-/extension-list-3.20.0.tgz#17d379fe34e09a9b42ab620f7ff571826485c7d5"
+  integrity sha512-+V0/gsVWAv+7vcY0MAe6D52LYTIicMSHw00wz3ISZgprSb2yQhJ4+4gurOnUrQ4Du3AnRQvxPROaofwxIQ66WQ==
 
-"@tiptap/extension-ordered-list@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-3.19.0.tgz#f6f8bfe41d3429c505b44764b473b6dfd7bcd2a1"
-  integrity sha512-cxGsINquwHYE1kmhAcLNLHAofmoDEG6jbesR5ybl7tU5JwtKVO7S/xZatll2DU1dsDAXWPWEeeMl4e/9svYjCg==
+"@tiptap/extension-ordered-list@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-3.20.0.tgz#ec449716854d496ef7c1ea9243c2c467fa5d3cb1"
+  integrity sha512-jVKnJvrizLk7etwBMfyoj6H2GE4M+PD4k7Bwp6Bh1ohBWtfIA1TlngdS842Mx5i1VB2e3UWIwr8ZH46gl6cwMA==
 
-"@tiptap/extension-paragraph@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-3.19.0.tgz#91adde189aabf13a2bfbb2d961833d3bc2bc055f"
-  integrity sha512-xWa6gj82l5+AzdYyrSk9P4ynySaDzg/SlR1FarXE5yPXibYzpS95IWaVR0m2Qaz7Rrk+IiYOTGxGRxcHLOelNg==
+"@tiptap/extension-paragraph@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-3.20.0.tgz#b1778746021ac38894287d62d9429ac309a632ef"
+  integrity sha512-mM99zK4+RnEXIMCv6akfNATAs0Iija6FgyFA9J9NZ6N4o8y9QiNLLa6HjLpAC+W+VoCgQIekyoF/Q9ftxmAYDQ==
 
-"@tiptap/extension-strike@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-3.19.0.tgz#eac7712cc791488f4c1c48baf3aed1a8d95f398c"
-  integrity sha512-xYpabHsv7PccLUBQaP8AYiFCnYbx6P93RHPd0lgNwhdOjYFd931Zy38RyoxPHAgbYVmhf1iyx7lpuLtBnhS5dA==
+"@tiptap/extension-strike@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-3.20.0.tgz#a1ec09a1a56aad98d6e7dc493d77547cad4403ee"
+  integrity sha512-0vcTZRRAiDfon3VM1mHBr9EFmTkkUXMhm0Xtdtn0bGe+sIqufyi+hUYTEw93EQOD9XNsPkrud6jzQNYpX2H3AQ==
 
 "@tiptap/extension-table@^3.19.0":
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-3.19.0.tgz#a5f9be88e319f60dc7b8df1321f95a31b20fe991"
   integrity sha512-Lg8DlkkDUMYE/CcGOxoCWF98B2i7VWh+AGgqlF+XWrHjhlKHfENLRXm1a0vWuyyP3NknRYILoaaZ1s7QzmXKRA==
 
-"@tiptap/extension-text@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-3.19.0.tgz#353278c97bd8f5bdc29f06942fbd1e856bdb5b18"
-  integrity sha512-K95+SnbZy0h6hNFtfy23n8t/nOcTFEf69In9TSFVVmwn/Nwlke+IfiESAkqbt1/7sKJeegRXYO7WzFEmFl9Q/g==
+"@tiptap/extension-text@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-3.20.0.tgz#bdf0ac6e0c638c9dbb99a5a2b5a07db2b8cba1de"
+  integrity sha512-tf8bE8tSaOEWabCzPm71xwiUhyMFKqY9jkP5af3Kr1/F45jzZFIQAYZooHI/+zCHRrgJ99MQHKHe1ZNvODrKHQ==
 
-"@tiptap/extension-underline@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-3.19.0.tgz#bbc81d085725981d256127ab416f91d0802ec2a4"
-  integrity sha512-800MGEWfG49j10wQzAFiW/ele1HT04MamcL8iyuPNu7ZbjbGN2yknvdrJlRy7hZlzIrVkZMr/1tz62KN33VHIw==
+"@tiptap/extension-underline@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-3.20.0.tgz#535aebafc9e30da51df3be2c2065c49539535672"
+  integrity sha512-LzNXuy2jwR/y+ymoUqC72TiGzbOCjioIjsDu0MNYpHuHqTWPK5aV9Mh0nbZcYFy/7fPlV1q0W139EbJeYBZEAQ==
 
-"@tiptap/extensions@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/extensions/-/extensions-3.19.0.tgz#5747c0ebf460b9669e8b4362561872448f66abfe"
-  integrity sha512-ZmGUhLbMWaGqnJh2Bry+6V4M6gMpUDYo4D1xNux5Gng/E/eYtc+PMxMZ/6F7tNTAuujLBOQKj6D+4SsSm457jw==
+"@tiptap/extensions@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extensions/-/extensions-3.20.0.tgz#22bad09a1d861446e17e0d9732439940d80ed808"
+  integrity sha512-HIsXX942w3nbxEQBlMAAR/aa6qiMBEP7CsSMxaxmTIVAmW35p6yUASw6GdV1u0o3lCZjXq2OSRMTskzIqi5uLg==
 
-"@tiptap/pm@^3.19.0", "@tiptap/pm@^3.4.1":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-3.19.0.tgz#5cb499c7b2603ec6550d0c7a70b924f27fdb7692"
-  integrity sha512-789zcnM4a8OWzvbD2DL31d0wbSm9BVeO/R7PLQwLIGysDI3qzrcclyZ8yhqOEVuvPitRRwYLq+mY14jz7kY4cw==
+"@tiptap/pm@^3.20.0", "@tiptap/pm@^3.4.1":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-3.20.0.tgz#d9a1b92a1cb061059977952e6ec2afe8dff67857"
+  integrity sha512-jn+2KnQZn+b+VXr8EFOJKsnjVNaA4diAEr6FOazupMt8W8ro1hfpYtZ25JL87Kao/WbMze55sd8M8BDXLUKu1A==
   dependencies:
     prosemirror-changeset "^2.3.0"
     prosemirror-collab "^1.3.1"
@@ -2430,35 +2430,35 @@
     "@tiptap/extension-bubble-menu" "^3.13.0"
     "@tiptap/extension-floating-menu" "^3.13.0"
 
-"@tiptap/starter-kit@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-3.19.0.tgz#312440bd18c3cce379ea8eab3fe174b8141dd313"
-  integrity sha512-dTCkHEz+Y8ADxX7h+xvl6caAj+3nII/wMB1rTQchSuNKqJTOrzyUsCWm094+IoZmLT738wANE0fRIgziNHs/ug==
-  dependencies:
-    "@tiptap/core" "^3.19.0"
-    "@tiptap/extension-blockquote" "^3.19.0"
-    "@tiptap/extension-bold" "^3.19.0"
-    "@tiptap/extension-bullet-list" "^3.19.0"
-    "@tiptap/extension-code" "^3.19.0"
-    "@tiptap/extension-code-block" "^3.19.0"
-    "@tiptap/extension-document" "^3.19.0"
-    "@tiptap/extension-dropcursor" "^3.19.0"
-    "@tiptap/extension-gapcursor" "^3.19.0"
-    "@tiptap/extension-hard-break" "^3.19.0"
-    "@tiptap/extension-heading" "^3.19.0"
-    "@tiptap/extension-horizontal-rule" "^3.19.0"
-    "@tiptap/extension-italic" "^3.19.0"
-    "@tiptap/extension-link" "^3.19.0"
-    "@tiptap/extension-list" "^3.19.0"
-    "@tiptap/extension-list-item" "^3.19.0"
-    "@tiptap/extension-list-keymap" "^3.19.0"
-    "@tiptap/extension-ordered-list" "^3.19.0"
-    "@tiptap/extension-paragraph" "^3.19.0"
-    "@tiptap/extension-strike" "^3.19.0"
-    "@tiptap/extension-text" "^3.19.0"
-    "@tiptap/extension-underline" "^3.19.0"
-    "@tiptap/extensions" "^3.19.0"
-    "@tiptap/pm" "^3.19.0"
+"@tiptap/starter-kit@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-3.20.0.tgz#d356f15632c52f90e8eea8b5c912cab3b01b0866"
+  integrity sha512-W4+1re35pDNY/7rpXVg+OKo/Fa4Gfrn08Bq3E3fzlJw6gjE3tYU8dY9x9vC2rK9pd9NOp7Af11qCFDaWpohXkw==
+  dependencies:
+    "@tiptap/core" "^3.20.0"
+    "@tiptap/extension-blockquote" "^3.20.0"
+    "@tiptap/extension-bold" "^3.20.0"
+    "@tiptap/extension-bullet-list" "^3.20.0"
+    "@tiptap/extension-code" "^3.20.0"
+    "@tiptap/extension-code-block" "^3.20.0"
+    "@tiptap/extension-document" "^3.20.0"
+    "@tiptap/extension-dropcursor" "^3.20.0"
+    "@tiptap/extension-gapcursor" "^3.20.0"
+    "@tiptap/extension-hard-break" "^3.20.0"
+    "@tiptap/extension-heading" "^3.20.0"
+    "@tiptap/extension-horizontal-rule" "^3.20.0"
+    "@tiptap/extension-italic" "^3.20.0"
+    "@tiptap/extension-link" "^3.20.0"
+    "@tiptap/extension-list" "^3.20.0"
+    "@tiptap/extension-list-item" "^3.20.0"
+    "@tiptap/extension-list-keymap" "^3.20.0"
+    "@tiptap/extension-ordered-list" "^3.20.0"
+    "@tiptap/extension-paragraph" "^3.20.0"
+    "@tiptap/extension-strike" "^3.20.0"
+    "@tiptap/extension-text" "^3.20.0"
+    "@tiptap/extension-underline" "^3.20.0"
+    "@tiptap/extensions" "^3.20.0"
+    "@tiptap/pm" "^3.20.0"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -4898,12 +4898,12 @@ hyphen@^1.6.4:
   resolved "https://registry.yarnpkg.com/hyphen/-/hyphen-1.10.6.tgz#0e779d280e696102b97d7e42f5ca5de2cc97e274"
   integrity sha512-fXHXcGFTXOvZTSkPJuGOQf5Lv5T/R2itiiCVPg9LxAje5D00O0pP83yJShFq5V89Ly//Gt6acj7z8pbBr34stw==
 
-i18next@25.5.2:
-  version "25.5.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-25.5.2.tgz#16efa309e154d46dac7583e6a315ccb47e3e3a10"
-  integrity sha512-lW8Zeh37i/o0zVr+NoCHfNnfvVw+M6FQbRp36ZZ/NyHDJ3NJVpp2HhAUyU9WafL5AssymNoOjMRB48mmx2P6Hw==
+i18next@25.8.13:
+  version "25.8.13"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-25.8.13.tgz#1f9df59329f1706f02b2b58b5d1f75196ddb6e4a"
+  integrity sha512-E0vzjBY1yM+nsFrtgkjLhST2NBkirkvOVoQa0MSldhsuZ3jUge7ZNpuwG0Cfc74zwo5ZwRzg3uOgT+McBn32iA==
   dependencies:
-    "@babel/runtime" "^7.27.6"
+    "@babel/runtime" "^7.28.4"
 
 ignore@^5.2.0:
   version "5.3.2"
@@ -5331,12 +5331,12 @@ jspdf-autotable@^5.0.7:
   resolved "https://registry.yarnpkg.com/jspdf-autotable/-/jspdf-autotable-5.0.7.tgz#c5970646dd5ae18801d97e3e91625c95783efbe4"
   integrity sha512-2wr7H6liNDBYNwt25hMQwXkEWFOEopgKIvR1Eukuw6Zmprm/ZcnmLTQEjW7Xx3FCbD3v7pflLcnMAv/h1jFDQw==
 
-jspdf@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-4.1.0.tgz#4fb476251c8751c996175cfaac02d30fdf8c7b7a"
-  integrity sha512-xd1d/XRkwqnsq6FP3zH1Q+Ejqn2ULIJeDZ+FTKpaabVpZREjsJKRJwuokTNgdqOU+fl55KgbvgZ1pRTSWCP2kQ==
+jspdf@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-4.2.0.tgz#f5b42a8e1592c3da1531d005adc87ccc19272965"
+  integrity sha512-hR/hnRevAXXlrjeqU5oahOE+Ln9ORJUB5brLHHqH67A+RBQZuFr5GkbI9XQI8OUFSEezKegsi45QRpc4bGj75Q==
   dependencies:
-    "@babel/runtime" "^7.28.4"
+    "@babel/runtime" "^7.28.6"
     fast-png "^6.2.0"
     fflate "^0.8.1"
   optionalDependencies: