diff --git a/.github/workflows/build-extension-catalog.yml b/.github/workflows/build-extension-catalog.yml
index 2f4b7c52d0..48cfc89d9a 100644
--- a/.github/workflows/build-extension-catalog.yml
+++ b/.github/workflows/build-extension-catalog.yml
@@ -60,7 +60,7 @@ jobs:
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry_target }}
           username: ${{ inputs.registry_user }}
diff --git a/cypress/e2e/po/components/ace.po.ts b/cypress/e2e/po/components/ace.po.ts
new file mode 100644
index 0000000000..0b2d2a6fe6
--- /dev/null
+++ b/cypress/e2e/po/components/ace.po.ts
@@ -0,0 +1,31 @@
+import ComponentPo from '@/cypress/e2e/po/components/component.po';
+import RadioGroupInputPo from '@/cypress/e2e/po/components/radio-group-input.po';
+import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
+
+export default class ACE extends ComponentPo {
+  constructor(selector = '.dashboard-root') {
+    super(selector);
+  }
+
+  enable() {
+    const radioButton = new RadioGroupInputPo('[data-testid="ace-enabled-radio-input"]');
+
+    return radioButton.set(1);
+  }
+
+  fqdn() {
+    return LabeledInputPo.byLabel(this.self(), 'FQDN');
+  }
+
+  caCerts() {
+    return LabeledInputPo.byLabel(this.self(), 'CA Certificates');
+  }
+
+  enterFdqn(val: string) {
+    return new LabeledInputPo('[data-testid="ace-fqdn-input"]').set(val);
+  }
+
+  enterCaCerts(val: string) {
+    return new LabeledInputPo('[data-testid="ace-cacerts-input"]').set(val);
+  }
+}
diff --git a/cypress/e2e/po/components/component.po.ts b/cypress/e2e/po/components/component.po.ts
index 1762ea2c5e..df064096c6 100644
--- a/cypress/e2e/po/components/component.po.ts
+++ b/cypress/e2e/po/components/component.po.ts
@@ -82,4 +82,8 @@ export default class ComponentPo {
   checkNotExists(options?: GetOptions): Cypress.Chainable<boolean> {
     return this.self(options).should('not.exist');
   }
+
+  shouldHaveValue(value: string, options?: GetOptions): Cypress.Chainable<boolean> {
+    return this.self(options).should('have.value', value);
+  }
 }
diff --git a/cypress/e2e/po/components/growl-manager.po.ts b/cypress/e2e/po/components/growl-manager.po.ts
new file mode 100644
index 0000000000..b7aecd4c18
--- /dev/null
+++ b/cypress/e2e/po/components/growl-manager.po.ts
@@ -0,0 +1,23 @@
+import ComponentPo from '@/cypress/e2e/po/components/component.po';
+
+export class GrowlManagerPo extends ComponentPo {
+  constructor() {
+    super('.growl-container');
+  }
+
+  growlList() {
+    return this.self().find('.growl-list');
+  }
+
+  growlMessage() {
+    return this.self().find('.growl-message');
+  }
+
+  dismissWarning() {
+    return this.self().find('.icon-close').click();
+  }
+
+  dismissAllWarnings() {
+    return this.self().find('button.btn').contains('Clear All Notifications').click();
+  }
+}
diff --git a/cypress/e2e/po/components/key-value.po.ts b/cypress/e2e/po/components/key-value.po.ts
new file mode 100644
index 0000000000..73f0353c1f
--- /dev/null
+++ b/cypress/e2e/po/components/key-value.po.ts
@@ -0,0 +1,13 @@
+import ComponentPo from '@/cypress/e2e/po/components/component.po';
+
+export default class KeyValuePo extends ComponentPo {
+  addButton(label: string) {
+    return this.self().find('[data-testid="add_row_item_button"]').contains(label);
+  }
+
+  setKeyValueAtIndex(label: string, key: string, value: string, index: number, selector: string) {
+    this.addButton(label).click();
+    this.self().find(`${ selector } [data-testid="input-kv-item-key-${ index }"]`).type(key);
+    this.self().find(`${ selector } [data-testid="kv-item-value-${ index }"]`).type(value);
+  }
+}
diff --git a/cypress/e2e/po/components/labeled-input.po.ts b/cypress/e2e/po/components/labeled-input.po.ts
index 8f9c5a2f30..6af54f972d 100644
--- a/cypress/e2e/po/components/labeled-input.po.ts
+++ b/cypress/e2e/po/components/labeled-input.po.ts
@@ -50,6 +50,14 @@ export default class LabeledInputPo extends ComponentPo {
     });
   }
 
+  expectToBeDisabled(): Cypress.Chainable {
+    return this.self().should('have.attr', 'disabled', 'disabled');
+  }
+
+  expectToBeEnabled(): Cypress.Chainable {
+    return this.self().should('not.have.attr', 'disabled');
+  }
+
   /**
    * Return the input HTML element from given container
    * @returns HTML Element
diff --git a/cypress/e2e/po/components/tabbed.po.ts b/cypress/e2e/po/components/tabbed.po.ts
index 631e24a58b..1e74ffe514 100644
--- a/cypress/e2e/po/components/tabbed.po.ts
+++ b/cypress/e2e/po/components/tabbed.po.ts
@@ -17,6 +17,10 @@ export default class TabbedPo extends ComponentPo {
     return this.self().get('[data-testid="tabbed-block"] > li');
   }
 
+  assertTabIsActive(selector: string) {
+    return this.self().find(`${ selector }`).should('have.class', 'active');
+  }
+
   /**
    * Get tab labels
    * @param tabLabelsSelector
diff --git a/cypress/e2e/po/components/policy/network-policy.po.ts b/cypress/e2e/po/edit/policy/network-policy.po.ts
similarity index 67%
rename from cypress/e2e/po/components/policy/network-policy.po.ts
rename to cypress/e2e/po/edit/policy/network-policy.po.ts
index fe1738d4b3..f62ba7c4c5 100644
--- a/cypress/e2e/po/components/policy/network-policy.po.ts
+++ b/cypress/e2e/po/edit/policy/network-policy.po.ts
@@ -1,13 +1,25 @@
-import CreateEditViewPo from '@/cypress/e2e/po/components/create-edit-view.po';
+import PagePo from '@/cypress/e2e/po/pages/page.po';
 import AsyncButtonPo from '@/cypress/e2e/po/components/async-button.po';
 import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
 import CheckboxInputPo from '@/cypress/e2e/po/components/checkbox-input.po';
 import LabeledSelectPo from '@/cypress/e2e/po/components/labeled-select.po';
 import BannersPo from '@/cypress/e2e/po/components/banners.po';
 import CodeMirrorPo from '@/cypress/e2e/po/components/code-mirror.po';
-export default class NetworkPolicyPo extends CreateEditViewPo {
-  constructor(selector = '.dashboard-root') {
-    super(selector);
+import ArrayListPo from '@/cypress/e2e/po/components/array-list.po';
+
+export default class CreateEditNetworkPolicyPagePo extends PagePo {
+  private static createPath(clusterId: string, namespace?: string, id?: string ) {
+    const root = `/c/${ clusterId }/explorer/networking.k8s.io.networkpolicy`;
+
+    return id ? `${ root }/${ namespace }/${ id }` : `${ root }/create`;
+  }
+
+  static goTo(path: string): Cypress.Chainable<Cypress.AUTWindow> {
+    throw new Error('invalid');
+  }
+
+  constructor(clusterId = 'local', namespace?: string, id?: string) {
+    super(CreateEditNetworkPolicyPagePo.createPath(clusterId, namespace, id));
   }
 
   nameInput() {
@@ -30,6 +42,14 @@ export default class NetworkPolicyPo extends CreateEditViewPo {
     return cy.get('[data-testid="array-list-button"]').contains('Add allowed traffic source');
   }
 
+  addAllowedPortButton() {
+    return cy.get('[data-testid="array-list-button"]').contains('Add allowed port');
+  }
+
+  ingressRuleItem(index: number) {
+    return new ArrayListPo('section #rule-ingress0', this.self()).arrayListItem(index);
+  }
+
   policyRuleTargetSelect(index: number) {
     return new LabeledSelectPo(`[data-testid="policy-rule-target-${ index }"] [data-testid="policy-rule-target-type-labeled-select"]`, this.self());
   }
diff --git a/cypress/e2e/po/edit/resource-detail.po.ts b/cypress/e2e/po/edit/resource-detail.po.ts
index 28c7e91387..fb560e5870 100644
--- a/cypress/e2e/po/edit/resource-detail.po.ts
+++ b/cypress/e2e/po/edit/resource-detail.po.ts
@@ -4,14 +4,26 @@ import CruResourcePo from '@/cypress/e2e/po/components/cru-resource.po';
 import ResourceYamlPo from '@/cypress/e2e/po/components/resource-yaml.po';
 
 export default class ResourceDetailPo extends ComponentPo {
+  /**
+   * components for handling CRUD operations for resources, including cancel/save buttons
+   * @returns
+   */
   cruResource() {
     return new CruResourcePo(this.self());
   }
 
+  /**
+   * components for managing the resource creation and edit forms
+   * @returns
+   */
   createEditView() {
     return new CreateEditViewPo(this.self());
   }
 
+  /**
+   * components for YAML editor
+   * @returns
+   */
   resourceYaml() {
     return new ResourceYamlPo(this.self());
   }
diff --git a/cypress/e2e/po/edit/services.po.ts b/cypress/e2e/po/edit/services.po.ts
index a316910251..6301b26cbd 100644
--- a/cypress/e2e/po/edit/services.po.ts
+++ b/cypress/e2e/po/edit/services.po.ts
@@ -1,18 +1,76 @@
 import PagePo from '@/cypress/e2e/po/pages/page.po';
+import NameNsDescription from '@/cypress/e2e/po/components/name-ns-description.po';
+import ResourceDetailPo from '@/cypress/e2e/po/edit/resource-detail.po';
+import LabeledSelectPo from '@/cypress/e2e/po/components/labeled-select.po';
+import TabbedPo from '@/cypress/e2e/po/components/tabbed.po';
+import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
+import ArrayListPo from '@/cypress/e2e/po/components/array-list.po';
+import KeyValuePo from '@/cypress/e2e/po/components/key-value.po';
 
-export default class WorkloadsCreateEditPo extends PagePo {
-  private static createPath(clusterId: string, id?: string ) {
-    const root = `/c/${ clusterId }/explorer/storage.k8s.io.storageclass/create`;
+export default class ServicesCreateEditPo extends PagePo {
+  private static createPath(clusterId: string, namespace?: string, id?: string ) {
+    const root = `/c/${ clusterId }/explorer/service`;
 
-    return id ? `${ root }/${ id }` : `${ root }/create`;
+    return id ? `${ root }/${ namespace }/${ id }` : `${ root }/create`;
   }
 
   static goTo(path: string): Cypress.Chainable<Cypress.AUTWindow> {
     throw new Error('invalid');
   }
 
-  constructor(clusterId = '_', id?: string) {
-    super(WorkloadsCreateEditPo.createPath(clusterId, id));
+  constructor(clusterId = 'local', namespace?: string, id?: string) {
+    super(ServicesCreateEditPo.createPath(clusterId, namespace, id));
+  }
+
+  resourceDetail() {
+    return new ResourceDetailPo(this.self());
+  }
+
+  title() {
+    return this.self().get('.title .primaryheader  h1');
+  }
+
+  nameNsDescription() {
+    return new NameNsDescription(this.self());
+  }
+
+  selectNamespace(label: string) {
+    const selectNs = new LabeledSelectPo(`[data-testid="name-ns-description-namespace"]`, this.self());
+
+    selectNs.toggle();
+    selectNs.clickLabel(label);
+  }
+
+  selectServiceOption(index: number) {
+    return this.resourceDetail().cruResource().selectSubTypeByIndex(index).click();
+  }
+
+  tabs() {
+    return new TabbedPo('[data-testid="tabbed"]');
+  }
+
+  externalNameTab() {
+    return this.tabs().clickTabWithSelector('[data-testid="define-external-name"]');
+  }
+
+  externalNameInput() {
+    return new LabeledInputPo('#define-external-name .labeled-input input');
+  }
+
+  ipAddressesTab() {
+    return this.tabs().clickTabWithSelector('[data-testid="ips"]');
+  }
+
+  ipAddressList() {
+    return new ArrayListPo('section#ips');
+  }
+
+  lablesAnnotationsTab() {
+    return this.tabs().clickTabWithSelector('[data-testid="btn-labels-and-annotations"]');
+  }
+
+  lablesAnnotationsKeyValue() {
+    return new KeyValuePo('section#labels-and-annotations');
   }
 
   errorBanner() {
diff --git a/cypress/e2e/po/extensions/imported/cluster-edit.po.ts b/cypress/e2e/po/extensions/imported/cluster-edit.po.ts
new file mode 100644
index 0000000000..c5b580d1b9
--- /dev/null
+++ b/cypress/e2e/po/extensions/imported/cluster-edit.po.ts
@@ -0,0 +1,37 @@
+import PagePo from '@/cypress/e2e/po/pages/page.po';
+import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
+import ACE from '@/cypress/e2e/po/components/ace.po';
+import ResourceDetailPo from '@/cypress/e2e/po/edit/resource-detail.po';
+
+/**
+ * Edit page for imported cluster
+ */
+export default class ClusterManagerEditImportedPagePo extends PagePo {
+  private static createPath(clusterId: string, clusterName: string) {
+    return `/c/${ clusterId }/manager/provisioning.cattle.io.cluster/fleet-default/${ clusterName }`;
+  }
+
+  static goTo(clusterId: string, clusterName: string): Cypress.Chainable<Cypress.AUTWindow> {
+    return super.goTo(ClusterManagerEditImportedPagePo.createPath(clusterId, clusterName));
+  }
+
+  constructor(clusterId = '_', clusterName: string) {
+    super(ClusterManagerEditImportedPagePo.createPath(clusterId, clusterName));
+  }
+
+  name(): LabeledInputPo {
+    return LabeledInputPo.byLabel(this.self(), 'Name');
+  }
+
+  ace(): ACE {
+    return new ACE();
+  }
+
+  resourceDetail() {
+    return new ResourceDetailPo(this.self());
+  }
+
+  save() {
+    return this.resourceDetail().createEditView().save();
+  }
+}
diff --git a/cypress/e2e/po/lists/chart-repositories.po.ts b/cypress/e2e/po/lists/chart-repositories.po.ts
index 9e5f1fb328..2ebf4a605a 100644
--- a/cypress/e2e/po/lists/chart-repositories.po.ts
+++ b/cypress/e2e/po/lists/chart-repositories.po.ts
@@ -8,6 +8,10 @@ export default class ChartRepositoriesListPo extends BaseResourceList {
     return this.resourceTable().sortableTable().rowActionMenuOpen(repoName);
   }
 
+  closeActionMenu() {
+    cy.get('body').click(0, 0); // Click outside of the action menu
+  }
+
   openBulkActionDropdown() {
     return this.resourceTable().sortableTable().bulkActionDropDownOpen();
   }
diff --git a/cypress/e2e/po/lists/fleet/fleet.cattle.io.cluster.po.ts b/cypress/e2e/po/lists/fleet/fleet.cattle.io.cluster.po.ts
index 9ee0cab104..758a5fdbb5 100644
--- a/cypress/e2e/po/lists/fleet/fleet.cattle.io.cluster.po.ts
+++ b/cypress/e2e/po/lists/fleet/fleet.cattle.io.cluster.po.ts
@@ -7,4 +7,8 @@ export default class FleetClusterList extends BaseResourceList {
   details(name: string, index: number) {
     return this.resourceTable().sortableTable().rowWithName(name).column(index);
   }
+
+  subRows() {
+    return this.resourceTable().sortableTable().subRows();
+  }
 }
diff --git a/cypress/e2e/po/other-products/cis-benchmark.po.ts b/cypress/e2e/po/other-products/cis-benchmark.po.ts
new file mode 100644
index 0000000000..870e75b7d1
--- /dev/null
+++ b/cypress/e2e/po/other-products/cis-benchmark.po.ts
@@ -0,0 +1,72 @@
+import PagePo from '@/cypress/e2e/po/pages/page.po';
+import CodeMirrorPo from '@/cypress/e2e/po/components/code-mirror.po';
+import ResourceListMastheadPo from '@/cypress/e2e/po/components/ResourceList/resource-list-masthead.po';
+import BaseResourceList from '@/cypress/e2e/po/lists/base-resource-list.po';
+import NameNsDescription from '@/cypress/e2e/po/components/name-ns-description.po';
+import CruResourcePo from '@/cypress/e2e/po/components/cru-resource.po';
+
+export class CisBenchmarkListPo extends PagePo {
+  private static createPath(clusterId: string) {
+    return `/c/${ clusterId }/cis/cis.cattle.io.clusterscan`;
+  }
+
+  static goTo(clusterId: string): Cypress.Chainable<Cypress.AUTWindow> {
+    return super.goTo(CisBenchmarkListPo.createPath(clusterId));
+  }
+
+  constructor(clusterId = 'local') {
+    super(CisBenchmarkListPo.createPath(clusterId));
+  }
+
+  masthead() {
+    return new ResourceListMastheadPo(this.self());
+  }
+
+  createScan() {
+    return this.masthead().create();
+  }
+
+  listElementWithName(name:string) {
+    const baseResourceList = new BaseResourceList(this.self());
+
+    return baseResourceList.resourceTable().sortableTable().rowElementWithName(name);
+  }
+
+  firstRow() {
+    const baseResourceList = new BaseResourceList(this.self());
+
+    return baseResourceList.resourceTable().sortableTable().row(0);
+  }
+}
+
+export class CisBenchmarkPo extends PagePo {
+    static url: string;
+
+    private static createPath( clusterId: string, name: string ) {
+      const urlStr = `/c/${ clusterId }/cis/cis.cattle.io.clusterscan/${ name }`;
+
+      return urlStr;
+    }
+
+    static goTo(): Cypress.Chainable<Cypress.AUTWindow> {
+      return super.goTo(this.url);
+    }
+
+    constructor(clusterId = 'local', name = 'create') {
+      super(CisBenchmarkPo.createPath(clusterId, name));
+
+      CisBenchmarkPo.url = CisBenchmarkPo.createPath(clusterId, name);
+    }
+
+    cruResource() {
+      return new CruResourcePo(this.self());
+    }
+
+    nameNsDescription() {
+      return new NameNsDescription(this.self());
+    }
+
+    yamlEditor(): CodeMirrorPo {
+      return CodeMirrorPo.bySelector(this.self(), '[data-testid="yaml-editor-code-mirror"]');
+    }
+}
diff --git a/cypress/e2e/po/pages/explorer/network-policy.po.ts b/cypress/e2e/po/pages/explorer/network-policy.po.ts
index 35db7da084..0b0b3cc1f1 100644
--- a/cypress/e2e/po/pages/explorer/network-policy.po.ts
+++ b/cypress/e2e/po/pages/explorer/network-policy.po.ts
@@ -2,6 +2,7 @@ import PagePo from '@/cypress/e2e/po/pages/page.po';
 import BaseResourceList from '@/cypress/e2e/po/lists/base-resource-list.po';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
+import CreateEditNetworkPolicyPagePo from '@/cypress/e2e/po/edit/policy/network-policy.po';
 
 export class NetworkPolicyPagePo extends PagePo {
   private static createPath(clusterId: string) {
@@ -21,7 +22,7 @@ export class NetworkPolicyPagePo extends PagePo {
     sideNav.navToSideMenuEntryByLabel('Network Policies');
   }
 
-  constructor(clusterId = 'local') {
+  constructor(private clusterId = 'local') {
     super(NetworkPolicyPagePo.createPath(clusterId));
   }
 
@@ -40,4 +41,8 @@ export class NetworkPolicyPagePo extends PagePo {
   searchForNetworkPolicy(name: string) {
     return this.list().resourceTable().sortableTable().filter(name);
   }
+
+  createEditNetworkPolicyForm(namespace?: string, id?: string): CreateEditNetworkPolicyPagePo {
+    return new CreateEditNetworkPolicyPagePo(this.clusterId, namespace, id);
+  }
 }
diff --git a/cypress/e2e/po/pages/explorer/services.po.ts b/cypress/e2e/po/pages/explorer/services.po.ts
index e9fbc44ae3..d5346480f1 100644
--- a/cypress/e2e/po/pages/explorer/services.po.ts
+++ b/cypress/e2e/po/pages/explorer/services.po.ts
@@ -26,7 +26,7 @@ export class ServicesPagePo extends PagePo {
     sideNav.navToSideMenuEntryByLabel('Service');
   }
 
-  constructor(clusterId = 'local') {
+  constructor(private clusterId = 'local') {
     super(ServicesPagePo.createPath(clusterId));
   }
 
@@ -38,7 +38,7 @@ export class ServicesPagePo extends PagePo {
     return this.list().masthead().create();
   }
 
-  createServicesForm(id? : string): ServicesCreateEditPo {
-    return new ServicesCreateEditPo(id);
+  createServicesForm(namespace?: string, id?: string): ServicesCreateEditPo {
+    return new ServicesCreateEditPo(this.clusterId, namespace, id);
   }
 }
diff --git a/cypress/e2e/po/pages/extensions.po.ts b/cypress/e2e/po/pages/extensions.po.ts
index ec2706bbf9..9944a27b64 100644
--- a/cypress/e2e/po/pages/extensions.po.ts
+++ b/cypress/e2e/po/pages/extensions.po.ts
@@ -34,7 +34,7 @@ export default class ExtensionsPagePo extends PagePo {
     return this.title().should('contain', 'Extensions');
   }
 
-  loading(options: any) {
+  loading() {
     return this.self().get('.data-loading');
   }
 
diff --git a/cypress/e2e/po/pages/global-settings/home-links.po.ts b/cypress/e2e/po/pages/global-settings/home-links.po.ts
index c186ec02db..d48c4a142f 100644
--- a/cypress/e2e/po/pages/global-settings/home-links.po.ts
+++ b/cypress/e2e/po/pages/global-settings/home-links.po.ts
@@ -32,7 +32,7 @@ export class HomeLinksPagePo extends RootClusterPage {
   }
 
   addLinkButton() {
-    return cy.getId('add_link_button');
+    return cy.getId('add_row_item_button');
   }
 
   removeLinkButton() {
diff --git a/cypress/e2e/po/pages/global-settings/performance.po.ts b/cypress/e2e/po/pages/global-settings/performance.po.ts
index e7a8eba545..88be2566a6 100644
--- a/cypress/e2e/po/pages/global-settings/performance.po.ts
+++ b/cypress/e2e/po/pages/global-settings/performance.po.ts
@@ -60,6 +60,10 @@ export class PerformancePagePo extends RootClusterPage {
     return CheckboxInputPo.byLabel(this.self(), 'Enable Garbage Collection');
   }
 
+  garbageCollectionResourceCount() {
+    return LabeledInputPo.byLabel(this.self(), 'Resource Count');
+  }
+
   namespaceFilteringCheckbox(): CheckboxInputPo {
     return CheckboxInputPo.byLabel(this.self(), 'Enable Required Namespace / Project Filtering');
   }
diff --git a/cypress/e2e/tests/pages/charts/cis-benchmark.spec.ts b/cypress/e2e/tests/pages/charts/cis-benchmark.spec.ts
new file mode 100644
index 0000000000..c5389ecf5c
--- /dev/null
+++ b/cypress/e2e/tests/pages/charts/cis-benchmark.spec.ts
@@ -0,0 +1,93 @@
+import { ChartPage } from '@/cypress/e2e/po/pages/explorer/charts/chart.po';
+import HomePagePo from '@/cypress/e2e/po/pages/home.po';
+import { InstallChartPage } from '@/cypress/e2e/po/pages/explorer/charts/install-charts.po';
+import { MEDIUM_TIMEOUT_OPT, LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
+import Kubectl from '@/cypress/e2e/po/components/kubectl.po';
+import { CisBenchmarkPo, CisBenchmarkListPo } from '@/cypress/e2e/po/other-products/cis-benchmark.po';
+import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
+
+describe('Charts', { testIsolation: 'off', tags: ['@charts', '@adminUser'] }, () => {
+  before(() => {
+    cy.login();
+    HomePagePo.goTo();
+  });
+
+  describe('CIS Benchmark install', () => {
+    const installChartPage = new InstallChartPage();
+    const chartPage = new ChartPage();
+
+    describe('YAML view', () => {
+      beforeEach(() => {
+        ChartPage.navTo(null, 'CIS Benchmark');
+        chartPage.waitForChartHeader('CIS Benchmark', MEDIUM_TIMEOUT_OPT);
+        chartPage.goToInstall();
+        installChartPage.nextPage().editYaml();
+      });
+
+      describe('UI Elements', () => {
+        it('Footer controls should sticky to bottom', () => {
+          cy.get('#wizard-footer-controls').should('be.visible');
+
+          cy.get('#wizard-footer-controls').then(($el) => {
+            const elementRect = $el[0].getBoundingClientRect();
+            const viewportHeight = Cypress.config('viewportHeight');
+            const pageHeight = Cypress.$(cy.state('window')).height();
+
+            expect(elementRect.bottom).to.eq(pageHeight);
+            expect(elementRect.bottom).to.eq(viewportHeight);
+          });
+        });
+      });
+    });
+
+    describe('CIS Chart setup', () => {
+      it('Complete install and a Scan is created', () => {
+        cy.updateNamespaceFilter('local', 'none', '{"local":[]}');
+        const kubectl = new Kubectl();
+        const cisBenchmark = new CisBenchmarkPo();
+        const cisBenchmarkList = new CisBenchmarkListPo();
+        const sideNav = new ProductNavPo();
+
+        ChartPage.navTo(null, 'CIS Benchmark');
+        chartPage.waitForChartHeader('CIS Benchmark', MEDIUM_TIMEOUT_OPT);
+        chartPage.goToInstall();
+
+        installChartPage.nextPage();
+
+        cy.intercept('POST', 'v1/catalog.cattle.io.clusterrepos/rancher-charts?action=install').as('chartInstall');
+        installChartPage.installChart();
+        cy.wait('@chartInstall').its('response.statusCode').should('eq', 201);
+        cy.contains('Disconnected');
+
+        kubectl.closeTerminal();
+
+        sideNav.navToSideMenuGroupByLabel('CIS Benchmark');
+        cisBenchmarkList.waitForPage();
+        cisBenchmarkList.createScan();
+        cisBenchmark.waitForPage();
+        cisBenchmark.cruResource().saveAndWaitForRequests('POST', 'v1/cis.cattle.io.clusterscans')
+          .then(({ response }) => {
+            expect(response?.statusCode).to.eq(201);
+            expect(response?.body).to.have.property('type', 'cis.cattle.io.clusterscan');
+            expect(response?.body.metadata).to.have.property('name');
+            expect(response?.body.metadata).to.have.property('generateName', 'scan-');
+          });
+        cisBenchmarkList.waitForPage();
+        cisBenchmarkList.checkVisible();
+        const column = cisBenchmarkList.firstRow().column(1);
+
+        column.get('.bg-success', LONG_TIMEOUT_OPT).should('exist');
+      });
+
+      after('clean up', () => {
+        const chartNamespace = 'cis-operator-system';
+        const chartApp = 'rancher-cis-benchmark';
+        const chartCrd = 'rancher-cis-benchmark-crd';
+
+        cy.createRancherResource('v1', `catalog.cattle.io.apps/${ chartNamespace }/${ chartApp }?action=uninstall`, '{}');
+        cy.createRancherResource('v1', `catalog.cattle.io.apps/${ chartNamespace }/${ chartCrd }?action=uninstall`, '{}');
+        cy.updateNamespaceFilter('local', 'none', '{"local":["all://user"]}');
+      });
+    });
+  });
+});
diff --git a/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts b/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
index 20e89ef0ef..d42b0c1742 100644
--- a/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
@@ -142,4 +142,29 @@ describe('Apps/Charts', { tags: ['@explorer', '@adminUser'] }, () => {
 
     cy.get('@fetchChartDataAfterBack.all').should('have.length', 0);
   });
+
+  it('A disabled repo should NOT be listed on the repos dropdown', () => {
+    const disabledRepoId = 'disabled-repo';
+
+    cy.intercept('GET', '/v1/catalog.cattle.io.clusterrepos?exclude=metadata.managedFields', (req) => {
+      req.reply({
+        statusCode: 200,
+        body:       {
+          data: [
+            { id: disabledRepoId, spec: { enabled: false } }, // disabled
+            { id: 'enabled-repo-1', spec: { enabled: true } }, // enabled
+            { id: 'enabled-repo-2', spec: {} } // enabled
+          ]
+        }
+      });
+    }).as('getRepos');
+
+    cy.wait('@getRepos');
+
+    chartsPage.chartsFilterReposSelect().toggle();
+    chartsPage.chartsFilterReposSelect().isOpened();
+    chartsPage.chartsFilterReposSelect().getOptions().should('have.length', 3); // should include three options: All, enabled-repo-1 and enabled-repo-2
+    chartsPage.chartsFilterReposSelect().getOptions().contains(disabledRepoId)
+      .should('not.exist');
+  });
 });
diff --git a/cypress/e2e/tests/pages/explorer/policy/network-policy.spec.ts b/cypress/e2e/tests/pages/explorer/policy/network-policy.spec.ts
index 1488f7596d..d588df84f1 100644
--- a/cypress/e2e/tests/pages/explorer/policy/network-policy.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/policy/network-policy.spec.ts
@@ -1,80 +1,126 @@
 import { NetworkPolicyPagePo } from '@/cypress/e2e/po/pages/explorer/network-policy.po';
-import NetworkPolicyPo from '@/cypress/e2e/po/components/policy/network-policy.po';
 import PromptRemove from '@/cypress/e2e/po/prompts/promptRemove.po';
 
 const networkPolicyPage = new NetworkPolicyPagePo('local');
-const networkPolicyName = 'custom-network-policy';
+const customNetworkPolicyName = 'custom-network-policy';
 const networkPolicyDescription = 'Custom Network Policy Description';
+const namespace = 'default';
+let networkPolicyName = '';
+let removeNetworkPolicy = false;
+const networkPolicyToDelete = [];
 
 describe('NetworkPolicies', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
   before(() => {
     cy.login();
+    cy.createE2EResourceName('networkpolicy').then((name) => {
+      networkPolicyName = name;
+    });
   });
 
   it('creates a network policy and displays it in the list', () => {
     // Visit the main menu and select the 'local' cluster
     // Navigate to Policy => Network Policies
     NetworkPolicyPagePo.navTo();
+    networkPolicyPage.waitForPage();
     // Go to Create Page
     networkPolicyPage.clickCreate();
-    const networkPolicyPo = new NetworkPolicyPo();
 
     // Enter name & description
-    networkPolicyPo.nameInput().set(networkPolicyName);
-    networkPolicyPo.descriptionInput().set(networkPolicyDescription);
+    networkPolicyPage.createEditNetworkPolicyForm().nameInput().set(customNetworkPolicyName);
+    networkPolicyPage.createEditNetworkPolicyForm().descriptionInput().set(networkPolicyDescription);
     // Enable ingress checkbox
-    networkPolicyPo.enableIngressCheckbox().set();
+    networkPolicyPage.createEditNetworkPolicyForm().enableIngressCheckbox().set();
     // Add a new rule without a key to match all the namespaces
-    networkPolicyPo.newNetworkPolicyRuleAddBtn().click();
-    networkPolicyPo.addAllowedTrafficSourceButton().click();
-    networkPolicyPo.policyRuleTargetSelect(0).toggle();
-    networkPolicyPo.policyRuleTargetSelect(0).clickOptionWithLabel('Namespace Selector');
+    networkPolicyPage.createEditNetworkPolicyForm().newNetworkPolicyRuleAddBtn().click();
+    networkPolicyPage.createEditNetworkPolicyForm().addAllowedTrafficSourceButton().click();
+    networkPolicyPage.createEditNetworkPolicyForm().policyRuleTargetSelect(0).toggle();
+    networkPolicyPage.createEditNetworkPolicyForm().policyRuleTargetSelect(0).clickOptionWithLabel('Namespace Selector');
 
     cy.getRancherResource('v1', 'namespaces').then((resp: Cypress.Response<any>) => {
       cy.wrap(resp.body.count).as('namespaceCount');
     });
 
     cy.get('@namespaceCount').then((count) => {
-      networkPolicyPo.matchingNamespacesMessage(0).should('contain.text', `Matches ${ count } of ${ count }`);
+      networkPolicyPage.createEditNetworkPolicyForm().matchingNamespacesMessage(0).should('contain.text', `Matches ${ count } of ${ count }`);
       // Add a second rule a key to match none of the namespaces
-      networkPolicyPo.addAllowedTrafficSourceButton().click();
-      networkPolicyPo.policyRuleTargetSelect(1).toggle();
-      networkPolicyPo.policyRuleTargetSelect(1).clickOptionWithLabel('Namespace Selector');
-      networkPolicyPo.policyRuleKeyInput(1).focus().type('something-with-no-matching-namespaces');
-      networkPolicyPo.matchingNamespacesMessage(1).should('contain.text', `Matches 0 of ${ count }`);
+      networkPolicyPage.createEditNetworkPolicyForm().addAllowedTrafficSourceButton().click();
+      networkPolicyPage.createEditNetworkPolicyForm().policyRuleTargetSelect(1).toggle();
+      networkPolicyPage.createEditNetworkPolicyForm().policyRuleTargetSelect(1).clickOptionWithLabel('Namespace Selector');
+      networkPolicyPage.createEditNetworkPolicyForm().policyRuleKeyInput(1).focus().type('something-with-no-matching-namespaces');
+      networkPolicyPage.createEditNetworkPolicyForm().matchingNamespacesMessage(1).should('contain.text', `Matches 0 of ${ count }`);
       // Click on Create
-      networkPolicyPo.saveCreateForm().click();
+      networkPolicyPage.createEditNetworkPolicyForm().saveCreateForm().click();
       // Check if the NetworkPolicy is created successfully
       networkPolicyPage.waitForPage();
-      networkPolicyPage.searchForNetworkPolicy(networkPolicyName);
-      networkPolicyPage.waitForPage(`q=${ networkPolicyName }`);
-      networkPolicyPage.listElementWithName(networkPolicyName).should('exist').and('be.visible');
+      networkPolicyPage.searchForNetworkPolicy(customNetworkPolicyName);
+      networkPolicyPage.waitForPage(`q=${ customNetworkPolicyName }`);
+      networkPolicyPage.listElementWithName(customNetworkPolicyName).should('exist').and('be.visible');
       // Navigate back to the edit page and check if the matching message is still correct
-      networkPolicyPage.list().actionMenu(networkPolicyName).getMenuItem('Edit Config').click();
-      networkPolicyPo.matchingNamespacesMessage(0).should('contain.text', `Matches ${ count } of ${ count }`);
-      networkPolicyPo.matchingNamespacesMessage(1).should('contain.text', `Matches 0 of ${ count }`);
+      networkPolicyPage.list().actionMenu(customNetworkPolicyName).getMenuItem('Edit Config').click();
+      networkPolicyPage.createEditNetworkPolicyForm().matchingNamespacesMessage(0).should('contain.text', `Matches ${ count } of ${ count }`);
+      networkPolicyPage.createEditNetworkPolicyForm().matchingNamespacesMessage(1).should('contain.text', `Matches 0 of ${ count }`);
     });
   });
 
   it('can open "Edit as YAML"', () => {
     NetworkPolicyPagePo.navTo();
+    networkPolicyPage.waitForPage();
     networkPolicyPage.clickCreate();
-    const networkPolicyPo = new NetworkPolicyPo();
 
-    networkPolicyPo.editAsYaml().click();
-    networkPolicyPo.yamlEditor().checkExists();
+    networkPolicyPage.createEditNetworkPolicyForm().editAsYaml().click();
+    networkPolicyPage.createEditNetworkPolicyForm().yamlEditor().checkExists();
+  });
+
+  // testing https://github.com/rancher/dashboard/issues/11856
+  it('port value is sent correctly in request payload', () => {
+    cy.intercept('POST', 'v1/networking.k8s.io.networkpolicies').as('createNetworkPolicy');
+
+    NetworkPolicyPagePo.navTo();
+    networkPolicyPage.waitForPage();
+    networkPolicyPage.clickCreate();
+    networkPolicyPage.createEditNetworkPolicyForm().waitForPage(null, 'ingress');
+
+    networkPolicyPage.createEditNetworkPolicyForm().nameInput().set(networkPolicyName);
+    networkPolicyPage.createEditNetworkPolicyForm().descriptionInput().set(networkPolicyDescription);
+    networkPolicyPage.createEditNetworkPolicyForm().enableIngressCheckbox().set();
+    networkPolicyPage.createEditNetworkPolicyForm().newNetworkPolicyRuleAddBtn().click();
+    networkPolicyPage.createEditNetworkPolicyForm().addAllowedPortButton().click();
+    networkPolicyPage.createEditNetworkPolicyForm().ingressRuleItem(0).find('.col:nth-of-type(1) input').type('8080');
+    networkPolicyPage.createEditNetworkPolicyForm().saveCreateForm().click();
+
+    // check request payload
+    cy.wait('@createNetworkPolicy').then(({ request, response }) => {
+      expect(response?.statusCode).to.eq(201);
+      removeNetworkPolicy = true;
+      networkPolicyToDelete.push(`${ namespace }/${ networkPolicyName }`);
+      expect(request?.body.spec.ingress).to.deep.include({ ports: [{ port: 8080 }] });
+    });
+    networkPolicyPage.waitForPage();
+    networkPolicyPage.searchForNetworkPolicy(networkPolicyName);
+    networkPolicyPage.waitForPage(`q=${ networkPolicyName }`);
+    networkPolicyPage.list().actionMenu(networkPolicyName).getMenuItem('Edit Config').click();
+    networkPolicyPage.createEditNetworkPolicyForm(namespace, networkPolicyName).waitForPage(`mode=edit#rule-ingress0`);
+    // check elements value property
+    networkPolicyPage.createEditNetworkPolicyForm().ingressRuleItem(0).find('.col:nth-of-type(1) input').should('have.value', '8080');
   });
 
   it('can delete a network policy', () => {
     NetworkPolicyPagePo.navTo();
     networkPolicyPage.waitForPage();
-    networkPolicyPage.list().actionMenu(networkPolicyName).getMenuItem('Delete').click();
+    networkPolicyPage.list().actionMenu(customNetworkPolicyName).getMenuItem('Delete').click();
     const promptRemove = new PromptRemove();
 
     cy.intercept('DELETE', 'v1/networking.k8s.io.networkpolicies/**').as('deleteNetworkPolicy');
     promptRemove.remove();
     cy.wait('@deleteNetworkPolicy');
     networkPolicyPage.waitForPage();
-    cy.contains(networkPolicyName).should('not.exist');
+    cy.contains(customNetworkPolicyName).should('not.exist');
+  });
+
+  after(() => {
+    if (removeNetworkPolicy) {
+      // delete gitrepo
+      networkPolicyToDelete.forEach((r) => cy.deleteRancherResource('v1', 'networking.k8s.io.networkpolicies', r, false));
+    }
   });
 });
diff --git a/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts b/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
index 43aa56c97e..8f6e7c4bec 100644
--- a/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/service-discovery/services.spec.ts
@@ -1,13 +1,147 @@
 import { ServicesPagePo } from '@/cypress/e2e/po/pages/explorer/services.po';
 import { generateServicesDataSmall, servicesNoData } from '@/cypress/e2e/blueprints/explorer/workloads/service-discovery/services-get';
 import ClusterDashboardPagePo from '@/cypress/e2e/po/pages/explorer/cluster-dashboard.po';
+import PromptRemove from '@/cypress/e2e/po/prompts/promptRemove.po';
+import { GrowlManagerPo } from '@/cypress/e2e/po/components/growl-manager.po';
 
-const cluster = 'local';
 const servicesPagePo = new ServicesPagePo();
+const growlPo = new GrowlManagerPo();
+const cluster = 'local';
+let serviceExternalName = '';
+const namespace = 'default';
+let removeServices = false;
+const servicesToDelete = [];
 
 describe('Services', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
   before(() => {
     cy.login();
+    cy.createE2EResourceName('serviceexternalname').then((name) => {
+      serviceExternalName = name;
+    });
+  });
+
+  describe('CRUD', () => {
+    it('can create an ExternalName Service', () => {
+      cy.intercept('POST', '/v1/services').as('createService');
+      ServicesPagePo.navTo();
+      servicesPagePo.waitForPage();
+      servicesPagePo.clickCreate();
+      servicesPagePo.createServicesForm().waitForPage();
+
+      servicesPagePo.createServicesForm().selectServiceOption(1);
+      servicesPagePo.createServicesForm().waitForPage(null, 'define-external-name');
+      servicesPagePo.createServicesForm().resourceDetail().title().should('contain', 'Create ExternalName');
+      servicesPagePo.createServicesForm().nameNsDescription().name().set(serviceExternalName);
+      servicesPagePo.createServicesForm().nameNsDescription().description().set(`${ serviceExternalName }-desc`);
+      servicesPagePo.createServicesForm().selectNamespace(namespace);
+      servicesPagePo.createServicesForm().tabs().allTabs().should('have.length', 3);
+
+      const tabs = ['External Name', 'IP Addresses', 'Labels & Annotations'];
+
+      servicesPagePo.createServicesForm().tabs().tabNames().each((el, i) => {
+        expect(el).to.eq(tabs[i]);
+      });
+
+      servicesPagePo.createServicesForm().tabs().assertTabIsActive('[data-testid="define-external-name"]');
+      servicesPagePo.createServicesForm().externalNameInput().set('my.database.example.com');
+      servicesPagePo.createServicesForm().ipAddressesTab();
+      servicesPagePo.createServicesForm().waitForPage(null, 'ips');
+      servicesPagePo.createServicesForm().ipAddressList().setValueAtIndex('1.1.1.1', 0);
+      servicesPagePo.createServicesForm().ipAddressList().setValueAtIndex('2.2.2.2', 1);
+      servicesPagePo.createServicesForm().lablesAnnotationsTab();
+      servicesPagePo.createServicesForm().waitForPage(null, 'labels-and-annotations');
+      servicesPagePo.createServicesForm().lablesAnnotationsKeyValue().setKeyValueAtIndex('Add Label', 'label-key1', 'label-value1', 0, '.labels-and-annotations-container div.row:nth-of-type(2)');
+
+      // Adding Annotations doesn't work via test automation
+      // See https://github.com/rancher/dashboard/issues/13191
+      // servicesPagePo.createServicesForm().lablesAnnotationsKeyValue().setKeyValueAtIndex('Add Annotation', 'ann-key1', 'ann-value1', 0, '.labels-and-annotations-container div.row:nth-of-type(3)');
+      servicesPagePo.createServicesForm().resourceDetail().createEditView().create();
+      cy.wait('@createService').then(({ response }) => {
+        expect(response?.statusCode).to.eq(201);
+        removeServices = true;
+        servicesToDelete.push(`${ namespace }/${ serviceExternalName }`);
+      });
+      servicesPagePo.waitForPage();
+      servicesPagePo.list().resourceTable().sortableTable().rowWithName(serviceExternalName)
+        .checkVisible();
+      growlPo.dismissWarning();
+    });
+
+    it('can edit an ExternalName Service', () => {
+      ServicesPagePo.navTo();
+      servicesPagePo.waitForPage();
+      servicesPagePo.list().actionMenu(serviceExternalName).getMenuItem('Edit Config').click();
+      servicesPagePo.createServicesForm(namespace, serviceExternalName).waitForPage('mode=edit', 'define-external-name');
+      servicesPagePo.createServicesForm().nameNsDescription().description().set(`${ serviceExternalName }-desc`);
+      servicesPagePo.createServicesForm().resourceDetail().cruResource().saveAndWaitForRequests('PUT', `/v1/services/${ namespace }/${ serviceExternalName }`)
+        .then(({ response }) => {
+          expect(response?.statusCode).to.eq(200);
+          expect(response?.body.metadata).to.have.property('name', serviceExternalName);
+          expect(response?.body.metadata.annotations).to.have.property('field.cattle.io/description', `${ serviceExternalName }-desc`);
+        });
+      servicesPagePo.waitForPage();
+      growlPo.dismissWarning();
+    });
+
+    it('can clone an ExternalName Service', () => {
+      ServicesPagePo.navTo();
+      servicesPagePo.waitForPage();
+      servicesPagePo.list().actionMenu(serviceExternalName).getMenuItem('Clone').click();
+      servicesPagePo.createServicesForm(namespace, serviceExternalName).waitForPage('mode=clone', 'define-external-name');
+      servicesPagePo.createServicesForm().nameNsDescription().name().set(`clone-${ serviceExternalName }`);
+      servicesPagePo.createServicesForm().resourceDetail().cruResource().saveAndWaitForRequests('POST', '/v1/services')
+        .then(({ response }) => {
+          expect(response?.statusCode).to.eq(201);
+          expect(response?.body.metadata).to.have.property('name', `clone-${ serviceExternalName }`);
+          removeServices = true;
+          servicesToDelete.push(`${ namespace }/clone-${ serviceExternalName }`);
+        });
+      servicesPagePo.waitForPage();
+      servicesPagePo.list().resourceTable().sortableTable().rowWithName(`clone-${ serviceExternalName }`)
+        .checkVisible();
+      growlPo.dismissWarning();
+    });
+
+    it('can Edit Yaml', () => {
+      ServicesPagePo.navTo();
+      servicesPagePo.waitForPage();
+      servicesPagePo.list().actionMenu(`clone-${ serviceExternalName }`).getMenuItem('Edit YAML').click();
+      servicesPagePo.createServicesForm(namespace, `clone-${ serviceExternalName }`).waitForPage('mode=edit&as=yaml');
+      servicesPagePo.createServicesForm().title().contains(`Service: clone-${ serviceExternalName }`).should('be.visible');
+    });
+
+    it('can delete an ExternalName Service', () => {
+      ServicesPagePo.navTo();
+      servicesPagePo.waitForPage();
+      servicesPagePo.list().actionMenu(`clone-${ serviceExternalName }`).getMenuItem('Delete').click();
+      servicesPagePo.list().resourceTable().sortableTable().rowNames('.col-link-detail')
+        .then((rows: any) => {
+          const promptRemove = new PromptRemove();
+
+          cy.intercept('DELETE', `/v1/services/${ namespace }/clone-${ serviceExternalName }`).as('deleteService');
+
+          promptRemove.remove();
+          cy.wait('@deleteService');
+          servicesPagePo.waitForPage();
+          servicesPagePo.list().resourceTable().sortableTable().checkRowCount(false, rows.length - 1);
+          servicesPagePo.list().resourceTable().sortableTable().rowNames('.col-link-detail')
+            .should('not.contain', `clone-${ serviceExternalName }`);
+        });
+    });
+
+    // testing https://github.com/rancher/dashboard/issues/11889
+    it('validation errors should not be shown when form is just opened', () => {
+      servicesPagePo.goTo();
+      servicesPagePo.clickCreate();
+      servicesPagePo.createServicesForm().errorBanner().should('not.exist');
+    });
+
+    after(() => {
+      if (removeServices) {
+        // delete gitrepo
+        servicesToDelete.forEach((r) => cy.deleteRancherResource('v1', 'services', r, false));
+      }
+    });
   });
 
   describe('List', { tags: ['@vai', '@adminUser'] }, () => {
@@ -84,12 +218,6 @@ describe('Services', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }
       servicesPagePo.list().resourceTable().sortableTable().checkRowCount(false, 3);
     });
 
-    it('validation errors should not be shown when form is just opened', () => {
-      servicesPagePo.goTo();
-      servicesPagePo.clickCreate();
-      servicesPagePo.createServicesForm().errorBanner().should('not.exist');
-    });
-
     after('clean up', () => {
       cy.updateNamespaceFilter(cluster, 'none', '{"local":["all://user"]}');
     });
diff --git a/cypress/e2e/tests/pages/extensions/extensions.spec.ts b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
index f208c05fc6..da074f6138 100644
--- a/cypress/e2e/tests/pages/extensions/extensions.spec.ts
+++ b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
@@ -195,6 +195,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     // Ensure that the banner should be shown (by confirming that a required repo isn't there)
     appRepoList.goTo();
     appRepoList.waitForPage();
+    appRepoList.sortableTable().checkLoadingIndicatorNotVisible();
     appRepoList.sortableTable().noRowsShouldNotExist();
     appRepoList.sortableTable().rowNames().then((names: any) => {
       if (names.includes(UI_PLUGINS_PARTNERS_REPO_NAME)) {
@@ -409,6 +410,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
 
     extensionsPo.extensionTabAvailableClick();
     extensionsPo.waitForPage(null, 'available');
+    extensionsPo.loading().should('not.exist');
 
     // Install unauthenticated extension
     extensionsPo.extensionCardInstallClick(UNAUTHENTICATED_EXTENSION_NAME);
@@ -418,6 +420,8 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     // let's check the extension reload banner and reload the page
     extensionsPo.extensionReloadBanner().should('be.visible');
     extensionsPo.extensionReloadClick();
+    extensionsPo.waitForPage(null, 'installed');
+    extensionsPo.loading().should('not.exist');
 
     // make sure both extensions have been imported
     extensionsPo.extensionScriptImport(UNAUTHENTICATED_EXTENSION_NAME).should('exist');
@@ -436,7 +440,8 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     // make sure both extensions have been imported after logging in again
     cy.login(undefined, undefined, false);
     extensionsPo.goTo();
-    extensionsPo.waitForPage();
+    extensionsPo.waitForPage(null, 'installed');
+    extensionsPo.loading().should('not.exist');
     extensionsPo.waitForTitle();
     extensionsPo.extensionScriptImport(UNAUTHENTICATED_EXTENSION_NAME).should('exist');
     extensionsPo.extensionScriptImport(EXTENSION_NAME).should('exist');
diff --git a/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts b/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
index d74342d972..3d3ca200dc 100644
--- a/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/advanced/workspaces.spec.ts
@@ -18,7 +18,7 @@ describe('Workspaces', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] },
     let initialCount: number;
 
     it('check table headers are available in list and details view', () => {
-      FleetWorkspaceListPagePo.navTo();
+      fleetWorkspacesPage.goTo();
       fleetWorkspacesPage.waitForPage();
       fleetWorkspacesPage.sortableTable().noRowsShouldNotExist();
       fleetWorkspacesPage.sortableTable().filter(defaultWorkspace);
diff --git a/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts b/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts
index 12eca5f170..b9e4001144 100644
--- a/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts
@@ -70,7 +70,8 @@ describe('Fleet Clusters', { tags: ['@fleet', '@adminUser'] }, () => {
           rke2ClusterAmazon: {
             clusterName: name,
             namespace,
-          }
+          },
+          metadata: { labels: { foo: 'bar' } }
         }).then(() => {
           removeCluster = true;
         });
@@ -123,6 +124,8 @@ describe('Fleet Clusters', { tags: ['@fleet', '@adminUser'] }, () => {
       fleetClusterListPage.clusterList().details(clusterName, 4).should('have.text', '1');
       // check resources: testing https://github.com/rancher/dashboard/issues/11154
       fleetClusterListPage.clusterList().details(clusterName, 5).contains( ' 1 ', MEDIUM_TIMEOUT_OPT);
+      // check cluster labels
+      fleetClusterListPage.clusterList().subRows().should('contain.text', 'foo=bar');
 
       const fleetClusterDetailsPage = new FleetClusterDetailsPo(namespace, clusterName);
 
diff --git a/cypress/e2e/tests/pages/global-settings/peformance.spec.ts b/cypress/e2e/tests/pages/global-settings/performance.spec.ts
similarity index 97%
rename from cypress/e2e/tests/pages/global-settings/peformance.spec.ts
rename to cypress/e2e/tests/pages/global-settings/performance.spec.ts
index 421fada386..e57aca64d4 100644
--- a/cypress/e2e/tests/pages/global-settings/peformance.spec.ts
+++ b/cypress/e2e/tests/pages/global-settings/performance.spec.ts
@@ -144,12 +144,18 @@ describe('Performance', { testIsolation: 'off', tags: ['@globalSettings', '@admi
     performancePage.garbageCollectionCheckbox().isUnchecked();
     performancePage.garbageCollectionCheckbox().set();
     performancePage.garbageCollectionCheckbox().isChecked();
+    // testing https://github.com/rancher/dashboard/issues/11856
+    performancePage.garbageCollectionResourceCount().set('600');
     performancePage.applyAndWait('garbageCollection-true').then(({ request, response }) => {
       expect(response?.statusCode).to.eq(200);
       expect(request.body).to.have.property('value').contains('\"garbageCollection\":{\"enabled\":true');
       expect(response?.body).to.have.property('value').contains('\"garbageCollection\":{\"enabled\":true');
+      expect(response?.body).to.have.property('value').contains('\"countThreshold\":600');
     });
 
+    // check elements value property
+    performancePage.garbageCollectionResourceCount().shouldHaveValue('600');
+
     // Disable garbage collection
     performancePage.garbageCollectionCheckbox().isChecked();
     performancePage.garbageCollectionCheckbox().set();
diff --git a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
index 1a678bb191..491617ea6a 100644
--- a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
+++ b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
@@ -10,7 +10,7 @@ import ClusterManagerDetailImportedGenericPagePo from '@/cypress/e2e/po/detail/p
 import ClusterManagerCreateRke2CustomPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create-rke2-custom.po';
 import ClusterManagerEditRke2CustomPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/edit/cluster-edit-rke2-custom.po';
 import ClusterManagerImportGenericPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po';
-import ClusterManagerEditGenericPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/edit/cluster-edit-generic.po';
+import ClusterManagerEditImportedPagePo from '@/cypress/e2e/po/extensions/imported/cluster-edit.po';
 import ClusterManagerNamespacePagePo from '@/cypress/e2e/po/pages/cluster-manager/namespace.po';
 import PromptRemove from '@/cypress/e2e/po/prompts/promptRemove.po';
 import * as path from 'path';
@@ -563,9 +563,11 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
 
   describe('Imported', { tags: ['@jenkins', '@importedCluster'] }, () => {
     const importClusterPage = new ClusterManagerImportGenericPagePo();
+    const fqdn = 'fqdn';
+    const cacert = 'cacert';
 
     describe('Generic', () => {
-      const editImportedClusterPage = new ClusterManagerEditGenericPagePo(undefined, importGenericName);
+      const editImportedClusterPage = new ClusterManagerEditImportedPagePo(undefined, importGenericName);
 
       it('can create new cluster', () => {
         const detailClusterPage = new ClusterManagerDetailImportedGenericPagePo(undefined, importGenericName);
@@ -614,11 +616,30 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
         clusterList.list().providerSubType(importGenericName).should('contain.text', 'K3s');
       });
 
-      it('can navigate to cluster edit page', () => {
+      it('can edit imported cluster and see changes afterwards', () => {
+        cy.intercept('GET', '/v1-rke2-release/releases').as('getRke2Releases');
         clusterList.goTo();
+        clusterList.list().actionMenu(importGenericName).getMenuItem('Edit Config').click();
+        editImportedClusterPage.waitForPage('mode=edit');
+
+        editImportedClusterPage.name().value().should('eq', importGenericName );
+        // Issue #10432: Edit Cluster screen falsely gives impression imported cluster's name and description can be edited
+        editImportedClusterPage.name().expectToBeDisabled();
+
+        editImportedClusterPage.ace().enable();
+        editImportedClusterPage.ace().enterFdqn(fqdn);
+        editImportedClusterPage.ace().enterCaCerts(cacert);
+
+        editImportedClusterPage.save();
+
+        // We should be taken back to the list page if the save was successful
+        clusterList.waitForPage();
+
         clusterList.list().actionMenu(importGenericName).getMenuItem('Edit Config').click();
 
         editImportedClusterPage.waitForPage('mode=edit');
+        editImportedClusterPage.ace().fqdn().value().should('eq', fqdn );
+        editImportedClusterPage.ace().caCerts().value().should('eq', cacert );
       });
 
       it('can delete cluster by bulk actions', () => {
diff --git a/cypress/e2e/tests/pages/manager/repositories.spec.ts b/cypress/e2e/tests/pages/manager/repositories.spec.ts
index e6b8d7b91c..a7cf99fd78 100644
--- a/cypress/e2e/tests/pages/manager/repositories.spec.ts
+++ b/cypress/e2e/tests/pages/manager/repositories.spec.ts
@@ -6,6 +6,7 @@ import * as jsyaml from 'js-yaml';
 import { LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
 
 const chartBranch = `release-v${ CURRENT_RANCHER_VERSION }`;
+const gitRepoUrl = 'https://github.com/rancher/charts';
 
 describe('Cluster Management Helm Repositories', { testIsolation: 'off', tags: ['@manager', '@adminUser'] }, () => {
   const repositoriesPage = new ChartRepositoriesPagePo(undefined, 'manager');
@@ -27,7 +28,7 @@ describe('Cluster Management Helm Repositories', { testIsolation: 'off', tags: [
     repositoriesPage.createEditRepositories().nameNsDescription().name().set(this.repoName);
     repositoriesPage.createEditRepositories().nameNsDescription().description().set(`${ this.repoName }-description`);
     repositoriesPage.createEditRepositories().repoRadioBtn().set(1);
-    repositoriesPage.createEditRepositories().gitRepoUrl().set('https://github.com/rancher/charts');
+    repositoriesPage.createEditRepositories().gitRepoUrl().set(gitRepoUrl);
     repositoriesPage.createEditRepositories().gitBranch().set(chartBranch);
     repositoriesPage.createEditRepositories().saveAndWaitForRequests('POST', '/v1/catalog.cattle.io.clusterrepos').its('response.statusCode').should('eq', 201);
     repositoriesPage.waitForPage();
@@ -129,7 +130,7 @@ describe('Cluster Management Helm Repositories', { testIsolation: 'off', tags: [
     repositoriesPage.createEditRepositories().nameNsDescription().name().set(`${ this.repoName }basic`);
     repositoriesPage.createEditRepositories().nameNsDescription().description().set(`${ this.repoName }-description`);
     repositoriesPage.createEditRepositories().repoRadioBtn().set(1);
-    repositoriesPage.createEditRepositories().gitRepoUrl().set('https://github.com/rancher/charts');
+    repositoriesPage.createEditRepositories().gitRepoUrl().set(gitRepoUrl);
     repositoriesPage.createEditRepositories().gitBranch().set(chartBranch);
     repositoriesPage.createEditRepositories().clusterRepoAuthSelectOrCreate().createBasicAuth('test', 'test');
     repositoriesPage.createEditRepositories().saveAndWaitForRequests('POST', '/v1/catalog.cattle.io.clusterrepos');
@@ -148,7 +149,7 @@ describe('Cluster Management Helm Repositories', { testIsolation: 'off', tags: [
     repositoriesPage.createEditRepositories().nameNsDescription().name().set(`${ this.repoName }ssh`);
     repositoriesPage.createEditRepositories().nameNsDescription().description().set(`${ this.repoName }-description`);
     repositoriesPage.createEditRepositories().repoRadioBtn().set(1);
-    repositoriesPage.createEditRepositories().gitRepoUrl().set('https://github.com/rancher/charts');
+    repositoriesPage.createEditRepositories().gitRepoUrl().set(gitRepoUrl);
     repositoriesPage.createEditRepositories().gitBranch().set(chartBranch);
     repositoriesPage.createEditRepositories().clusterRepoAuthSelectOrCreate().createSSHAuth('privateKey', 'publicKey');
     repositoriesPage.createEditRepositories().saveAndWaitForRequests('POST', '/v1/catalog.cattle.io.clusterrepos');
@@ -254,4 +255,55 @@ describe('Cluster Management Helm Repositories', { testIsolation: 'off', tags: [
     // check list details
     cy.contains(this.repoName).should('not.exist');
   });
+
+  it('can disable/enable a repository', function() {
+    // create repo
+    ChartRepositoriesPagePo.navTo();
+    repositoriesPage.waitForPage();
+    repositoriesPage.create();
+    repositoriesPage.createEditRepositories().waitForPage();
+    repositoriesPage.createEditRepositories().nameNsDescription().name().set(this.repoName);
+    repositoriesPage.createEditRepositories().nameNsDescription().description().set(`${ this.repoName }-description`);
+    repositoriesPage.createEditRepositories().repoRadioBtn().set(1);
+    repositoriesPage.createEditRepositories().gitRepoUrl().set(gitRepoUrl);
+    repositoriesPage.createEditRepositories().gitBranch().set(chartBranch);
+    repositoriesPage.createEditRepositories().saveAndWaitForRequests('POST', '/v1/catalog.cattle.io.clusterrepos').its('response.statusCode').should('eq', 201);
+    repositoriesPage.waitForPage();
+
+    // check list details
+    repositoriesPage.list().details(this.repoName, 2).should('be.visible');
+    repositoriesPage.list().details(this.repoName, 1).contains('In Progress').should('be.visible');
+
+    // refresh should be displayed for an enabled repo
+    repositoriesPage.list().actionMenu(this.repoName).getMenuItem('Refresh').should('be.visible');
+    // close action menu
+    repositoriesPage.list().closeActionMenu();
+    // disable repo
+    repositoriesPage.list().actionMenu(this.repoName).getMenuItem('Disable').click();
+    repositoriesPage.list().details(this.repoName, 1).contains('Disabled', { timeout: 10000 }).scrollIntoView()
+      .should('be.visible');
+
+    // refresh should NOT be displayed for a disabled repo
+    repositoriesPage.list().actionMenu(this.repoName).getMenuItem('Refresh').should('not.exist');
+    // close action menu
+    repositoriesPage.list().closeActionMenu();
+    // enable repo
+    repositoriesPage.list().actionMenu(this.repoName).getMenuItem('Enable').click();
+    repositoriesPage.list().details(this.repoName, 1).contains('Active', LONG_TIMEOUT_OPT).scrollIntoView()
+      .should('be.visible');
+
+    // delete repo
+    repositoriesPage.list().actionMenu(this.repoName).getMenuItem('Delete').click();
+
+    const promptRemove = new PromptRemove();
+
+    cy.intercept('DELETE', `v1/catalog.cattle.io.clusterrepos/${ this.repoName }`).as('deleteRepository');
+
+    promptRemove.remove();
+    cy.wait('@deleteRepository');
+    repositoriesPage.waitForPage();
+
+    // check list details
+    cy.contains(this.repoName).should('not.exist');
+  });
 });
diff --git a/cypress/globals.d.ts b/cypress/globals.d.ts
index 060c3b6e1e..81b932c271 100644
--- a/cypress/globals.d.ts
+++ b/cypress/globals.d.ts
@@ -29,7 +29,7 @@ export type CreateAmazonRke2ClusterParams = {
     type: string,
     clusterName: string,
     namespace: string
-},
+  },
   cloudCredentialsAmazon: {
     workspace: string,
     name: string,
@@ -40,7 +40,11 @@ export type CreateAmazonRke2ClusterParams = {
   rke2ClusterAmazon: {
     clusterName: string,
     namespace: string,
-  }
+  },
+  metadata?: {
+    labels?: { [key: string]: string },
+    annotations?: { [key: string]: string },
+  },
 }
 export type CreateAmazonRke2ClusterWithoutMachineConfigParams = {
   cloudCredentialsAmazon: {
diff --git a/cypress/jenkins/Jenkinsfile b/cypress/jenkins/Jenkinsfile
index f1206e1814..f52de682f6 100644
--- a/cypress/jenkins/Jenkinsfile
+++ b/cypress/jenkins/Jenkinsfile
@@ -27,7 +27,9 @@ node {
                         string(credentialsId: 'AWS_SECRET_ACCESS_KEY', variable: 'AWS_SECRET_ACCESS_KEY'),
                         string(credentialsId: 'AZURE_AKS_SUBSCRIPTION_ID', variable: 'AZURE_AKS_SUBSCRIPTION_ID'),
                         string(credentialsId: 'AZURE_CLIENT_ID', variable: 'AZURE_CLIENT_ID'),
-                        string(credentialsId: 'AZURE_CLIENT_SECRET', variable: 'AZURE_CLIENT_SECRET')]) {
+                        string(credentialsId: 'AZURE_CLIENT_SECRET', variable: 'AZURE_CLIENT_SECRET'),
+                        string(credentialsId: 'GKE_SERVICE_ACCOUNT', variable: 'GKE_SERVICE_ACCOUNT')
+                        ]) {
         withEnv(paramsMap) {
             stage('Checkout') {
             deleteDir()
diff --git a/cypress/jenkins/cypress.config.jenkins.ts b/cypress/jenkins/cypress.config.jenkins.ts
index 444b035c69..7b9455daa9 100644
--- a/cypress/jenkins/cypress.config.jenkins.ts
+++ b/cypress/jenkins/cypress.config.jenkins.ts
@@ -86,7 +86,8 @@ export default defineConfig({
     azureClientId:       process.env.AZURE_CLIENT_ID,
     azureClientSecret:   process.env.AZURE_CLIENT_SECRET,
     customNodeIp:        process.env.CUSTOM_NODE_IP,
-    customNodeKey:       process.env.CUSTOM_NODE_KEY
+    customNodeKey:       process.env.CUSTOM_NODE_KEY,
+    gkeServiceAccount:   process.env.GKE_SERVICE_ACCOUNT
   },
   // Jenkins reporters configuration jUnit and HTML
   reporter:        'cypress-multi-reporters',
diff --git a/cypress/jenkins/init.sh b/cypress/jenkins/init.sh
index e1d7a22356..317aa3b1c9 100755
--- a/cypress/jenkins/init.sh
+++ b/cypress/jenkins/init.sh
@@ -93,6 +93,7 @@ corral config vars set azure_subscription_id "${AZURE_AKS_SUBSCRIPTION_ID}"
 corral config vars set azure_client_id "${AZURE_CLIENT_ID}"
 corral config vars set azure_client_secret "${AZURE_CLIENT_SECRET}"
 corral config vars set create_initial_clusters "${CREATE_INITIAL_CLUSTERS}"
+corral config vars set gke_service_account "${GKE_SERVICE_ACCOUNT}"
 
 create_initial_clusters() {
   shopt -u nocasematch
diff --git a/cypress/support/commands/rancher-api-commands.ts b/cypress/support/commands/rancher-api-commands.ts
index 601db0080c..6e5fbf3564 100644
--- a/cypress/support/commands/rancher-api-commands.ts
+++ b/cypress/support/commands/rancher-api-commands.ts
@@ -602,7 +602,9 @@ Cypress.Commands.add('deleteNodeTemplate', (nodeTemplateId, timeout = 30000, fai
  * Create RKE2 cluster with Amazon EC2 cloud provider
  */
 Cypress.Commands.add('createAmazonRke2Cluster', (params: CreateAmazonRke2ClusterParams) => {
-  const { machineConfig, rke2ClusterAmazon, cloudCredentialsAmazon } = params;
+  const {
+    machineConfig, rke2ClusterAmazon, cloudCredentialsAmazon, metadata
+  } = params;
 
   return cy.createAwsCloudCredentials(cloudCredentialsAmazon.workspace, cloudCredentialsAmazon.name, cloudCredentialsAmazon.region, cloudCredentialsAmazon.accessKey, cloudCredentialsAmazon.secretKey)
     .then((resp: Cypress.Response<any>) => {
@@ -625,8 +627,12 @@ Cypress.Commands.add('createAmazonRke2Cluster', (params: CreateAmazonRke2Cluster
               type:     'provisioning.cattle.io.cluster',
               metadata: {
                 namespace:   rke2ClusterAmazon.namespace,
-                annotations: { 'field.cattle.io/description': `${ rke2ClusterAmazon.clusterName }-description` },
-                name:        rke2ClusterAmazon.clusterName
+                annotations: {
+                  'field.cattle.io/description': `${ rke2ClusterAmazon.clusterName }-description`,
+                  ...(metadata?.annotations || {}),
+                },
+                labels: metadata?.labels || {},
+                name:   rke2ClusterAmazon.clusterName
               },
               spec: {
                 rkeConfig: {
diff --git a/package.json b/package.json
index 81f7fd79d5..d1ce8952ef 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "cookie": "0.7.0",
     "cookie-universal": "2.2.2",
     "cron-validator": "1.2.0",
-    "cronstrue": "1.95.0",
+    "cronstrue": "2.53.0",
     "cross-env": "7.0.3",
     "custom-event-polyfill": "1.0.7",
     "d3": "7.3.0",
@@ -90,6 +90,7 @@
     "express": "4.17.1",
     "file-saver": "2.0.2",
     "floating-vue": "5.2.2",
+    "focus-trap": "7.6.2",
     "https": "1.0.0",
     "identicon.js": "2.3.3",
     "intl-messageformat": "7.8.4",
@@ -135,7 +136,7 @@
     "yaml": "2.5.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-optional-chaining": "7.14.5",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
     "@babel/plugin-transform-nullish-coalescing-operator": "7.23.4",
@@ -178,6 +179,7 @@
     "eslint-plugin-cypress": "2.12.1",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "24.4.0",
+    "eslint-plugin-local-rules": "link:./eslint-plugin-local-rules",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-vue": "9.10.0",
     "eslint": "7.32.0",
@@ -188,7 +190,7 @@
     "lodash.debounce": "4.0.8",
     "nodemon": "2.0.22",
     "nyc": "15.1.0",
-    "start-server-and-test": "1.13.1",
+    "start-server-and-test": "2.0.10",
     "style-loader": "3.3.2",
     "ts-jest": "27.1.5",
     "typescript": "5.6.3",
@@ -197,8 +199,7 @@
     "webpack-virtual-modules": "0.4.3",
     "worker-loader": "3.0.8",
     "yaml-lint": "1.7.0",
-    "yarn": "1.22.18",
-    "eslint-plugin-local-rules": "link:./eslint-plugin-local-rules"
+    "yarn": "1.22.18"
   },
   "resolutions": {
     "html-webpack-plugin": "^5.0.0"
diff --git a/pkg/aks/components/AksNodePool.vue b/pkg/aks/components/AksNodePool.vue
index e293eb3e48..6f3b48920a 100644
--- a/pkg/aks/components/AksNodePool.vue
+++ b/pkg/aks/components/AksNodePool.vue
@@ -387,26 +387,28 @@ export default defineComponent({
           v-if="(taints && taints.length) || isView"
           class="taints"
         >
-          <tr>
-            <th>
-              <label class="text-label">
-                {{ t('aks.nodePools.taints.key') }}
-                <span class="text-error">*</span>
-              </label>
-            </th>
-            <th>
-              <label class="text-label">
-                {{ t('aks.nodePools.taints.value') }}
-                <span class="text-error">*</span>
-              </label>
-            </th>
-            <th>
-              <label class="text-label">
-                {{ t('aks.nodePools.taints.effect') }}
-              </label>
-            </th>
-            <th />
-          </tr>
+          <thead>
+            <tr>
+              <th>
+                <label class="text-label">
+                  {{ t('aks.nodePools.taints.key') }}
+                  <span class="text-error">*</span>
+                </label>
+              </th>
+              <th>
+                <label class="text-label">
+                  {{ t('aks.nodePools.taints.value') }}
+                  <span class="text-error">*</span>
+                </label>
+              </th>
+              <th>
+                <label class="text-label">
+                  {{ t('aks.nodePools.taints.effect') }}
+                </label>
+              </th>
+              <th />
+            </tr>
+          </thead>
           <template v-if="taints && taints.length">
             <Taint
               v-for="(keyedTaint, i) in taints"
diff --git a/pkg/eks/assets/data/eks-versions.js b/pkg/eks/assets/data/eks-versions.js
index ef60cb13a9..ff6a25f279 100644
--- a/pkg/eks/assets/data/eks-versions.js
+++ b/pkg/eks/assets/data/eks-versions.js
@@ -1,7 +1,5 @@
-export default ['1.31',
+export default ['1.32',
 
-  '1.30',
+  '1.31',
 
-  '1.29',
-
-  '1.28'];
+  '1.30'];
diff --git a/pkg/eks/components/Config.vue b/pkg/eks/components/Config.vue
index 7b5e706f1d..e9551d6e2a 100644
--- a/pkg/eks/components/Config.vue
+++ b/pkg/eks/components/Config.vue
@@ -388,17 +388,16 @@ export default defineComponent({
       </div>
     </div>
 
-    <div class="col span-6">
+    <div class="col span-6 mt-20">
       <KeyValue
         :value="tags"
         :mode="mode"
-        :title="t('eks.tags.label')"
         :as-map="true"
         :read-allowed="false"
         @update:value="$emit('update:tags', $event)"
       >
         <template #title>
-          <label class="text-label">{{ t('eks.tags.label') }}</label>
+          <h3 v-t="'eks.tags.label'" />
         </template>
       </KeyValue>
     </div>
diff --git a/pkg/eks/components/Networking.vue b/pkg/eks/components/Networking.vue
index 85c1ca87e6..3c7c31ef7d 100644
--- a/pkg/eks/components/Networking.vue
+++ b/pkg/eks/components/Networking.vue
@@ -296,7 +296,7 @@ export default defineComponent({
         </ArrayList>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row mb-10 mt-20">
       <div
         v-if="isNew"
         class="col span-6"
diff --git a/pkg/eks/components/NodeGroup.vue b/pkg/eks/components/NodeGroup.vue
index 01e5a086ca..08c9d4e88e 100644
--- a/pkg/eks/components/NodeGroup.vue
+++ b/pkg/eks/components/NodeGroup.vue
@@ -604,7 +604,7 @@ export default defineComponent({
       :label="minMaxDesiredErrors"
     />
     <div class="row mb-10">
-      <div class="col span-6">
+      <div class="col span-6 mt-20">
         <KeyValue
           :mode="mode"
           :title="t('eks.nodeGroups.groupLabels.label')"
@@ -614,11 +614,13 @@ export default defineComponent({
           @update:value="$emit('update:labels', $event)"
         >
           <template #title>
-            <label class="text-label">{{ t('eks.nodeGroups.groupLabels.label') }}</label>
+            <h4>
+              {{ t('eks.nodeGroups.groupLabels.label') }}
+            </h4>
           </template>
         </KeyValue>
       </div>
-      <div class="col span-6">
+      <div class="col span-6 mt-20">
         <KeyValue
           :mode="mode"
           :title="t('eks.nodeGroups.groupTags.label')"
@@ -629,7 +631,7 @@ export default defineComponent({
           @update:value="$emit('update:tags', $event)"
         >
           <template #title>
-            <label class="text-label">{{ t('eks.nodeGroups.groupTags.label') }}</label>
+            <h4>{{ t('eks.nodeGroups.groupTags.label') }}</h4>
           </template>
         </KeyValue>
       </div>
@@ -812,7 +814,7 @@ export default defineComponent({
       </div>
     </div>
     <div row="mb-10">
-      <div class="col span-12">
+      <div class="col span-12 mt-20">
         <KeyValue
           :mode="mode"
           label-key="eks.nodeGroups.resourceTags.label"
@@ -823,7 +825,9 @@ export default defineComponent({
           @update:value="$emit('update:resourceTags', $event)"
         >
           <template #title>
-            <label class="text-label">{{ t('eks.nodeGroups.resourceTags.label') }}</label>
+            <h4>
+              {{ t('eks.nodeGroups.resourceTags.label') }}
+            </h4>
           </template>
         </KeyValue>
       </div>
diff --git a/pkg/harvester-manager/l10n/en-us.yaml b/pkg/harvester-manager/l10n/en-us.yaml
index ae122e1760..a8b915ee26 100644
--- a/pkg/harvester-manager/l10n/en-us.yaml
+++ b/pkg/harvester-manager/l10n/en-us.yaml
@@ -35,7 +35,7 @@ harvesterManager:
       prompt-standard-user: Please contact your system administrator to install the latest Harvester UI Extension, if any
     missingVersion:
       warning: "Could not find a compatible version"
-      prompt: "Please update Rancher to get the latest compatible version of the Harvester UI extension"
+      prompt: "Please update Rancher to get the latest compatible version of the Harvester UI extension or try to install it manually"
       prompt-standard-user: Please contact your system administrator
     error:
       warning: "Warning, Harvester UI extension automatic installation failed"
diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index c25490cf9b..c503d7588a 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -14,11 +14,12 @@ import { allHash } from '@shell/utils/promise';
 import { NAME as APP_PRODUCT } from '@shell/config/product/apps';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
-import { HARVESTER_CHART, HARVESTER_COMMUNITY_REPO, HARVESTER_RANCHER_REPO } from '../types';
+import { HARVESTER_CHART, HARVESTER_COMMUNITY_REPO, HARVESTER_RANCHER_REPO, communityRepoRegexes } from '../types';
 import {
   getLatestExtensionVersion,
-  getHelmRepository,
-  ensureHelmRepository,
+  getHelmRepositoryExact,
+  getHelmRepositoryMatch,
+  createHelmRepository,
   refreshHelmRepository,
   installHelmChart,
   waitForUIExtension,
@@ -102,9 +103,9 @@ export default {
   },
 
   watch: {
-    async harvesterRepository(value) {
-      if (value) {
-        await refreshHelmRepository(this.$store, HARVESTER_REPO.spec.gitRepo, HARVESTER_REPO.spec.gitBranch);
+    async harvesterRepository(neu) {
+      if (neu) {
+        await refreshHelmRepository(this.$store, neu.spec.gitRepo || neu.spec.url);
 
         if (this.harvester.extension) {
           await this.setHarvesterUpdateVersion();
@@ -212,7 +213,11 @@ export default {
   methods: {
     async getHarvesterRepository() {
       try {
-        return await getHelmRepository(this.$store, HARVESTER_REPO.spec.gitRepo, HARVESTER_REPO.spec.gitBranch);
+        if (isRancherPrime()) {
+          return await getHelmRepositoryExact(this.$store, HARVESTER_REPO.gitRepo);
+        } else {
+          return await getHelmRepositoryMatch(this.$store, communityRepoRegexes);
+        }
       } catch (error) {
         this.harvesterRepositoryError = true;
       }
@@ -234,13 +239,17 @@ export default {
       let installed = false;
 
       try {
-        const harvesterRepo = await ensureHelmRepository(this.$store, HARVESTER_REPO.spec.gitRepo, HARVESTER_REPO.metadata.name, HARVESTER_REPO.spec.gitBranch);
+        let harvesterRepository = this.harvesterRepository;
+
+        if (!harvesterRepository) {
+          harvesterRepository = await createHelmRepository(this.$store, HARVESTER_REPO.metadata.name, HARVESTER_REPO.gitRepo, HARVESTER_REPO.gitBranch);
+        }
 
         /**
          * Server issue
          * It needs to refresh the HelmRepository because the server can have a previous one in the cache.
          */
-        await refreshHelmRepository(this.$store, HARVESTER_REPO.spec.gitRepo, HARVESTER_REPO.spec.gitBranch);
+        await refreshHelmRepository(this.$store, harvesterRepository.spec.gitRepo || harvesterRepository.spec.url);
 
         this.harvesterInstallVersion = await getLatestExtensionVersion(this.$store, HARVESTER_CHART.name, this.rancherVersion, this.kubeVersion);
 
@@ -250,7 +259,16 @@ export default {
           return;
         }
 
-        await installHelmChart(harvesterRepo, { ...HARVESTER_CHART, version: this.harvesterInstallVersion }, {}, UI_PLUGIN_NAMESPACE, 'install');
+        await installHelmChart(
+          harvesterRepository,
+          {
+            ...HARVESTER_CHART,
+            version: this.harvesterInstallVersion
+          },
+          {},
+          UI_PLUGIN_NAMESPACE,
+          'install'
+        );
 
         const extension = await waitForUIExtension(this.$store, HARVESTER_CHART.name);
 
@@ -272,7 +290,7 @@ export default {
 
       try {
         if (this.harvester.missingRepository) {
-          this.harvesterRepository = await ensureHelmRepository(this.$store, HARVESTER_REPO.spec.gitRepo, HARVESTER_REPO.metadata.name, HARVESTER_REPO.spec.gitBranch);
+          this.harvesterRepository = await createHelmRepository(this.$store, HARVESTER_REPO.metadata.name, HARVESTER_REPO.gitRepo, HARVESTER_REPO.gitBranch);
 
           await this.setHarvesterUpdateVersion();
         }
@@ -283,7 +301,16 @@ export default {
           return;
         }
 
-        await installHelmChart(this.harvesterRepository, { ...HARVESTER_CHART, version: this.harvesterUpdateVersion }, {}, UI_PLUGIN_NAMESPACE, 'upgrade');
+        await installHelmChart(
+          this.harvesterRepository,
+          {
+            ...HARVESTER_CHART,
+            version: this.harvesterUpdateVersion
+          },
+          {},
+          UI_PLUGIN_NAMESPACE,
+          'upgrade'
+        );
 
         const extension = await waitForUIExtension(this.$store, HARVESTER_CHART.name);
 
diff --git a/pkg/harvester-manager/types.js b/pkg/harvester-manager/types.js
index a784539156..4fe4b8bac2 100644
--- a/pkg/harvester-manager/types.js
+++ b/pkg/harvester-manager/types.js
@@ -1,5 +1,10 @@
 import { UI_PLUGINS_REPOS } from '@shell/config/uiplugins';
 
+export const communityRepoRegexes = [
+  /^https:\/\/github\.com\/.*\/harvester-ui-extension+/g,
+  /^https:\/\/.*\.github\.io\/harvester-ui-extension+/g,
+];
+
 export const HARVESTER_CHART = {
   name:     'harvester',
   version:  '',
@@ -8,21 +13,13 @@ export const HARVESTER_CHART = {
 };
 
 export const HARVESTER_COMMUNITY_REPO = {
-  type:     'catalog.cattle.io.clusterrepo',
-  metadata: { name: 'harvester' },
-  spec:     {
-    clientSecret: null,
-    gitRepo:      'https://github.com/harvester/harvester-ui-extension',
-    gitBranch:    'gh-pages'
-  }
+  metadata:  { name: 'harvester' },
+  gitRepo:   'https://github.com/harvester/harvester-ui-extension',
+  gitBranch: 'gh-pages',
 };
 
 export const HARVESTER_RANCHER_REPO = {
-  type:     'catalog.cattle.io.clusterrepo',
-  metadata: { name: 'rancher' },
-  spec:     {
-    clientSecret: null,
-    gitRepo:      UI_PLUGINS_REPOS.OFFICIAL.URL,
-    gitBranch:    UI_PLUGINS_REPOS.OFFICIAL.BRANCH,
-  }
+  metadata:  { name: 'rancher' },
+  gitRepo:   UI_PLUGINS_REPOS.OFFICIAL.URL,
+  gitBranch: UI_PLUGINS_REPOS.OFFICIAL.BRANCH,
 };
diff --git a/pkg/imported/babel.config.js b/pkg/imported/babel.config.js
new file mode 100644
index 0000000000..410af817a2
--- /dev/null
+++ b/pkg/imported/babel.config.js
@@ -0,0 +1 @@
+module.exports = require('./.shell/pkg/babel.config.js');
diff --git a/pkg/imported/components/Basics.vue b/pkg/imported/components/Basics.vue
new file mode 100644
index 0000000000..7750fa117e
--- /dev/null
+++ b/pkg/imported/components/Basics.vue
@@ -0,0 +1,178 @@
+<script>
+
+import { defineComponent } from 'vue';
+import { MANAGEMENT } from '@shell/config/types';
+import { SETTING } from '@shell/config/settings';
+import { _EDIT } from '@shell/config/query-params';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import { Checkbox } from '@components/Form/Checkbox';
+import { getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions } from '@shell/utils/cluster';
+
+export default defineComponent({
+  name:       'Basics',
+  components: {
+    LabeledSelect, Checkbox, LabeledInput
+  },
+  props: {
+    mode: {
+      type:    String,
+      default: _EDIT
+    },
+    versions: {
+      type:    Array,
+      default: () => {
+        return [];
+      }
+    },
+    defaultVersion: {
+      type:    String,
+      default: () => {
+        return '';
+      }
+    },
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+    config: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+    upgradeStrategy: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+    loadingVersions: {
+      type:    Boolean,
+      default: false
+    },
+    rules: {
+      default: () => ({
+        workerConcurrency:       [],
+        controlPlaneConcurrency: []
+      }),
+      type: Object,
+    },
+
+  },
+  emits: ['kubernetes-version-changed', 'drain-server-nodes-changed', 'server-concurrency-changed',
+    'drain-worker-nodes-changed', 'worker-concurrency-changed', 'enable-authorized-endpoint', 'input'],
+  data() {
+    const store = this.$store;
+    const supportedVersionRange = store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_SUPPORTED_K8S_VERSIONS)?.value;
+    const originalVersion = this.config.kubernetesVersion;
+
+    return {
+      supportedVersionRange, originalVersion, showDeprecatedPatchVersions: false
+    };
+  },
+  computed: {
+    versionOptions() {
+      const cur = this.originalVersion;
+      let out = getAllOptionsAfterCurrentVersion(this.$store, this.versions, cur, this.defaultVersion);
+
+      if (!this.showDeprecatedPatchVersions) {
+        // Normally, we only want to show the most recent patch version
+        // for each Kubernetes minor version. However, if the user
+        // opts in to showing deprecated versions, we don't filter them.
+        out = filterOutDeprecatedPatchVersions(out, cur);
+      }
+      const existing = out.find((x) => x.value === cur);
+
+      if (existing) {
+        existing.disabled = false;
+      }
+
+      return out;
+    }
+  },
+});
+
+</script>
+<template>
+  <div>
+    <div class="row row-basics mb-20">
+      <div class="col-basics mr-10 span-6">
+        <LabeledSelect
+          v-model:value="config.kubernetesVersion"
+          data-testid="cruimported-kubernetesversion"
+          :mode="mode"
+          :options="versionOptions"
+          label-key="cluster.kubernetesVersion.label"
+          option-key="value"
+          option-label="label"
+          :loading="loadingVersions"
+          @update:value="$emit('kubernetes-version-changed', $event)"
+        />
+      </div>
+      <div class="col-basics span-6 mt-15">
+        <Checkbox
+          v-model:value="showDeprecatedPatchVersions"
+          :label="t('cluster.kubernetesVersion.deprecatedPatches')"
+          :tooltip="t('cluster.kubernetesVersion.deprecatedPatchWarning')"
+          class="patch-version"
+        />
+      </div>
+    </div>
+    <h3 v-t="'imported.upgradeStrategy.header'" />
+    <div class="col mt-10 mb-10">
+      <div class="col mt-5">
+        <Checkbox
+          :value="upgradeStrategy.drainServerNodes"
+          :mode="mode"
+          :label="t('imported.drainControlPlaneNodes.label')"
+          @update:value="$emit('drain-server-nodes-changed', $event)"
+        />
+      </div>
+      <div class="col mt-5">
+        <Checkbox
+          :value="upgradeStrategy.drainWorkerNodes"
+          :mode="mode"
+          :label="t('imported.drainWorkerNodes.label')"
+          @update:value="$emit('drain-worker-nodes-changed', $event)"
+        />
+      </div>
+    </div>
+    <div class="row row-basics">
+      <div class="col-basics mr-10 span-6">
+        <LabeledInput
+          :value="upgradeStrategy.serverConcurrency"
+          :mode="mode"
+          :label="t('cluster.rke2.controlPlaneConcurrency.label')"
+          :rules="rules.concurrency"
+          required
+          class="mb-10"
+          @update:value="$emit('server-concurrency-changed', $event)"
+        />
+      </div>
+      <div class="col-basics span-6">
+        <LabeledInput
+          :value="upgradeStrategy.workerConcurrency"
+          :mode="mode"
+          :label="t('cluster.rke2.workerConcurrency.label')"
+          :rules="rules.concurrency"
+          required
+          class="mb-10"
+          @update:value="$emit('worker-concurrency-changed', $event)"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<style>
+@media screen and (max-width: 996px) {
+    .row-basics {
+        flex-direction: column;
+    }
+    .col-basics {
+        width: 100%
+    }
+  }
+</style>
diff --git a/pkg/imported/components/CruImported.vue b/pkg/imported/components/CruImported.vue
new file mode 100644
index 0000000000..ec62a99841
--- /dev/null
+++ b/pkg/imported/components/CruImported.vue
@@ -0,0 +1,396 @@
+<script>
+import { set } from '@shell/utils/object';
+import { mapGetters } from 'vuex';
+import { defineComponent } from 'vue';
+import { allHash } from '@shell/utils/promise';
+import isEmpty from 'lodash/isEmpty';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import FormValidation from '@shell/mixins/form-validation';
+import CruResource from '@shell/components/CruResource.vue';
+import Loading from '@shell/components/Loading.vue';
+import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import Accordion from '@components/Accordion/Accordion.vue';
+import Banner from '@components/Banner/Banner.vue';
+import ClusterMembershipEditor, { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor.vue';
+import Labels from '@shell/components/form/Labels.vue';
+import Basics from '@pkg/imported/components/Basics.vue';
+import ACE from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE';
+import { MANAGEMENT } from '@shell/config/types';
+import KeyValue from '@shell/components/form/KeyValue';
+import { Checkbox } from '@components/Form/Checkbox';
+
+export default defineComponent({
+  name: 'CruImported',
+
+  components: {
+    Basics, ACE, Loading, CruResource, KeyValue, LabeledInput, Accordion, Banner, ClusterMembershipEditor, Labels, Checkbox
+  },
+
+  mixins: [CreateEditView, FormValidation],
+
+  props: {
+
+    mode: {
+      type:    String,
+      default: _CREATE
+    },
+
+    // provisioning cluster object
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    }
+  },
+
+  async fetch() {
+    const store = this.$store;
+
+    if (this.value.id) {
+      const liveNormanCluster = await this.value.findNormanCluster();
+
+      this.normanCluster = await store.dispatch(`rancher/clone`, { resource: liveNormanCluster });
+      this.config = this.normanCluster.rke2Config || this.normanCluster.k3sConfig;
+      if ( this.normanCluster && isEmpty(this.normanCluster.localClusterAuthEndpoint) ) {
+        set(this.normanCluster, 'localClusterAuthEndpoint', { enabled: false });
+      }
+      if ( this.normanCluster && !this.normanCluster?.agentEnvVars) {
+        this.normanCluster.agentEnvVars = [];
+      }
+      this.getVersions();
+    }
+  },
+
+  data() {
+    return {
+      normanCluster:    { name: '' },
+      loadingVersions:  false,
+      membershipUpdate: {},
+      config:           {},
+      allVersions:      [],
+      defaultVer:       '',
+      fvFormRuleSets:   [{
+        path:  'workerConcurrency',
+        rules: ['workerConcurrencyRule']
+      },
+      {
+        path:  'controlPlaneConcurrency',
+        rules: ['controlPlaneConcurrencyRule']
+      },
+
+      ],
+    };
+  },
+
+  created() {
+    this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+    fvExtraRules() {
+      return {
+        workerConcurrencyRule: () => {
+          const val = this?.normanCluster?.k3sConfig?.k3supgradeStrategy?.workerConcurrency || this?.normanCluster?.rke2Config?.rke2upgradeStrategy?.workerConcurrency || '';
+          const exists = this?.normanCluster?.k3sConfig?.k3supgradeStrategy || this?.normanCluster?.rke2Config?.rke2upgradeStrategy;
+          // BE is only checking that the value is an integer >= 1
+          const valIsInvalid = Number(val) < 1 || !Number.isInteger(+val) || `${ val }`.match(/\.+/g);
+
+          return !!exists && valIsInvalid ? this.t('imported.errors.concurrency', { key: 'Worker Concurrency' }) : undefined ;
+        },
+        controlPlaneConcurrencyRule: () => {
+          const val = this?.normanCluster?.k3sConfig?.k3supgradeStrategy?.serverConcurrency || this?.normanCluster?.rke2Config?.rke2upgradeStrategy?.serverConcurrency || '';
+          const exists = this?.normanCluster?.k3sConfig?.k3supgradeStrategy || this?.normanCluster?.rke2Config?.rke2upgradeStrategy;
+          // BE is only checking that the value is an integer >= 1
+          const valIsInvalid = Number(val) < 1 || !Number.isInteger(+val) || `${ val }`.match(/\.+/g);
+
+          return !!exists && valIsInvalid ? this.t('imported.errors.concurrency', { key: 'Control Plane Concurrency' }) : undefined ;
+        },
+      };
+    },
+
+    upgradeStrategy: {
+      get() {
+        if ( this.normanCluster?.rke2Config ) {
+          return this.normanCluster.rke2Config?.rke2upgradeStrategy;
+        }
+
+        return this.normanCluster?.k3sConfig?.k3supgradeStrategy;
+      },
+      set(newValue) {
+        if ( this.normanCluster?.rke2Config ) {
+          this.normanCluster.rke2Config.rke2upgradeStrategy = newValue;
+        }
+
+        this.normanCluster.k3sConfig.k3supgradeStrategy = newValue;
+      }
+
+    },
+
+    isEdit() {
+      return this.mode === _CREATE || this.mode === _EDIT;
+    },
+    isK3s() {
+      return !!this.value.isK3s;
+    },
+    isRke2() {
+      return !!this.value.isRke2;
+    },
+    enableNetworkPolicySupported() {
+      // https://github.com/rancher/rancher/pull/33070/files
+      return !this.isK3s && !this.isRke2;
+    },
+    isLocal() {
+      return !!this.value.isLocal;
+    },
+
+    doneRoute() {
+      return this.value?.listLocation?.name;
+    },
+
+    canManageMembers() {
+      return canViewClusterMembershipEditor(this.$store);
+    },
+
+    providerTabKey() {
+      return this.isK3s ? this.t('imported.accordions.k3sOptions') : this.t('imported.accordions.rke2Options');
+    },
+    // If the cluster hasn't been fully imported yet, we won't have this information yet
+    // and Basics should be hidden
+    showBasics() {
+      return !!this.config;
+    }
+  },
+
+  methods: {
+
+    onMembershipUpdate(update) {
+      this.membershipUpdate = update;
+    },
+    async saveRoleBindings() {
+      if (this.membershipUpdate.save) {
+        await this.membershipUpdate.save(this.normanCluster.id);
+      }
+    },
+    async actuallySave() {
+      return await this.normanCluster.save();
+    },
+
+    async getVersions() {
+      this.loadingVersions = true;
+      this.versionOptions = [];
+
+      try {
+        const globalSettings = await this.$store.getters['management/all'](MANAGEMENT.SETTING) || [];
+        let hash = {};
+
+        if (this.isK3s) {
+          hash = { versions: this.$store.dispatch('management/request', { url: '/v1-k3s-release/releases' }) };
+
+          const defaultK3sSetting = globalSettings.find((setting) => setting.id === 'k3s-default-version') || {};
+
+          this.defaultVersion = defaultK3sSetting?.value || defaultK3sSetting?.default;
+
+          // Use the channel if we can not get the version from the settings
+          if (!this.defaultVersion) {
+            hash.channels = this.$store.dispatch('management/request', { url: '/v1-k3s-release/channels' });
+          }
+        } else {
+          hash = { versions: this.$store.dispatch('management/request', { url: '/v1-rke2-release/releases' }) };
+
+          const defaultRke2Setting = globalSettings.find((setting) => setting.id === 'rke2-default-version') || {};
+
+          this.defaultVersion = defaultRke2Setting?.value || defaultRke2Setting?.default;
+
+          if (!this.defaultVersion) {
+            hash.channels = this.$store.dispatch('management/request', { url: '/v1-rke2-release/channels' });
+          }
+        }
+        const res = await allHash(hash);
+
+        this.allVersions = res.versions?.data || [];
+        if (!this.defaultVersion) {
+          const channels = res.channels?.data || [];
+
+          this.defaultVersion = channels.find((x) => x.id === 'default')?.latest;
+        }
+
+        this.loadingVersions = false;
+      } catch (err) {
+        this.loadingVersions = false;
+        const errors = this.errors;
+
+        errors.push(this.t('imported.errors.kubernetesVersions', { e: err.error || err }));
+      }
+    },
+
+    kubernetesVersionChanged(val) {
+      if ( !this.isK3s ) {
+        this.normanCluster.rke2Config.kubernetesVersion = val;
+      } else {
+        this.normanCluster.k3sConfig.kubernetesVersion = val;
+      }
+    },
+    enableLocalClusterAuthEndpoint(neu) {
+      this.normanCluster.localClusterAuthEndpoint.enabled = neu;
+      if (!!neu) {
+        this.normanCluster.localClusterAuthEndpoint.caCerts = '';
+        this.normanCluster.localClusterAuthEndpoint.fqdn = '';
+      } else {
+        delete this.normanCluster.localClusterAuthEndpoint.caCerts;
+        delete this.normanCluster.localClusterAuthEndpoint.fqdn;
+      }
+    },
+  },
+
+});
+</script>
+
+<template>
+  <CruResource
+    :resource="value"
+    :mode="mode"
+    :can-yaml="false"
+    :done-route="doneRoute"
+    :errors="fvUnreportedValidationErrors"
+    :validation-passed="fvFormIsValid"
+    @error="e=>errors=e"
+    @finish="save"
+  >
+    <Loading
+      v-if="$fetchState.pending"
+      mode="relative"
+    />
+    <div v-else>
+      <div class="mt-10">
+        <div class="row mb-10">
+          <div class="col span-3">
+            <LabeledInput
+              v-model:value="normanCluster.name"
+              :mode="mode"
+              :disabled="true"
+              label-key="generic.name"
+              data-testid="imported-name"
+            />
+          </div>
+          <div
+            v-if="isLocal"
+            class="col span-3"
+          >
+            <LabeledInput
+              v-model:value="normanCluster.description"
+              :mode="mode"
+              label-key="nameNsDescription.description.label"
+              :placeholder="t('nameNsDescription.description.placeholder')"
+            />
+          </div>
+        </div>
+      </div>
+      <Accordion
+        v-if="showBasics"
+        :title="providerTabKey"
+        :open-initially="true"
+        class="mb-20"
+      >
+        <Basics
+          :value="normanCluster"
+          :mode="mode"
+          :config="config"
+          :upgrade-strategy="upgradeStrategy"
+          :versions="allVersions"
+          :default-version="defaultVersion"
+          :loading-versions="loadingVersions"
+          :rules="{workerConcurrency: fvGetAndReportPathRules('workerConcurrency'), controlPlaneConcurrency: fvGetAndReportPathRules('controlPlaneConcurrency') }"
+          @kubernetes-version-changed="kubernetesVersionChanged"
+          @drain-server-nodes-changed="(val)=>upgradeStrategy.drainServerNodes = val"
+          @drain-worker-nodes-changed="(val)=>upgradeStrategy.drainWorkerNodes = val"
+          @server-concurrency-changed="(val)=>upgradeStrategy.serverConcurrency = val"
+          @worker-concurrency-changed="(val)=>upgradeStrategy.workerConcurrency = val"
+        />
+      </Accordion>
+      <Accordion
+        class="mb-20"
+        title-key="imported.accordions.clusterMembers"
+        :open-initially="true"
+      >
+        <Banner
+          v-if="isEdit"
+          color="info"
+        >
+          {{ t('cluster.memberRoles.removeMessage') }}
+        </Banner>
+        <ClusterMembershipEditor
+          v-if="canManageMembers"
+          :mode="mode"
+          :parent-id="normanCluster.id ? normanCluster.id : null"
+          @membership-update="onMembershipUpdate"
+        />
+      </Accordion>
+      <Accordion
+        class="mb-20"
+        title-key="imported.accordions.labels"
+        :open-initially="true"
+      >
+        <Labels
+          v-model:value="normanCluster"
+          :mode="mode"
+        />
+      </Accordion>
+      <Accordion
+        class="mb-20"
+        title-key="imported.accordions.networking"
+        :open-initially="true"
+      >
+        <div
+          v-if="enableNetworkPolicySupported"
+          class="mb-20"
+        >
+          <Banner
+            v-if="!!normanCluster.enableNetworkPolicy"
+            color="info"
+            label-key="imported.network.banner"
+          />
+          <Checkbox
+            v-model:value="normanCluster.enableNetworkPolicy"
+            :mode="mode"
+            :label="t('cluster.rke2.enableNetworkPolicy.label')"
+          />
+        </div>
+        <h3 v-t="'cluster.tabs.ace'" />
+        <ACE
+          v-model:value="normanCluster.localClusterAuthEndpoint"
+          :mode="mode"
+          @local-cluster-auth-endpoint-changed="enableLocalClusterAuthEndpoint"
+          @ca-certs-changed="(val)=>normanCluster.localClusterAuthEndpoint.caCerts = val"
+          @fqdn-changed="(val)=>normanCluster.localClusterAuthEndpoint.fqdn = val"
+        />
+      </Accordion>
+      <Accordion
+        class="mb-20"
+        title-key="imported.accordions.advanced"
+        :open-initially="false"
+      >
+        <h3>
+          {{ t('imported.agentEnv.header') }}
+        </h3>
+        <KeyValue
+          v-model:value="normanCluster.agentEnvVars"
+          :mode="mode"
+          key-name="name"
+          :as-map="false"
+          :preserve-keys="['valueFrom']"
+          :supported="(row) => typeof row.valueFrom === 'undefined'"
+          :read-allowed="true"
+          :value-can-be-empty="true"
+          :key-label="t('cluster.agentEnvVars.keyLabel')"
+          :parse-lines-from-file="true"
+        />
+      </Accordion>
+    </div>
+  </CruResource>
+</template>
+
+<style lang="scss" scoped>
+</style>
diff --git a/pkg/imported/index.ts b/pkg/imported/index.ts
new file mode 100644
index 0000000000..0799c89ea4
--- /dev/null
+++ b/pkg/imported/index.ts
@@ -0,0 +1,16 @@
+import { importTypes } from '@rancher/auto-import';
+import { IPlugin } from '@shell/core/types';
+import { ImportedProvisioner, LocalProvisioner } from './provisioner';
+
+// Init the package
+export default function(plugin: IPlugin): void {
+  // Auto-import model, detail, edit from the folders
+  importTypes(plugin);
+
+  // Provide plugin metadata from package.json
+  plugin.metadata = require('./package.json');
+
+  // Register custom provisioner object
+  plugin.register('provisioner', ImportedProvisioner.ID, ImportedProvisioner);
+  plugin.register('provisioner', LocalProvisioner.ID, LocalProvisioner);
+}
diff --git a/pkg/imported/l10n/en-us.yaml b/pkg/imported/l10n/en-us.yaml
new file mode 100644
index 0000000000..86000f3dd5
--- /dev/null
+++ b/pkg/imported/l10n/en-us.yaml
@@ -0,0 +1,24 @@
+imported:
+  label: Imported
+  agentEnv:
+    header: Agent Environment Variables
+  drainWorkerNodes:
+    label: Drain Worker Nodes
+  drainControlPlaneNodes:
+    label: Drain Control Plane Nodes
+  network:
+    banner: The imported cluster must support Kubernetes NetworkPolicy resources for Project Network Isolation to be enforced
+  accordions:
+    advanced: Advanced
+    basics: Basics
+    upgrade: Upgrade Strategy
+    networking: Networking
+    clusterMembers: Cluster Members
+    labels: Labels and Annotations
+    k3sOptions: K3S Options
+    rke2Options: RKE2 Options
+  upgradeStrategy:
+    header: Upgrade Strategy
+  errors:
+    concurrency: '{key} must be an integer greater than 0'
+    kubernetesVersions: 'An error occured while fetching the available kubernetes versions: {e}'
diff --git a/pkg/imported/package.json b/pkg/imported/package.json
new file mode 100644
index 0000000000..01b8ebd7bc
--- /dev/null
+++ b/pkg/imported/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "imported",
+  "description": "Edit imported clusters in Rancher",
+  "version": "0.1.0",
+  "private": false,
+  "rancher": {
+    "annotations": {
+      "catalog.cattle.io/display-name": "Edit imported cluster"
+    }
+  },
+  "scripts": {
+    "dev": "./node_modules/.bin/nuxt dev",
+    "nuxt": "./node_modules/.bin/nuxt"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "@vue/cli-plugin-typescript": "~5.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
+}
diff --git a/pkg/imported/provisioner.ts b/pkg/imported/provisioner.ts
new file mode 100644
index 0000000000..75e4511473
--- /dev/null
+++ b/pkg/imported/provisioner.ts
@@ -0,0 +1,51 @@
+import { IClusterProvisioner } from '@shell/core/types';
+import CruImported from './components/CruImported.vue';
+import { Component } from 'vue';
+
+export class ImportedProvisioner implements IClusterProvisioner {
+  static ID = 'imported'
+
+  get id(): string {
+    return ImportedProvisioner.ID;
+  }
+
+  get component(): Component {
+    return CruImported;
+  }
+
+  get detailTabs(): any {
+    return {};
+  }
+
+  get hidden(): boolean {
+    return true;
+  }
+
+  get group(): string {
+    return 'kontainer';
+  }
+}
+
+export class LocalProvisioner implements IClusterProvisioner {
+    static ID = 'local'
+
+    get id(): string {
+      return LocalProvisioner.ID;
+    }
+
+    get component(): Component {
+      return CruImported;
+    }
+
+    get detailTabs(): any {
+      return {};
+    }
+
+    get hidden(): boolean {
+      return true;
+    }
+
+    get group(): string {
+      return 'kontainer';
+    }
+}
diff --git a/pkg/imported/tsconfig.json b/pkg/imported/tsconfig.json
new file mode 100644
index 0000000000..4d82003d02
--- /dev/null
+++ b/pkg/imported/tsconfig.json
@@ -0,0 +1,54 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "preserveSymlinks": true,
+    "typeRoots": [
+      "../../node_modules",
+      "../../shell/types",
+      "./types"
+    ],
+    "types": [
+      "node",
+      "webpack-env",
+      "@types/node",
+      "@types/jest",
+      "@types/lodash",
+      "rancher",
+      "shell"
+    ],
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
+    ],
+    "paths": {
+      "@shell/*": [
+        "../../shell/*"
+      ],
+      "@components/*": [
+        "@rancher/components/*"
+      ]
+    }
+  },
+  "include": [
+    "**/*.ts",
+    "**/*.d.ts",
+    "**/*.tsx",
+    "**/*.vue"
+  ],
+  "exclude": [
+    "../../node_modules"
+  ]
+}
diff --git a/pkg/imported/vue.config.js b/pkg/imported/vue.config.js
new file mode 100644
index 0000000000..d091d0a0fd
--- /dev/null
+++ b/pkg/imported/vue.config.js
@@ -0,0 +1 @@
+module.exports = require('./.shell/pkg/vue.config')(__dirname);
diff --git a/pkg/rancher-components/package.json b/pkg/rancher-components/package.json
index d02cf332f3..f5ad2078c5 100644
--- a/pkg/rancher-components/package.json
+++ b/pkg/rancher-components/package.json
@@ -36,7 +36,7 @@
     "babel-eslint": "10.1.0",
     "core-js": "3.40.0",
     "cron-validator": "1.3.1",
-    "cronstrue": "2.50.0",
+    "cronstrue": "2.53.0",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "5.2.0",
diff --git a/pkg/rancher-components/src/components/Accordion/Accordion.vue b/pkg/rancher-components/src/components/Accordion/Accordion.vue
index 1d192b61dc..8aff710964 100644
--- a/pkg/rancher-components/src/components/Accordion/Accordion.vue
+++ b/pkg/rancher-components/src/components/Accordion/Accordion.vue
@@ -47,12 +47,12 @@ export default defineComponent({
         data-testid="accordion-chevron"
       />
       <slot name="header">
-        <h4
+        <h2
           data-testid="accordion-title-slot-content"
           class="mb-0"
         >
           {{ titleKey ? t(titleKey) : title }}
-        </h4>
+        </h2>
       </slot>
     </div>
     <div
@@ -70,7 +70,7 @@ export default defineComponent({
   border: 1px solid var(--border)
 }
 .accordion-header {
-  padding: 5px;
+  padding: 16px 16px 16px 11px;
   display: flex;
   align-items: center;
   &>*{
@@ -81,6 +81,6 @@ export default defineComponent({
   }
 }
 .accordion-body {
-  padding: 10px;
+  padding: 0px 16px 16px;
 }
 </style>
diff --git a/pkg/rancher-components/src/components/BadgeState/BadgeState.vue b/pkg/rancher-components/src/components/BadgeState/BadgeState.vue
index d953a6cdad..2de9ea79bb 100644
--- a/pkg/rancher-components/src/components/BadgeState/BadgeState.vue
+++ b/pkg/rancher-components/src/components/BadgeState/BadgeState.vue
@@ -94,6 +94,13 @@ export default defineComponent({
       background: transparent;
       border-color: var(--success);
     }
+
+    // Added badge-disabled instead of bg-disabled since bg-disabled is used in other places with !important styling, an investigation is needed to make the naming consistent
+    &.badge-disabled {
+      color: var(--badge-state-disabled-text);
+      background-color: var( --badge-state-disabled-bg);
+      border: 1px solid var(--badge-state-disabled-border);
+    }
   }
 </style>
 <style lang="scss">
diff --git a/pkg/rancher-components/src/components/Card/Card.vue b/pkg/rancher-components/src/components/Card/Card.vue
index bb39c93bb0..f7e7790dd4 100644
--- a/pkg/rancher-components/src/components/Card/Card.vue
+++ b/pkg/rancher-components/src/components/Card/Card.vue
@@ -1,5 +1,6 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
+import { createFocusTrap, FocusTrap } from 'focus-trap';
 
 export default defineComponent({
   name:  'Card',
@@ -50,12 +51,37 @@ export default defineComponent({
       type:    Boolean,
       default: false,
     },
-  }
+    triggerFocusTrap: {
+      type:    Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return { focusTrapInstance: {} as FocusTrap };
+  },
+  mounted() {
+    if (this.triggerFocusTrap) {
+      this.focusTrapInstance = createFocusTrap(this.$refs.cardContainer as HTMLElement, {
+        escapeDeactivates: true,
+        allowOutsideClick: true,
+      });
+
+      this.$nextTick(() => {
+        this.focusTrapInstance.activate();
+      });
+    }
+  },
+  beforeUnmount() {
+    if (this.focusTrapInstance && this.triggerFocusTrap) {
+      this.focusTrapInstance.deactivate();
+    }
+  },
 });
 </script>
 
 <template>
   <div
+    ref="cardContainer"
     class="card-container"
     :class="{'highlight-border': showHighlightBorder, 'card-sticky': sticky}"
     data-testid="card"
diff --git a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
index 492471f64d..097d2c43e8 100644
--- a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
+++ b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
@@ -264,13 +264,15 @@ export default defineComponent({
           <template v-else-if="label">{{ label }}</template>
           <i
             v-if="tooltipKey"
-            v-clean-tooltip="t(tooltipKey)"
+            v-clean-tooltip="{content: t(tooltipKey), triggers: ['hover', 'touch', 'focus']}"
             class="checkbox-info icon icon-info icon-lg"
+            :tabindex="isDisabled ? -1 : 0"
           />
           <i
             v-else-if="tooltip"
-            v-clean-tooltip="tooltip"
+            v-clean-tooltip="{content: tooltip, triggers: ['hover', 'touch', 'focus']}"
             class="checkbox-info icon icon-info icon-lg"
+            :tabindex="isDisabled ? -1 : 0"
           />
         </slot>
       </span>
@@ -329,6 +331,11 @@ $fontColor: var(--input-label);
   .checkbox-info {
     line-height: normal;
     margin-left: 2px;
+
+    &:focus-visible {
+      @include focus-outline;
+      outline-offset: 2px;
+    }
   }
 
  .checkbox-custom {
diff --git a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.test.ts b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.test.ts
index 4846fdaa7e..e3e48943cb 100644
--- a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.test.ts
+++ b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.test.ts
@@ -20,7 +20,7 @@ describe('component: LabeledInput', () => {
     expect(wrapper.emitted('update:value')![0][0]).toBe(value);
   });
 
-  it('using mode "multiline" should emit input value correctly', () => {
+  it('using type "multiline" should emit input value correctly', () => {
     const value = 'any-string';
     const delay = 1;
     const wrapper = mount(LabeledInput, {
@@ -37,4 +37,21 @@ describe('component: LabeledInput', () => {
     expect(wrapper.emitted('update:value')).toHaveLength(1);
     expect(wrapper.emitted('update:value')![0][0]).toBe(value);
   });
+
+  describe('using type "chron"', () => {
+    it.each([
+      ['0 * * * *', 'Every hour, every day'],
+      ['@daily', 'At 12:00 AM, every day'],
+      ['You must fail! Go!', '%generic.invalidCron%'],
+    ])('passing value %p should display hint %p', (value, hint) => {
+      const wrapper = mount(LabeledInput, {
+        propsData: { value, type: 'cron' },
+        mocks:     { $store: { getters: { 'i18n/t': jest.fn() } } }
+      });
+
+      const subLabel = wrapper.find('[data-testid="sub-label"]');
+
+      expect(subLabel.text()).toBe(hint);
+    });
+  });
 });
diff --git a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
index 8c03ee1340..a05a648dcf 100644
--- a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
+++ b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
@@ -179,14 +179,28 @@ export default defineComponent({
       if (this.type !== 'cron' || !this.value) {
         return;
       }
+
+      // TODO - #13202: This is required due use of 2 libraries and 3 different libraries through the code.
+      const predefined = [
+        '@yearly',
+        '@annually',
+        '@monthly',
+        '@weekly',
+        '@daily',
+        '@midnight',
+        '@hourly'
+      ];
+      const isPredefined = predefined.includes(this.value as string);
+
       // refer https://github.com/GuillaumeRochat/cron-validator#readme
-      if (!isValidCron(this.value as string, {
+      if (!isPredefined && !isValidCron(this.value as string, {
         alias:              true,
         allowBlankDay:      true,
         allowSevenAsSunday: true,
       })) {
         return this.t('generic.invalidCron');
       }
+
       try {
         const hint = cronstrue.toString(this.value as string || '', { verbose: true });
 
@@ -382,6 +396,7 @@ export default defineComponent({
     <div
       v-if="cronHint || subLabel"
       class="sub-label"
+      data-testid="sub-label"
     >
       <div
         v-if="cronHint"
diff --git a/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue b/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue
index cda6af4116..e7c67d2e2f 100644
--- a/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue
+++ b/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue
@@ -243,14 +243,8 @@ $fontColor: var(--input-label);
     min-width: 14px;
     background-color: var(--input-bg);
     border-radius: 50%;
-    transition: all 0.3s ease-out;
     border: 1.5px solid var(--border);
     margin-top: 5px;
-
-    &:focus {
-      outline: none;
-      border-radius: 50%;
-    }
   }
 
   input {
diff --git a/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue b/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
index c9a1540117..3220d58d78 100644
--- a/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
+++ b/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
@@ -145,6 +145,9 @@ export default defineComponent({
      */
     isDisabled(): boolean {
       return (this.disabled || this.isView);
+    },
+    radioGroupLabel(): string {
+      return this.labelKey ? this.t(this.labelKey) : this.label ? this.label : '';
     }
   },
 
@@ -202,9 +205,10 @@ export default defineComponent({
 
     <!-- Group -->
     <div
+      role="radiogroup"
+      :aria-label="radioGroupLabel"
       class="radio-group"
       :class="{'row':row}"
-      tabindex="0"
       @keyup.down.stop="clickNext(1)"
       @keyup.up.stop="clickNext(-1)"
     >
diff --git a/shell/assets/styles/base/_basic.scss b/shell/assets/styles/base/_basic.scss
index c98413f363..24f75d32d9 100644
--- a/shell/assets/styles/base/_basic.scss
+++ b/shell/assets/styles/base/_basic.scss
@@ -62,12 +62,30 @@ INPUT,
 SELECT,
 TEXTAREA,
 .labeled-input,
-.labeled-select,
-.unlabeled-select,
-.checkbox-custom,
-.radio-custom {
+.checkbox-custom {
   &:focus, &.focused {
-    @include form-focus
+    @include form-focus;
+  }
+}
+
+.radio-custom,
+.labeled-select,
+.unlabeled-select {
+  &:focus-visible, &.focused {
+    @include focus-outline;
+  }
+}
+
+.labeled-select,
+.unlabeled-select {
+  &.focused {
+    border-color: var(--outline);
+  }
+}
+
+.unlabeled-select {
+  &:focus-visible, &.focused {
+    @include focus-outline;
   }
 }
 
diff --git a/shell/assets/styles/base/_mixins.scss b/shell/assets/styles/base/_mixins.scss
index 6e1496b302..f5a894728e 100755
--- a/shell/assets/styles/base/_mixins.scss
+++ b/shell/assets/styles/base/_mixins.scss
@@ -158,5 +158,6 @@
 
 @mixin focus-outline {
   // Focus for form like elements (not to be confused with basic :focus style)
+  // we need to use !important because it needs to superseed other classes that might impact outlines
   outline: 2px solid var(--primary-keyboard-focus);
 }
diff --git a/shell/assets/styles/global/_button.scss b/shell/assets/styles/global/_button.scss
index fd8528a273..d516dfc567 100644
--- a/shell/assets/styles/global/_button.scss
+++ b/shell/assets/styles/global/_button.scss
@@ -141,6 +141,11 @@ button,
     color: var(--link);
     box-shadow: none;
   }
+
+  &:focus-visible {
+    @include focus-outline;
+    outline-offset: 2px;
+  }
 }
 
 .role-multi-action {
@@ -185,6 +190,11 @@ fieldset[disabled] .btn {
       z-index: 1;
     }
 
+    &:focus-visible {
+      z-index: 1;
+      @include focus-outline;
+    }
+    
     &.active {
       @extend .bg-primary;
     }
diff --git a/shell/assets/styles/global/_form.scss b/shell/assets/styles/global/_form.scss
index ff65245fb2..8897e6f998 100644
--- a/shell/assets/styles/global/_form.scss
+++ b/shell/assets/styles/global/_form.scss
@@ -27,8 +27,8 @@ TEXTAREA,
 
   @include input-status-color;
 
-  &:focus, &.focused {
-    @include form-focus
+  &:focus:not(.unlabeled-select):not(.labeled-select), &.focused:not(.unlabeled-select):not(.labeled-select) {
+    @include form-focus;
   }
 
   LABEL {
diff --git a/shell/assets/styles/themes/_dark.scss b/shell/assets/styles/themes/_dark.scss
index 292ef641c6..e67fcde86b 100644
--- a/shell/assets/styles/themes/_dark.scss
+++ b/shell/assets/styles/themes/_dark.scss
@@ -219,4 +219,8 @@
 
   --product-icon               : #{$lighter};
   --product-icon-active        : #{$lightest};
+
+  --badge-state-disabled-text  : #{$desc-light};
+  --badge-state-disabled-bg    : #{$medium};
+  --badge-state-disabled-border: #{$lighter};
 }
diff --git a/shell/assets/styles/themes/_light.scss b/shell/assets/styles/themes/_light.scss
index 3b57757d84..c7b96141fb 100644
--- a/shell/assets/styles/themes/_light.scss
+++ b/shell/assets/styles/themes/_light.scss
@@ -544,4 +544,8 @@ BODY, .theme-light {
 
   --product-icon               : #{$darker};
   --product-icon-active        : #{$darkest};
+
+  --badge-state-disabled-text  : #{$darker};
+  --badge-state-disabled-bg    : #{$lighter};
+  --badge-state-disabled-border: #{$medium};
 }
diff --git a/shell/assets/styles/vendor/vue-select.scss b/shell/assets/styles/vendor/vue-select.scss
index 4dc95331e7..bda847b3a0 100644
--- a/shell/assets/styles/vendor/vue-select.scss
+++ b/shell/assets/styles/vendor/vue-select.scss
@@ -74,6 +74,10 @@
   color: var(--dropdown-text);
   white-space: nowrap;
   z-index: 1000;
+  overflow-y: auto;
+  // needs overflow-x hidden so that select for type of charts in cluster chart page
+  // doesn't show a horizontal scroll https://github.com/rancher/dashboard/pull/13139/files/9e6a8e64181de4525ad378d4d1b93c8efc2ed6d5#r1929296126
+  overflow-x: hidden;
 
   &:hover {
     cursor: pointer;
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 56f8bbcb8b..90e1befeda 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -9,6 +9,7 @@ generic:
   back: Back
   cancel: Cancel
   confirm: Confirm
+  colorPicker: Color picker
   clear: Clear
   clearAll: Clear All
   close: Close
@@ -134,6 +135,8 @@ nav:
     support: Support page link
     about: About page link
     pinCluster: Pin/Unpin cluster
+    collapseExpand: Collapse/Expand menu group
+    productAboutPage: Product about page link
   alt:
     mainMenuIcon: Main menu icon
     mainMenuRancherLogo: Main menu Rancher logo
@@ -514,6 +517,9 @@ authConfig:
     starttls:
       label: Start TLS
       tip: Upgrades non-encrypted connections by wrapping with TLS during the connection process. Can not be used in conjunction with TLS.
+    searchUsingServiceAccount: 
+      label: Enable Service Account Search
+      tip: When enabled, Rancher will use the service account instead of the user account to search for users and groups.
     tls: TLS
     userEnabledAttribute: User Enabled Attribute
     userMemberAttribute: User Member Attribute
@@ -933,6 +939,7 @@ catalog:
     experimentalWarning: '{chartName} has been marked as experimental. Use caution when installing this helm chart as it might not function as expected.'
     deprecatedAndExperimentalWarning: '{chartName} has been marked as deprecated and experimental. Use caution when installing this helm chart as it might be removed in the future and might not function as expected.'
   charts:
+    refresh: refresh charts
     all: All
     categories:
       all: All Categories
@@ -952,7 +959,7 @@ catalog:
       all: All Operating Systems
       linux: Linux
       windows: Windows
-    search: Filter
+    search: Filter charts results
     deprecatedChartsFilter:
       label: Show deprecated apps
   install:
@@ -963,7 +970,7 @@ catalog:
     chart: Chart
     warning:
       managed:
-        Warning, Rancher manages deployment and upgrade of the {name} app. Upgrading this app is not supported.<br>
+        Warning, {manager} manages deployment and upgrade of the {name} app. Upgrading this app is not supported.<br>
         {version, select,
           null { }
           other { Under most circumstances, no user intervention should be needed to ensure that the {version} version is compatible with the version of Rancher that you are running.}
@@ -1063,7 +1070,7 @@ catalog:
       windows: '{ver} (Windows-only)'
   delete:
     warning:
-      managed: Warning, Rancher manages deployment and upgrade of the {name} app. Deleting this app is not supported.
+      managed: Warning, {manager} manages deployment and upgrade of the {name} app. Deleting this app is not supported.
   operation:
     tableHeaders:
       action: Action
@@ -2076,6 +2083,7 @@ cluster:
       label: Control Plane Concurrency
       toolTip: "This can be either a fixed number of nodes (e.g. 1) at a time or a percentage (e.g. 10%)"
     workerConcurrency:
+      header: Worker Nodes
       label: Worker Concurrency
       toolTip: "This can be either a fixed number of nodes (e.g. 1) at a time or a percentage (e.g. 10%)"
     drain:
@@ -2111,6 +2119,7 @@ cluster:
       tlsSan:
         label: TLS Alternate Names
       fqdn:
+        label: FQDN
         toolTip: A FQDN which will resolve to the healthy control plane nodes of the cluster.
       caCerts:
         label: CA Certificates
@@ -2383,6 +2392,9 @@ fleet:
   cluster:
     summary: Resource Summary
     nonReady: Non-Ready Bundles
+    labels: Labels
+    hideLabels: Show less
+    showLabels: Show more
   clusters:
     harvester: |-
       There {count, plural,
@@ -6032,6 +6044,8 @@ validation:
   flowOutput:
     both: Requires "Output" or "Cluster Output" to be selected.
     global: Requires "Cluster Output" to be selected.
+  git:
+    repository: Repository URL must be a HTTP(s) or SSH url with no trailing spaces
   output:
     logdna:
       apiKey: Required an "Api Key" to be set.
@@ -6135,6 +6149,11 @@ validation:
       interval: '"{key}" must be of a format with digits followed by a unit i.e. 1h, 2m, 30s'
   tab: "One or more fields in this tab contain a form validation error"
 
+carousel:
+  previous: Previous
+  next: Next
+  controlItem: Go to slide nº {number}
+
 wizard:
   previous: Previous
   finish: Finish
@@ -6178,7 +6197,7 @@ wm:
   containerShell:
     clear: Clear
     containerName: "Container: {label}"
-    failed: "Unable to open a shell to the container (none of the shell commmands succeeded)\n\r"
+    failed: "Unable to open a shell to the container (none of the shell commands succeeded)\n\r"
     logLevel:
       info: INFO
       error: ERROR
@@ -6191,6 +6210,11 @@ wm:
     title: "Kubectl: {name}"
 
 workload:
+  scaleWorkloads: Scale workloads
+  healthWorkloads: Jobs/Pods health status
+  healthScaleToggle: Toggle/Expand workloads scaling/health
+  plus: Scale up workload
+  minus: Scale down workload
   container:
     command:
       addEnvVar: Add Variable
@@ -7434,6 +7458,8 @@ registryConfig:
 ##############################
 
 advancedSettings:
+  setEnv: Set by Environment Variable
+  hideShow: Hide/show setting
   label: Settings
   subtext: Typical users will not need to change these. Proceed with caution, incorrect values can break your {appName} installation. Settings which have been customized from default settings are tagged 'Modified'.
   show: Show
diff --git a/shell/components/ButtonGroup.vue b/shell/components/ButtonGroup.vue
index 0408c97fc1..f2c86238cf 100644
--- a/shell/components/ButtonGroup.vue
+++ b/shell/components/ButtonGroup.vue
@@ -82,6 +82,8 @@ export default {
       type="button"
       :class="opt.class"
       :disabled="disabled || opt.disabled"
+      role="button"
+      :aria-label="opt.labelKey ? t(opt.labelKey) : opt.label"
       @click="change(opt.value)"
     >
       <slot
diff --git a/shell/components/ButtonMultiAction.vue b/shell/components/ButtonMultiAction.vue
index c9992fa400..4924e8410b 100644
--- a/shell/components/ButtonMultiAction.vue
+++ b/shell/components/ButtonMultiAction.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, defineEmits } from 'vue';
+import { computed } from 'vue';
 
 defineEmits(['click']);
 
diff --git a/shell/components/Carousel.vue b/shell/components/Carousel.vue
index bf747200a7..123c0e1217 100644
--- a/shell/components/Carousel.vue
+++ b/shell/components/Carousel.vue
@@ -195,6 +195,36 @@ export default {
         </div>
       </component>
     </div>
+    <div
+      ref="prev"
+      role="button"
+      class="prev"
+      :aria-label="t('carousel.previous')"
+      :aria-disabled="sliders.length === 1"
+      :class="{'disable': sliders.length === 1}"
+      tabindex="0"
+      @click="nextPrev('prev')"
+      @keyup.enter.space="nextPrev('prev')"
+    >
+      <i
+        class="icon icon-chevron-left icon-4x"
+      />
+    </div>
+    <div
+      ref="next"
+      role="button"
+      class="next"
+      :aria-label="t('carousel.next')"
+      :aria-disabled="sliders.length === 1"
+      :class="{'disable': sliders.length === 1}"
+      tabindex="0"
+      @click="nextPrev('next')"
+      @keyup.enter.space="nextPrev('next')"
+    >
+      <i
+        class="icon icon-chevron-right icon-4x"
+      />
+    </div>
     <div
       class="controls"
       :class="{'disable': sliders.length === 1}"
@@ -204,25 +234,13 @@ export default {
         :key="i"
         class="control-item"
         :class="{'active': activeItemId === i}"
+        role="button"
+        tabindex="0"
+        :aria-label="t('carousel.controlItem', { number: i+1 })"
         @click="scrollSlide(i, slider.length)"
+        @keyup.enter.space="scrollSlide(i, slider.length)"
       />
     </div>
-    <div
-      ref="prev"
-      class="prev"
-      :class="{'disable': sliders.length === 1}"
-      @click="nextPrev('prev')"
-    >
-      <i class="icon icon-chevron-left icon-4x" />
-    </div>
-    <div
-      ref="next"
-      class="next"
-      :class="{'disable': sliders.length === 1}"
-      @click="nextPrev('next')"
-    >
-      <i class="icon icon-chevron-right icon-4x" />
-    </div>
   </div>
 </template>
 
@@ -240,20 +258,6 @@ export default {
   &.disable::after {
     display: none;
   }
-
-  &.disable:hover {
-    .prev,
-    .next {
-      display: none;
-    }
-  }
-
-  &:hover {
-    .prev,
-    .next {
-      display: block;
-    }
-  }
 }
 
 .slide-track {
@@ -367,13 +371,16 @@ export default {
   position: absolute;
   z-index: 20;
   top: 90px;
-  display: none;
   cursor: pointer;
 
   &.disabled .icon {
     color: var(--disabled-bg);
     cursor: not-allowed;
   }
+
+  .icon:focus-visible {
+    @include focus-outline;
+  }
 }
 
 .next {
diff --git a/shell/components/LocaleSelector.vue b/shell/components/LocaleSelector.vue
index 3a310b61ea..1dcd5c065f 100644
--- a/shell/components/LocaleSelector.vue
+++ b/shell/components/LocaleSelector.vue
@@ -11,6 +11,10 @@ export default {
     mode: {
       type:    String,
       default: ''
+    },
+    showIcon: {
+      type:    Boolean,
+      default: true
     }
   },
 
@@ -89,7 +93,10 @@ export default {
             class="locale-chooser"
           >
             {{ selectedLocaleLabel }}
-            <i class="icon icon-fw icon-sort-down" />
+            <i
+              v-if="showIcon"
+              class="icon icon-fw icon-sort-down"
+            />
           </a>
           <template #popper>
             <ul
diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index db4dce7767..237a3b6230 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -2,13 +2,6 @@
 import { defineComponent } from 'vue';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
-import { StorePaginationResult } from '@shell/types/store/pagination.types';
-
-export type FetchSecondaryResourcesOpts = { canPaginate: boolean }
-export type FetchSecondaryResources = (opts: FetchSecondaryResourcesOpts) => Promise<any>
-
-export type FetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
-export type FetchPageSecondaryResources = (opts: FetchPageSecondaryResourcesOpts) => Promise<any>
 
 /**
  * This is meant to enable ResourceList like capabilities outside of List pages / components
@@ -57,6 +50,8 @@ export default defineComponent({
      * Information may be required from resources other than the primary one shown per row
      *
      * This will fetch them ALL and will be run in a non-server-side pagination world
+     *
+     * of type PagTableFetchSecondaryResources
      */
     fetchSecondaryResources: {
       type:    Function,
@@ -69,6 +64,8 @@ export default defineComponent({
      * This will fetch only those relevant to the current page using server-side pagination based filters
      *
      * called from shell/mixins/resource-fetch-api-pagination.js
+     *
+     * of type PagTableFetchPageSecondaryResources
      */
     fetchPageSecondaryResources: {
       type:    Function,
diff --git a/shell/components/ProgressBarMulti.vue b/shell/components/ProgressBarMulti.vue
index 29557589f2..b8e330997d 100644
--- a/shell/components/ProgressBarMulti.vue
+++ b/shell/components/ProgressBarMulti.vue
@@ -90,6 +90,19 @@ export default {
 
       return out.filter((obj) => obj.percent);
     },
+    ariaLabelText() {
+      if (Array.isArray(this.values) && this.values.length) {
+        let ariaLabel = '';
+
+        this.values.forEach((val) => {
+          ariaLabel += `${ val.value } ${ val.value === 1 ? 'item' : 'items' } ${ val.label }`;
+        });
+
+        return ariaLabel;
+      }
+
+      return '';
+    }
   }
 };
 
@@ -108,6 +121,7 @@ function toPercent(value, min, max) {
   <div
     v-trim-whitespace
     :class="{progress: true, multi: pieces.length > 1}"
+    :aria-label="ariaLabelText"
   >
     <div
       v-for="(piece, idx) of pieces"
diff --git a/shell/components/Questions/Reference.vue b/shell/components/Questions/Reference.vue
index aefd3dc3ff..8fdf2cd440 100644
--- a/shell/components/Questions/Reference.vue
+++ b/shell/components/Questions/Reference.vue
@@ -1,7 +1,8 @@
 <script>
 import { LabeledInput } from '@components/Form/LabeledInput';
-import LabeledSelect from '@shell/components/form/LabeledSelect';
-import { filterBy } from '@shell/utils/array';
+import ResourceLabeledSelect from '@shell/components/form/ResourceLabeledSelect.vue';
+import { PaginationParamFilter } from '@shell/types/store/pagination.types';
+
 import { PVC, STORAGE_CLASS } from '@shell/config/types';
 import Question from './Question';
 
@@ -14,7 +15,7 @@ const LEGACY_MAP = {
 export default {
   emits: ['update:value'],
 
-  components: { LabeledInput, LabeledSelect },
+  components: { LabeledInput, ResourceLabeledSelect },
   mixins:     [Question],
 
   props: {
@@ -29,12 +30,6 @@ export default {
     },
   },
 
-  async fetch() {
-    if ( this.typeSchema ) {
-      this.all = await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.typeName });
-    }
-  },
-
   data() {
     const t = this.question.type;
 
@@ -57,29 +52,61 @@ export default {
     return {
       typeName,
       typeSchema,
-      all: [],
+      all:                 [],
+      allResourceSettings: {
+        updateResources: (all) => {
+          // Filter to only include required namespaced resources
+          const resources = this.isNamespaced ? all.filter((r) => r.metadata.namespace === this.targetNamespace) : all;
+
+          return this.mapResourcesToOptions(resources);
+        }
+      },
+      paginateResourceSetting: {
+        updateResources: (resources) => {
+          return this.mapResourcesToOptions(resources);
+        },
+        /**
+          * of type PaginateTypeOverridesFn
+          * @param [LabelSelectPaginationFunctionOptions] opts
+          * @returns LabelSelectPaginationFunctionOptions
+         */
+        requestSettings: (opts) => {
+          // Filter to only include required namespaced resources
+          const filters = this.isNamespaced ? [
+            PaginationParamFilter.createSingleField({ field: 'metadata.namespace', value: this.targetNamespace }),
+          ] : [];
+
+          return {
+            ...opts,
+            filters,
+            groupByNamespace: false,
+            classify:         true,
+          };
+        }
+      },
     };
   },
 
+  methods: {
+    mapResourcesToOptions(resources) {
+      return resources.map((r) => {
+        if (r.id) {
+          return {
+            label: r.nameDisplay || r.metadata.name,
+            value: r.metadata.name
+          };
+        } else {
+          return r;
+        }
+      });
+    },
+
+  },
+
   computed: {
     isNamespaced() {
       return !!this.typeSchema?.attributes?.namespaced;
     },
-
-    options() {
-      let out = this.all;
-
-      if ( this.isNamespaced ) {
-        out = filterBy(this.all, 'metadata.namespace', this.targetNamespace);
-      }
-
-      return out.map((x) => {
-        return {
-          label: x.nameDisplay || x.metadata.name,
-          value: x.metadata.name
-        };
-      });
-    }
   },
 };
 </script>
@@ -90,15 +117,17 @@ export default {
     class="row"
   >
     <div class="col span-6">
-      <LabeledSelect
-        :mode="mode"
-        :options="options"
+      <ResourceLabeledSelect
+        :resource-type="typeName"
+        :in-store="inStore"
         :disabled="$fetchState.pending || disabled"
         :label="displayLabel"
         :placeholder="question.description"
         :required="question.required"
         :value="value"
         :tooltip="displayTooltip"
+        :paginated-resource-settings="paginateResourceSetting"
+        :all-resources-settings="allResourceSettings"
         @update:value="!$fetchState.pending && $emit('update:value', $event)"
       />
     </div>
diff --git a/shell/components/RelatedWorkloadsTable.vue b/shell/components/RelatedWorkloadsTable.vue
deleted file mode 100644
index 846a958fcd..0000000000
--- a/shell/components/RelatedWorkloadsTable.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<script>
-import {
-  STATE, NAME, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, TYPE, AGE
-} from '@shell/config/table-headers';
-import { WORKLOAD_TYPES } from '@shell/config/types';
-import ResourceTable from '@shell/components/ResourceTable';
-
-export default {
-  components: { ResourceTable },
-  props:      {
-    filter: {
-      type:     Function,
-      required: true
-    }
-  },
-  async fetch() {
-    // Enumerating instead of using Object.values() because it looks like we don't want to include replica sets for this.
-    const types = [
-      WORKLOAD_TYPES.DEPLOYMENT,
-      WORKLOAD_TYPES.CRON_JOB,
-      WORKLOAD_TYPES.DAEMON_SET,
-      WORKLOAD_TYPES.JOB,
-      WORKLOAD_TYPES.STATEFUL_SET
-    ];
-    const allWorkloadsNested = await Promise.all(types.map((type) => this.$store.dispatch('cluster/findAll', { type })));
-    const allWorkloads = allWorkloadsNested.flat();
-
-    this.relatedWorkloadRows = allWorkloads.filter(this.filter);
-  },
-  data() {
-    const relatedWorkloadHeaders = [STATE, NAME, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, TYPE, AGE];
-
-    return {
-      relatedWorkloadRows: [],
-      relatedWorkloadHeaders,
-      schema:              this.$store.getters['cluster/schemaFor'](WORKLOAD_TYPES.DEPLOYMENT)
-    };
-  },
-};
-</script>
-
-<template>
-  <div>
-    <ResourceTable
-      :schema="schema"
-      :rows="relatedWorkloadRows"
-      :headers="relatedWorkloadHeaders"
-    />
-  </div>
-</template>
diff --git a/shell/components/ResourceDetail/Masthead.vue b/shell/components/ResourceDetail/Masthead.vue
index b92f853fe2..3af09393eb 100644
--- a/shell/components/ResourceDetail/Masthead.vue
+++ b/shell/components/ResourceDetail/Masthead.vue
@@ -443,6 +443,9 @@ export default {
             <router-link
               v-if="location"
               :to="location"
+              role="link"
+              class="masthead-resource-list-link"
+              :aria-label="parent.displayName"
             >
               {{ parent.displayName }}:
             </router-link>
@@ -584,10 +587,10 @@ export default {
   }
 
   HEADER {
-    margin: 0;
+    margin: 0 0 0 -5px;
 
     .title {
-      overflow: hidden;
+      overflow-x: hidden;
     }
   }
 
@@ -598,7 +601,7 @@ export default {
 
     h1 {
       margin: 0;
-      overflow: hidden;
+      overflow-x: hidden;
       display: flex;
       flex-direction: row;
       align-items: center;
@@ -606,9 +609,13 @@ export default {
       .masthead-resource-title {
         padding: 0 8px;
         text-overflow: ellipsis;
-        overflow: hidden;
+        overflow-x: hidden;
         white-space: nowrap;
       }
+
+      .masthead-resource-list-link {
+        margin: 5px;
+      }
     }
   }
 
diff --git a/shell/components/SelectIconGrid.vue b/shell/components/SelectIconGrid.vue
index ce27066993..85f1549650 100644
--- a/shell/components/SelectIconGrid.vue
+++ b/shell/components/SelectIconGrid.vue
@@ -104,6 +104,10 @@ export default {
       :is="asLink ? 'a' : 'div'"
       v-for="(r, idx) in rows"
       :key="get(r, keyField)"
+      :role="asLink ? 'link' : null"
+      :aria-disabled="asLink && get(r, disabledField) === true ? true : null"
+      :aria-label="get(r, nameField)"
+      :tabindex="get(r, disabledField) === true ? -1 : 0"
       :href="asLink ? get(r, linkField) : null"
       :target="get(r, targetField)"
       :rel="rel"
@@ -111,9 +115,12 @@ export default {
       :data-testid="componentTestid + '-' + get(r, nameField)"
       :class="{
         'has-description': !!get(r, descriptionField),
-        'has-side-label': !!get(r, sideLabelField), [colorFor(r, idx)]: true, disabled: get(r, disabledField) === true
+        'has-side-label': !!get(r, sideLabelField),
+        [colorFor(r, idx)]: true,
+        disabled: get(r, disabledField) === true
       }"
       @click="select(r, idx)"
+      @keyup.enter.space="select(r, idx)"
     >
       <div
         class="side-label"
@@ -212,6 +219,10 @@ export default {
       text-decoration: none !important;
       color: $color;
 
+      &:focus-visible {
+        @include focus-outline;
+      }
+
       &:hover:not(.disabled) {
         box-shadow: 0 0 30px var(--shadow);
         transition: box-shadow 0.1s ease-in-out;
diff --git a/shell/components/SideNav.vue b/shell/components/SideNav.vue
index c16590957e..af08242722 100644
--- a/shell/components/SideNav.vue
+++ b/shell/components/SideNav.vue
@@ -19,10 +19,11 @@ import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { TYPE_MODES } from '@shell/store/type-map';
 import { NAME as NAVLINKS } from '@shell/config/product/navlinks';
 import Group from '@shell/components/nav/Group';
+import LocaleSelector from '@shell/components/LocaleSelector';
 
 export default {
   name:       'SideNav',
-  components: { Group },
+  components: { Group, LocaleSelector },
   data() {
     return {
       groups:        [],
@@ -112,9 +113,7 @@ export default {
   computed: {
     ...mapState(['managementReady', 'clusterReady']),
     ...mapGetters(['isStandaloneHarvester', 'productId', 'clusterId', 'currentProduct', 'rootProduct', 'isSingleProduct', 'namespaceMode', 'isExplorer', 'isVirtualCluster']),
-    ...mapGetters({
-      locale: 'i18n/selectedLocaleLabel', availableLocales: 'i18n/availableLocales', hasMultipleLocales: 'i18n/hasMultipleLocales'
-    }),
+    ...mapGetters({ locale: 'i18n/selectedLocaleLabel', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
     ...mapGetters('type-map', ['activeProducts']),
 
     favoriteTypes: mapPref(FAVORITE_TYPES),
@@ -360,10 +359,6 @@ export default {
       });
     },
 
-    switchLocale(locale) {
-      this.$store.dispatch('i18n/switchTo', locale);
-    },
-
     syncNav() {
       const refs = this.$refs.groups;
 
@@ -427,6 +422,8 @@ export default {
       <router-link
         :to="supportLink"
         class="pull-right"
+        role="link"
+        :aria-label="t('nav.support', {hasSupport: true})"
       >
         {{ t('nav.support', {hasSupport: true}) }}
       </router-link>
@@ -439,36 +436,11 @@ export default {
       </span>
 
       <!-- locale selector -->
-      <span v-if="isSingleProduct && hasMultipleLocales && !isStandaloneHarvester">
-        <v-dropdown
-          popperClass="localeSelector"
-          placement="top"
-          :triggers="['click']"
-        >
-          <a
-            data-testid="locale-selector"
-            class="locale-chooser"
-          >
-            {{ locale }}
-          </a>
-
-          <template #popper>
-            <ul
-              class="list-unstyled dropdown"
-              style="margin: -1px;"
-            >
-              <li
-                v-for="(label, name) in availableLocales"
-                :key="name"
-                class="hand"
-                @click="switchLocale(name)"
-              >
-                {{ label }}
-              </li>
-            </ul>
-          </template>
-        </v-dropdown>
-      </span>
+      <LocaleSelector
+        v-if="isSingleProduct && hasMultipleLocales && !isStandaloneHarvester"
+        mode="login"
+        :show-icon="false"
+      />
     </div>
     <!-- SideNav footer alternative -->
     <div
@@ -478,6 +450,8 @@ export default {
       <router-link
         v-if="singleProductAbout"
         :to="singleProductAbout"
+        role="link"
+        :aria-label="t('nav.ariaLabel.productAboutPage')"
       >
         {{ displayVersion }}
       </router-link>
diff --git a/shell/components/Tabbed/index.vue b/shell/components/Tabbed/index.vue
index 7c3a5be5de..25eb101fe3 100644
--- a/shell/components/Tabbed/index.vue
+++ b/shell/components/Tabbed/index.vue
@@ -258,7 +258,6 @@ export default {
       role="tablist"
       class="tabs"
       :class="{'clearfix':!sideTabs, 'vertical': sideTabs, 'horizontal': !sideTabs}"
-      tabindex="0"
       data-testid="tabbed-block"
       @keydown.right.prevent="selectNext(1)"
       @keydown.left.prevent="selectNext(-1)"
@@ -277,8 +276,12 @@ export default {
           :data-testid="`btn-${tab.name}`"
           :aria-controls="'#' + tab.name"
           :aria-selected="tab.active"
+          :aria-label="tab.labelDisplay"
           role="tab"
+          tabindex="0"
           @click.prevent="select(tab.name, $event)"
+          @keyup.enter="select(tab.name, $event)"
+          @keyup.space="select(tab.name, $event)"
         >
           <span>{{ tab.labelDisplay }}</span>
           <span
@@ -403,6 +406,14 @@ export default {
           text-decoration: underline;
         }
       }
+
+      &:focus-visible {
+        @include focus-outline;
+
+        span {
+          text-decoration: underline;
+        }
+      }
     }
 
     .conditions-alert-icon {
diff --git a/shell/components/auth/Principal.vue b/shell/components/auth/Principal.vue
index 0af226c4ce..dc5becb885 100644
--- a/shell/components/auth/Principal.vue
+++ b/shell/components/auth/Principal.vue
@@ -85,9 +85,11 @@ export default {
         class="name"
       >
         <table>
-          <tr><td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td></tr>
-          <tr><td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td></tr>
-          <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+          <tbody>
+            <tr><td>{{ t('principal.name') }}: </td><td>{{ principal.name || principal.loginName }}</td></tr>
+            <tr><td>{{ t('principal.loginName') }}: </td><td>{{ principal.loginName }}</td></tr>
+            <tr><td>{{ t('principal.type') }}: </td><td>{{ principal.displayType }}</td></tr>
+          </tbody>
         </table>
       </div>
       <template v-else>
diff --git a/shell/components/fleet/FleetClusters.vue b/shell/components/fleet/FleetClusters.vue
index 00d7d3097b..7d96c4f4e1 100644
--- a/shell/components/fleet/FleetClusters.vue
+++ b/shell/components/fleet/FleetClusters.vue
@@ -1,10 +1,11 @@
 <script>
 import ResourceTable from '@shell/components/ResourceTable';
+import Tag from '@shell/components/Tag.vue';
 import { STATE, NAME, AGE, FLEET_SUMMARY } from '@shell/config/table-headers';
 import { FLEET, MANAGEMENT } from '@shell/config/types';
 
 export default {
-  components: { ResourceTable },
+  components: { ResourceTable, Tag },
 
   props: {
     rows: {
@@ -75,6 +76,12 @@ export default {
         pluralLabel:   this.$store.getters['type-map/labelFor'](schema, 99),
       };
     },
+  },
+
+  methods: {
+    toggleCustomLabels(row) {
+      row['displayCustomLabels'] = !row.displayCustomLabels;
+    }
   }
 };
 </script>
@@ -85,6 +92,7 @@ export default {
     :schema="schema"
     :headers="headers"
     :rows="rows"
+    :sub-rows="true"
     :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     key-field="_key"
@@ -123,5 +131,78 @@ export default {
         :class="{'text-error': !row.bundleInfo.total}"
       >{{ row.bundleInfo.total }}</span>
     </template>
+
+    <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">
+      <tr
+        class="labels-row sub-row"
+        @mouseenter="onRowMouseEnter"
+        @mouseleave="onRowMouseLeave"
+      >
+        <template v-if="row.customLabels.length">
+          <td>&nbsp;</td>
+          <td>&nbsp;</td>
+          <td :colspan="fullColspan-2">
+            <span
+              v-if="row.customLabels.length"
+              class="mt-5"
+            > {{ t('fleet.cluster.labels') }}:
+              <span
+                v-for="(label, i) in row.customLabels"
+                :key="i"
+                class="mt-5 labels"
+              >
+                <Tag
+                  v-if="i < 7"
+                  class="mr-5 label"
+                >
+                  {{ label }}
+                </Tag>
+                <Tag
+                  v-else-if="i > 6 && row.displayCustomLabels"
+                  class="mr-5 label"
+                >
+                  {{ label }}
+                </Tag>
+              </span>
+              <a
+                v-if="row.customLabels.length > 7"
+                href="#"
+                @click.prevent="toggleCustomLabels(row)"
+              >
+                {{ t(`fleet.cluster.${row.displayCustomLabels? 'hideLabels' : 'showLabels'}`) }}
+              </a>
+            </span>
+          </td>
+        </template>
+        <td
+          v-else
+          :colspan="fullColspan"
+        >
+&nbsp;
+        </td>
+      </tr>
+    </template>
   </ResourceTable>
 </template>
+
+<style lang='scss' scoped>
+  .labels-row {
+    td {
+      padding-top:0;
+      .tag {
+        margin-right: 5px;
+        display: inline-block;
+        margin-top: 2px;
+      }
+    }
+  }
+  .labels {
+    display: inline;
+    flex-wrap: wrap;
+
+    .label {
+      display: inline-block;
+      margin-top: 2px;
+    }
+  }
+</style>
diff --git a/shell/components/fleet/FleetRepos.vue b/shell/components/fleet/FleetRepos.vue
index 4fed19ad5f..8ab7dd209d 100644
--- a/shell/components/fleet/FleetRepos.vue
+++ b/shell/components/fleet/FleetRepos.vue
@@ -6,17 +6,15 @@ import FleetIntro from '@shell/components/fleet/FleetIntro';
 
 import {
   AGE,
-  STATE,
-  NAME,
-  FLEET_SUMMARY,
   FLEET_REPO,
-  FLEET_REPO_TARGET,
-  FLEET_REPO_CLUSTERS_READY,
   FLEET_REPO_CLUSTER_SUMMARY,
-  FLEET_REPO_PER_CLUSTER_STATE
-
+  FLEET_REPO_CLUSTERS_READY,
+  FLEET_REPO_PER_CLUSTER_STATE,
+  FLEET_REPO_TARGET,
+  FLEET_SUMMARY,
+  NAME,
+  STATE,
 } from '@shell/config/table-headers';
-import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 
 // i18n-ignore repoDisplay
 export default {
@@ -77,31 +75,18 @@ export default {
 
     headers() {
       // Cluster summary is only shown in the cluster view
-      const fleetClusterSummary = {
+      const summary = this.isClusterView ? [{
         ...FLEET_REPO_CLUSTER_SUMMARY,
-        formatterOpts: {
-          // Fleet uses labels to identify clusters
-          clusterLabel: this.clusterId
-        },
-      };
+        formatterOpts: { clusterId: this.clusterId },
+      }] : [FLEET_REPO_CLUSTERS_READY, FLEET_SUMMARY];
 
       // if hasPerClusterState then use the repo state
-      const fleetPerClusterState = {
+      const state = this.isClusterView ? {
         ...FLEET_REPO_PER_CLUSTER_STATE,
-        value: (row) => {
-          const statePerCluster = row.clusterResourceStatus?.find((c) => {
-            return c.clusterLabel === this.clusterId;
-          });
+        value: (repo) => repo.clusterState(this.clusterId),
+      } : STATE;
 
-          return statePerCluster ? statePerCluster?.status?.displayStatus : STATES_ENUM.ACTIVE;
-        },
-      };
-
-      const summary = this.isClusterView ? [fleetClusterSummary] : [FLEET_REPO_CLUSTERS_READY, FLEET_SUMMARY];
-
-      const state = this.isClusterView ? fleetPerClusterState : STATE;
-
-      const out = [
+      return [
         state,
         NAME,
         FLEET_REPO,
@@ -109,8 +94,6 @@ export default {
         ...summary,
         AGE
       ];
-
-      return out;
     },
   },
   methods: {
diff --git a/shell/components/form/ColorInput.vue b/shell/components/form/ColorInput.vue
index eccbeaba75..ea2dad2bb2 100644
--- a/shell/components/form/ColorInput.vue
+++ b/shell/components/form/ColorInput.vue
@@ -73,7 +73,21 @@ export default {
   mounted() {
     // Ensures that if the default value is used, the model is updated with it
     this.$emit('update:value', this.inputValue);
-  }
+  },
+
+  methods: {
+    handleKeyup(ev) {
+      if (this.isDisabled) {
+        return '';
+      }
+
+      return this.$refs.input.click(ev);
+    }
+  },
+
+  // according to https://www.w3.org/TR/html-aria/
+  // input type="color" has no applicable role
+  // and only aria-label and aria-disabled
 };
 </script>
 
@@ -82,6 +96,8 @@ export default {
     class="color-input"
     :class="{[mode]:mode, disabled: isDisabled}"
     :data-testid="componentTestid + '-color-input'"
+    :tabindex="isDisabled ? -1 : 0"
+    @keyup.enter.space.stop="handleKeyup($event)"
   >
     <label class="text-label"><t
       v-if="labelKey"
@@ -99,8 +115,11 @@ export default {
       >
         <input
           ref="input"
+          :aria-disabled="isDisabled ? 'true' : 'false'"
+          :aria-label="t('generic.colorPicker')"
           type="color"
           :disabled="isDisabled"
+          tabindex="-1"
           :value="inputValue"
           @input="$emit('update:value', $event.target.value)"
         >
@@ -116,6 +135,10 @@ export default {
   border-radius: var(--border-radius);
   padding: 10px;
 
+  &:focus-visible {
+    @include focus-outline;
+  }
+
   &.disabled, &.disabled .selected, &[disabled], &[disabled]:hover {
     color: var(--input-disabled-text);
     background-color: var(--input-disabled-bg);
diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
index 30698c086b..ee836c11a4 100644
--- a/shell/components/form/KeyValue.vue
+++ b/shell/components/form/KeyValue.vue
@@ -798,7 +798,7 @@ export default {
           v-if="addAllowed"
           type="button"
           class="btn role-tertiary add"
-          data-testid="add_link_button"
+          data-testid="add_row_item_button"
           :disabled="loading || disabled || (keyOptions && filteredKeyOptions.length === 0)"
           @click="add()"
         >
diff --git a/shell/components/form/LabeledSelect.vue b/shell/components/form/LabeledSelect.vue
index a0594fe9c3..edfadf55a9 100644
--- a/shell/components/form/LabeledSelect.vue
+++ b/shell/components/form/LabeledSelect.vue
@@ -154,11 +154,22 @@ export default {
   methods: {
     // resizeHandler = in mixin
     focusSearch() {
-      const blurredAgo = Date.now() - this.blurred;
+      // we need this override as in a "closeOnSelect" type of component
+      // if we don't have this override, it would open again
+      if (this.overridesMixinPreventDoubleTriggerKeysOpen) {
+        this.$nextTick(() => {
+          const el = this.$refs['select'];
+
+          if ( el ) {
+            el.focus();
+          }
+
+          this.overridesMixinPreventDoubleTriggerKeysOpen = false;
+        });
 
-      if (!this.focused && blurredAgo < 250) {
         return;
       }
+      this.$refs['select-input'].open = true;
 
       this.$nextTick(() => {
         const el = this.$refs['select-input']?.searchEl;
@@ -278,8 +289,9 @@ export default {
         'no-label': !hasLabel
       }
     ]"
+    :tabindex="isView || disabled ? -1 : 0"
     @click="focusSearch"
-    @focus="focusSearch"
+    @keyup.enter.space.down="focusSearch"
   >
     <div
       :class="{ 'labeled-container': true, raised, empty, [mode]: true }"
@@ -319,7 +331,7 @@ export default {
       :selectable="selectable"
       :modelValue="value != null && !loading ? value : ''"
       :dropdown-should-open="dropdownShouldOpen"
-
+      :tabindex="-1"
       @update:modelValue="$emit('selecting', $event); $emit('update:value', $event)"
       @search:blur="onBlur"
       @search:focus="onFocus"
@@ -384,7 +396,7 @@ export default {
 
       <template #list-footer>
         <div
-          v-if="canPaginate && totalResults"
+          v-if="canPaginate && totalResults && pages > 1"
           class="pagination-slot"
         >
           <div class="load-more">
diff --git a/shell/components/form/PlusMinus.vue b/shell/components/form/PlusMinus.vue
index 35dae95928..1dcf3d2c41 100644
--- a/shell/components/form/PlusMinus.vue
+++ b/shell/components/form/PlusMinus.vue
@@ -54,11 +54,17 @@ export default {
     <button
       v-clean-tooltip="minusTooltip"
       :disabled="disabled || !canMinus"
+      :aria-disabled="disabled || !canMinus"
       type="button"
+      role="button"
+      :aria-label="t('workload.plus')"
       class="btn btn-sm role-secondary"
       @click="$emit('minus')"
     >
-      <i class="icon icon-sm icon-minus" />
+      <i
+        class="icon icon-sm icon-minus"
+        :alt="t('workload.plus')"
+      />
     </button>
     <div class="value">
       {{ value }}
@@ -66,11 +72,17 @@ export default {
     <button
       v-clean-tooltip="plusTooltip"
       :disabled="disabled || !canPlus"
+      :aria-disabled="disabled || !canPlus"
       type="button"
+      role="button"
+      :aria-label="t('workload.minus')"
       class="btn btn-sm role-secondary"
       @click="$emit('plus')"
     >
-      <i class="icon icon-sm icon-plus" />
+      <i
+        class="icon icon-sm icon-plus"
+        :alt="t('workload.minus')"
+      />
     </button>
   </div>
 </template>
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index 3326a99279..f6ebe7ed39 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -3,53 +3,8 @@ import { PropType, defineComponent } from 'vue';
 import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
 import { PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { labelSelectPaginationFunction, LabelSelectPaginationFunctionOptions } from '@shell/components/form/labeled-select-utils/labeled-select.utils';
-import { LabelSelectPaginateFn, LabelSelectPaginateFnOptions, LabelSelectPaginateFnResponse } from '@shell/types/components/labeledSelect';
-
-type PaginateTypeOverridesFn = (opts: LabelSelectPaginationFunctionOptions) => LabelSelectPaginationFunctionOptions;
-
-interface SharedSettings {
-  /**
-   * Provide specific LabelSelect options for this mode (paginated / not paginated)
-   */
-  labelSelectOptions?: { [key: string]: any },
-  /**
-   * Map the resources shown in LabelSelect
-   */
-  mapResult?: (resources: any[]) => any[]
-}
-
-/**
- * Settings to use when the LabelSelect is paginating
- */
-export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
-  /**
-   * Override the convience function which fetches a page of results
-   */
-  overrideRequest?: LabelSelectPaginateFn,
-  /**
-   * Override the default settings used in the convenience function to fetch a page of results
-   */
-  requestSettings?: PaginateTypeOverridesFn,
-}
-
-/**
- * Settings to use when the LabelSelect is fetching all resources (not paginating)
- */
-export type ResourceLabeledSelectSettings = SharedSettings
-
-/**
- * Force a specific mode
- */
-export enum RESOURCE_LABEL_SELECT_MODE {
-  /**
-   * Fetch all resources
-   */
-  ALL_RESOURCES = 'ALL', // eslint-disable-line no-unused-vars
-  /**
-   * Determine if all resources are fetched given system settings
-   */
-  DYNAMIC = 'DYNAMIC', // eslint-disable-line no-unused-vars
-}
+import { LabelSelectPaginateFnOptions, LabelSelectPaginateFnResponse } from '@shell/types/components/labeledSelect';
+import { RESOURCE_LABEL_SELECT_MODE, ResourceLabeledSelectPaginateSettings, ResourceLabeledSelectSettings } from '@shell/types/components/resourceLabeledSelect';
 
 /**
  * Convenience  wrapper around the LabelSelect component to support pagination
@@ -66,6 +21,8 @@ export default defineComponent({
 
   components: { LabeledSelect },
 
+  emits: ['update:value'],
+
   props: {
     /**
      * Resource to show
@@ -89,7 +46,7 @@ export default defineComponent({
     },
 
     /**
-     * Specific settings to use when we're showing all results
+     * Specific settings to use when we're showing all results in the drop down
      */
     allResourcesSettings: {
       type:    Object as PropType<ResourceLabeledSelectSettings>,
@@ -97,7 +54,7 @@ export default defineComponent({
     },
 
     /**
-     * Specific settings to use when we're showing paginated results
+     * Specific settings to use when we're showing paginated results in the drop down
      */
     paginatedResourceSettings: {
       type:    Object as PropType<ResourceLabeledSelectPaginateSettings>,
@@ -120,6 +77,7 @@ export default defineComponent({
     }
 
     if (!this.paginate) {
+      // The resource won't be paginated and component expects everything up front
       await this.$store.dispatch(`${ this.inStore }/findAll`, { type: this.resourceType });
     }
   },
@@ -148,13 +106,14 @@ export default defineComponent({
 
       const all = this.$store.getters[`${ this.inStore }/all`](this.resourceType);
 
-      return this.allResourcesSettings?.mapResult ? this.allResourcesSettings.mapResult(all) : all;
+      return this.allResourcesSettings?.updateResources ? this.allResourcesSettings.updateResources(all) : all;
     }
   },
 
   methods: {
     /**
-     * Typeof LabelSelectPaginateFn
+     * Make the request to fetch the resource given the state of the label select (filter, page, page size, etc see LabelSelectPaginateFn)
+     * opts: Typeof LabelSelectPaginateFn
      */
     async paginateType(opts: LabelSelectPaginateFnOptions): Promise<LabelSelectPaginateFnResponse> {
       if (this.paginatedResourceSettings?.overrideRequest) {
@@ -175,9 +134,9 @@ export default defineComponent({
       const options = this.paginatedResourceSettings?.requestSettings ? this.paginatedResourceSettings.requestSettings(defaultOptions) : defaultOptions;
       const res = await labelSelectPaginationFunction(options);
 
-      return this.paginatedResourceSettings?.mapResult ? {
+      return this.paginatedResourceSettings?.updateResources ? {
         ...res,
-        page: this.paginatedResourceSettings.mapResult(res.page)
+        page: this.paginatedResourceSettings.updateResources(res.page)
       } : res;
     },
   },
@@ -190,5 +149,6 @@ export default defineComponent({
     :loading="$fetchState.pending"
     :options="allOfType"
     :paginate="paginateType"
+    @update:value="$emit('update:value', $event)"
   />
 </template>
diff --git a/shell/components/form/ResourceSelector.vue b/shell/components/form/ResourceSelector.vue
index 78ab9ec674..2a50136ec2 100644
--- a/shell/components/form/ResourceSelector.vue
+++ b/shell/components/form/ResourceSelector.vue
@@ -36,6 +36,7 @@ export default {
   },
 
   async fetch() {
+    // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
     const hash = await allHash({ allResources: this.$store.dispatch('cluster/findAll', { type: this.type }) });
 
     this.allResources = hash.allResources;
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index b8f469c6b9..e80d5344a0 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -8,10 +8,14 @@ import Tab from '@shell/components/Tabbed/Tab';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Conditions from '@shell/components/form/Conditions';
 import { EVENT } from '@shell/config/types';
-import SortableTable from '@shell/components/SortableTable';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { _VIEW } from '@shell/config/query-params';
 import RelatedResources from '@shell/components/RelatedResources';
 import { isConditionReadyAndWaiting } from '@shell/plugins/dashboard-store/resource-class';
+import { PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { MESSAGE, REASON } from '@shell/config/table-headers';
+import { STEVE_EVENT_LAST_SEEN, STEVE_EVENT_TYPE, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
+import { headerFromSchemaColString } from '@shell/store/type-map.utils';
 
 export default {
 
@@ -21,7 +25,7 @@ export default {
     Tabbed,
     Tab,
     Conditions,
-    SortableTable,
+    PaginatedResourceTable,
     RelatedResources,
   },
 
@@ -69,14 +73,25 @@ export default {
 
   data() {
     const inStore = this.$store.getters['currentStore'](EVENT);
+    const eventSchema = this.$store.getters[`${ inStore }/schemaFor`](EVENT); // @TODO be smarter about which resources actually ever have events
 
     return {
-      hasEvents:      this.$store.getters[`${ inStore }/schemaFor`](EVENT), // @TODO be smarter about which resources actually ever have events
-      allEvents:      [],
-      selectedTab:    this.defaultTab,
-      didLoadEvents:  false,
+      eventSchema,
+      EVENT,
+      selectedTab:       this.defaultTab,
       inStore,
-      showConditions: false,
+      showConditions:    false,
+      paginationHeaders: [
+        STEVE_EVENT_LAST_SEEN,
+        STEVE_EVENT_TYPE,
+        REASON,
+        headerFromSchemaColString('Subobject', eventSchema, this.$store.getters, true),
+        headerFromSchemaColString('Source', eventSchema, this.$store.getters, true),
+        MESSAGE,
+        headerFromSchemaColString('First Seen', eventSchema, this.$store.getters, true),
+        headerFromSchemaColString('Count', eventSchema, this.$store.getters, true),
+        STEVE_NAME_COL,
+      ]
     };
   },
 
@@ -92,7 +107,7 @@ export default {
 
   computed: {
     showEvents() {
-      return this.isView && this.needEvents && this.hasEvents;
+      return this.isView && this.needEvents && this.eventSchema;
     },
     showRelated() {
       return this.isView && this.needRelated;
@@ -128,18 +143,6 @@ export default {
         },
       ];
     },
-    events() {
-      return this.allEvents.filter((event) => {
-        return event.involvedObject?.uid === this.value?.metadata?.uid;
-      }).map((event) => {
-        return {
-          reason:    (`${ event.reason || this.t('generic.unknown') }${ event.count > 1 ? ` (${ event.count })` : '' }`).trim(),
-          message:   event.message || this.t('generic.unknown'),
-          date:      event.lastTimestamp || event.firstTimestamp || event.metadata.creationTimestamp,
-          eventType: event.eventType
-        };
-      });
-    },
     conditionsHaveIssues() {
       if (this.showConditions) {
         return this.value.status?.conditions?.filter((cond) => !isConditionReadyAndWaiting(cond)).some((cond) => cond.error);
@@ -153,15 +156,6 @@ export default {
     // Ensures we only fetch events and show the table when the events tab has been activated
     tabChange(neu) {
       this.selectedTab = neu?.selectedName;
-
-      if (!this.didLoadEvents && this.selectedTab === 'events') {
-        const inStore = this.$store.getters['currentStore'](EVENT);
-
-        this.$store.dispatch(`${ inStore }/findAll`, { type: EVENT }).then((events) => {
-          this.allEvents = events;
-          this.didLoadEvents = true;
-        });
-      }
     },
 
     /**
@@ -180,6 +174,54 @@ export default {
         this.showConditions = this.$store.getters[`${ this.inStore }/pathExistsInSchema`](this.value.type, 'status.conditions');
       }
     },
+
+    /**
+     * Filter out hidden repos from list of all repos
+     */
+    filterEventsLocal(rows) {
+      return rows.filter((event) => event.involvedObject?.uid === this.value?.metadata?.uid);
+    },
+
+    /**
+     * Filter out hidden repos via api
+     *
+     * pagination: PaginationArgs
+     * returns: PaginationArgs
+     */
+    filterEventsApi(pagination) {
+      if (!pagination.filters) {
+        pagination.filters = [];
+      }
+
+      const field = `involvedObject.uid`; // Pending API Support - https://github.com/rancher/rancher/issues/48603
+
+      // of type PaginationParamFilter
+      let existing = null;
+
+      for (let i = 0; i < pagination.filters.length; i++) {
+        const filter = pagination.filters[i];
+
+        if (!!filter.fields.find((f) => f.field === field)) {
+          existing = filter;
+          break;
+        }
+      }
+
+      const required = PaginationParamFilter.createSingleField({
+        field,
+        exact:  true,
+        value:  this.value.metadata.uid,
+        equals: true
+      });
+
+      if (!!existing) {
+        Object.assign(existing, required);
+      } else {
+        pagination.filters.push(required);
+      }
+
+      return pagination;
+    }
   }
 };
 </script>
@@ -208,15 +250,16 @@ export default {
       name="events"
       :weight="-2"
     >
-      <SortableTable
+      <!-- namespaced: false given we don't want the default handling of namespaced resource (apply header filter)  -->
+      <PaginatedResourceTable
         v-if="selectedTab === 'events'"
-        :rows="events"
+        :schema="eventSchema"
+        :local-filter="filterEventsLocal"
+        :api-filter="filterEventsApi"
+        :use-query-params-for-simple-filtering="false"
         :headers="eventHeaders"
-        key-field="id"
-        :search="false"
-        :table-actions="false"
-        :row-actions="false"
-        default-sort-by="date"
+        :paginationHeaders="paginationHeaders"
+        :namespaced="false"
       />
     </Tab>
 
diff --git a/shell/components/form/SecretSelector.vue b/shell/components/form/SecretSelector.vue
index 4b491db872..7f164582f7 100644
--- a/shell/components/form/SecretSelector.vue
+++ b/shell/components/form/SecretSelector.vue
@@ -70,7 +70,7 @@ export default {
       secrets:            null,
       SECRET,
       allSecretsSettings: {
-        mapResult: (secrets) => {
+        updateResources: (secrets) => {
           const allSecretsInNamespace = secrets.filter((secret) => this.types.includes(secret._type) && secret.namespace === this.namespace);
           const mappedSecrets = this.mapSecrets(allSecretsInNamespace.sort((a, b) => a.name.localeCompare(b.name)));
 
@@ -81,7 +81,7 @@ export default {
       },
       paginateSecretsSetting: {
         requestSettings: this.paginatePageOptions,
-        mapResult:       (secrets) => {
+        updateResources: (secrets) => {
           const mappedSecrets = this.mapSecrets(secrets);
 
           this.secrets = secrets; // We need the key from the selected secret. When paginating we won't touch the store, so just pass back here
diff --git a/shell/components/form/Select.vue b/shell/components/form/Select.vue
index 2f0d3734db..e5e68fc9cb 100644
--- a/shell/components/form/Select.vue
+++ b/shell/components/form/Select.vue
@@ -114,11 +114,24 @@ export default {
       calculatePosition(dropdownList, component, width, this.placement);
     },
 
-    focus() {
-      this.focusSearch();
-    },
-
     focusSearch() {
+      // we need this override as in a "closeOnSelect" type of component
+      // if we don't have this override, it would open again
+      if (this.overridesMixinPreventDoubleTriggerKeysOpen) {
+        this.$nextTick(() => {
+          const el = this.$refs['select'];
+
+          if ( el ) {
+            el.focus();
+          }
+
+          this.overridesMixinPreventDoubleTriggerKeysOpen = false;
+        });
+
+        return;
+      }
+      this.$refs['select-input'].open = true;
+
       this.$nextTick(() => {
         const el = this.$refs['select-input']?.searchEl;
 
@@ -176,6 +189,11 @@ export default {
     },
     report(e) {
       alert(e);
+    },
+    handleDropdownOpen(args) {
+      // function that prevents the "opening dropdown on focus"
+      // default behaviour of v-select
+      return args.noDrop || args.disabled ? false : args.open;
     }
   },
   computed: {
@@ -227,7 +245,7 @@ export default {
     ref="select"
     class="unlabeled-select"
     :class="{
-      disabled: disabled && !isView,
+      disabled: disabled || isView,
       focused,
       [mode]: true,
       [status]: status,
@@ -236,7 +254,9 @@ export default {
       'compact-input': compact,
       [$attrs.class]: $attrs.class
     }"
-    @focus="focusSearch"
+    :tabindex="disabled || isView ? -1 : 0"
+    @click="focusSearch"
+    @keyup.enter.space.down="focusSearch"
   >
     <v-select
       ref="select-input"
@@ -258,6 +278,8 @@ export default {
       :searchable="isSearchable"
       :selectable="selectable"
       :modelValue="value != null ? value : ''"
+      :dropdownShouldOpen="handleDropdownOpen"
+      :tabindex="-1"
 
       @update:modelValue="$emit('update:value', $event)"
       @search:blur="onBlur"
diff --git a/shell/components/form/__tests__/KeyValue.test.ts b/shell/components/form/__tests__/KeyValue.test.ts
index 5489d39500..11bcd78feb 100644
--- a/shell/components/form/__tests__/KeyValue.test.ts
+++ b/shell/components/form/__tests__/KeyValue.test.ts
@@ -127,7 +127,7 @@ describe('component: KeyValue', () => {
     expect(secondKeyInput.exists()).toBe(false);
     expect(secondValueInput.exists()).toBe(false);
 
-    const addButton = wrapper.find('[data-testid="add_link_button"]');
+    const addButton = wrapper.find('[data-testid="add_row_item_button"]');
 
     addButton.trigger('click');
     await nextTick();
diff --git a/shell/components/formatter/FleetClusterSummaryGraph.vue b/shell/components/formatter/FleetClusterSummaryGraph.vue
index 7fc03cbbd2..ba5ea1a654 100644
--- a/shell/components/formatter/FleetClusterSummaryGraph.vue
+++ b/shell/components/formatter/FleetClusterSummaryGraph.vue
@@ -11,7 +11,7 @@ export default {
       required: true
     },
 
-    clusterLabel: {
+    clusterId: {
       type:     String,
       required: true
     }
@@ -22,6 +22,6 @@ export default {
 <template>
   <FleetSummaryGraph
     :row="row"
-    :clusterLabel="clusterLabel"
+    :clusterId="clusterId"
   />
 </template>
diff --git a/shell/components/formatter/FleetSummaryGraph.vue b/shell/components/formatter/FleetSummaryGraph.vue
index 58d3b571d2..f6dd595b93 100644
--- a/shell/components/formatter/FleetSummaryGraph.vue
+++ b/shell/components/formatter/FleetSummaryGraph.vue
@@ -14,7 +14,7 @@ export default {
       required: true
     },
 
-    clusterLabel: {
+    clusterId: {
       type:     String,
       required: false,
       default:  null,
@@ -23,10 +23,8 @@ export default {
 
   computed: {
     summary() {
-      if (this.clusterLabel) {
-        return this.row.clusterResourceStatus.find((x) => {
-          return x.clusterLabel === this.clusterLabel;
-        })?.status.resourceCounts || {};
+      if (this.clusterId) {
+        return this.row.statusResourceCountsForCluster(this.clusterId);
       }
 
       return this.row.status?.resourceCounts || {};
@@ -37,7 +35,8 @@ export default {
     },
 
     stateParts() {
-      const keys = Object.keys(this.summary).filter((x) => !x.startsWith('desired'));
+      const summary = this.summary;
+      const keys = Object.keys(summary).filter((x) => !x.startsWith('desired'));
 
       const out = keys.map((key) => {
         const textColor = colorForState(key);
@@ -46,7 +45,7 @@ export default {
           label: ucFirst(key),
           color: textColor.replace(/text-/, 'bg-'),
           textColor,
-          value: this.summary[key],
+          value: summary[key],
           sort:  stateSort(textColor, key),
         };
       }).filter((x) => x.value > 0);
diff --git a/shell/components/formatter/WorkloadHealthScale.vue b/shell/components/formatter/WorkloadHealthScale.vue
index 7adcc0dbe0..afd0a939db 100644
--- a/shell/components/formatter/WorkloadHealthScale.vue
+++ b/shell/components/formatter/WorkloadHealthScale.vue
@@ -182,14 +182,21 @@ export default {
     <div
       id="trigger"
       class="hs-popover__trigger"
+      aria-role="button"
+      tabindex="0"
       :class="{expanded}"
+      :aria-roledescription="t('workload.scaleWorkloads')"
+      :aria-label="t('workload.healthScaleToggle')"
+      :aria-expanded="expanded"
       @click="expanded = !expanded"
+      @keyup.enter.space="expanded = !expanded"
     >
       <ProgressBarMulti
         v-if="parts"
         class="health"
         :values="parts"
         :show-zeros="true"
+        :aria-describedby="t('workload.healthWorkloads')"
       />
       <i :class="{icon: true, 'icon-chevron-up': expanded, 'icon-chevron-down': !expanded}" />
     </div>
diff --git a/shell/components/nav/Group.vue b/shell/components/nav/Group.vue
index 3e52d8fdd7..f6dd437f09 100644
--- a/shell/components/nav/Group.vue
+++ b/shell/components/nav/Group.vue
@@ -211,26 +211,40 @@ export default {
       v-if="showHeader"
       class="header"
       :class="{'active': isOverview, 'noHover': !canCollapse}"
+      role="button"
+      tabindex="0"
+      :aria-label="group.labelDisplay || group.label || ''"
       @click="groupSelected()"
+      @keyup.enter="groupSelected()"
+      @keyup.space="groupSelected()"
     >
       <slot name="header">
         <router-link
           v-if="hasOverview"
           :to="group.children[0].route"
           :exact="group.children[0].exact"
+          :tabindex="-1"
         >
-          <h6 v-clean-html="group.labelDisplay || group.label" />
+          <h6>
+            <span v-clean-html="group.labelDisplay || group.label" />
+          </h6>
         </router-link>
         <h6
           v-else
-          v-clean-html="group.labelDisplay || group.label"
-        />
+        >
+          <span v-clean-html="group.labelDisplay || group.label" />
+        </h6>
       </slot>
       <i
         v-if="!onlyHasOverview && canCollapse"
-        class="icon toggle"
+        class="icon toggle toggle-accordion"
         :class="{'icon-chevron-right': !isExpanded, 'icon-chevron-down': isExpanded}"
+        role="button"
+        tabindex="0"
+        :aria-label="t('nav.ariaLabel.collapseExpand')"
         @click="peek($event, true)"
+        @keyup.enter="peek($event, true)"
+        @keyup.space="peek($event, true)"
       />
     </div>
     <ul
@@ -288,6 +302,7 @@ export default {
     cursor: pointer;
     color: var(--body-text);
     height: 33px;
+    outline: none;
 
     H6 {
       color: var(--body-text);
@@ -315,6 +330,17 @@ export default {
 
   .accordion {
     .header {
+      &:focus-visible {
+        h6 span {
+          @include focus-outline;
+          outline-offset: 2px;
+        }
+      }
+      .toggle-accordion:focus-visible {
+        @include focus-outline;
+        outline-offset: -6px;
+      }
+
       &.active {
         color: var(--primary-hover-text);
         background-color: var(--primary-hover-bg);
diff --git a/shell/components/nav/Type.vue b/shell/components/nav/Type.vue
index 7437b88c03..8499834fe6 100644
--- a/shell/components/nav/Type.vue
+++ b/shell/components/nav/Type.vue
@@ -118,7 +118,10 @@ export default {
         {{ type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label) }}
       </TabTitle>
       <a
+        role="link"
+        :aria-label="type.labelKey ? t(type.labelKey) : (type.labelDisplay || type.label)"
         :href="href"
+        class="type-link"
         @click="selectType(); navigate($event);"
         @mouseenter="setNear(true)"
         @mouseleave="setNear(false)"
@@ -161,9 +164,11 @@ export default {
     data-testid="link-type"
   >
     <a
+      role="link"
       :href="type.link"
       :target="type.target"
       rel="noopener noreferrer nofollow"
+      :aria-label="type.label"
     >
       <span class="label">{{ type.label }}&nbsp;<i class="icon icon-external-link" /></span>
     </a>
@@ -178,6 +183,16 @@ export default {
     margin-right: 4px;
   }
 
+  .type-link:focus-visible span.label {
+    @include focus-outline;
+    outline-offset: 2px;
+  }
+
+  .nav-link a:focus-visible .label {
+    @include focus-outline;
+    outline-offset: 2px;
+  }
+
   .child {
     margin: 0 var(--outline) 0 0;
 
diff --git a/shell/config/labels-annotations.js b/shell/config/labels-annotations.js
index 425f1cc401..6b9ac1ab19 100644
--- a/shell/config/labels-annotations.js
+++ b/shell/config/labels-annotations.js
@@ -112,6 +112,8 @@ export const FLEET = {
   CLUSTER_DISPLAY_NAME: 'management.cattle.io/cluster-display-name',
   CLUSTER_NAME:         'management.cattle.io/cluster-name',
   BUNDLE_ID:            'fleet.cattle.io/bundle-id',
+  BUNDLE_NAME:          'fleet.cattle.io/bundle-name',
+  BUNDLE_NAMESPACE:     'fleet.cattle.io/bundle-namespace',
   MANAGED:              'fleet.cattle.io/managed',
   CLUSTER_NAMESPACE:    'fleet.cattle.io/cluster-namespace',
   CLUSTER:              'fleet.cattle.io/cluster'
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index 6ae3cce8bd..5691e288ee 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -1,5 +1,7 @@
 import {
-  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT
+  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
+  EVENT_LAST_SEEN_TIME,
+  EVENT_TYPE
 } from '@shell/config/table-headers';
 
 // This file contains table headers
@@ -52,6 +54,18 @@ export const STEVE_EVENT_OBJECT = {
   search: 'involvedObject.kind',
 };
 
+export const STEVE_EVENT_LAST_SEEN = {
+  ...EVENT_LAST_SEEN_TIME,
+  value: 'metadata.fields.0',
+  sort:  'metadata.fields.0',
+};
+
+export const STEVE_EVENT_TYPE = {
+  ...EVENT_TYPE,
+  value: '_type',
+  sort:  '_type',
+};
+
 export const STEVE_LIST_GROUPS = [{
   tooltipKey: 'resourceTable.groupBy.none',
   icon:       'icon-list-flat',
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index e92087b93b..237adfc979 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -20,12 +20,13 @@ import {
   STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE,
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
-  DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA
+  DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
+  EVENT_LAST_SEEN_TIME
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_EVENT_OBJECT, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_LAST_SEEN, STEVE_EVENT_OBJECT, STEVE_EVENT_TYPE, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
@@ -321,23 +322,12 @@ export function init(store) {
     ]
   );
 
-  const eventLastSeenTime = {
-    ...LAST_SEEN_TIME,
-    defaultSort: true,
-  };
-
   headers(EVENT,
-    [STATE, eventLastSeenTime, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
+    [STATE, EVENT_LAST_SEEN_TIME, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
     [
-      STEVE_STATE_COL, {
-        ...eventLastSeenTime,
-        value: 'metadata.fields.0',
-        sort:  'metadata.fields.0',
-      }, {
-        ...EVENT_TYPE,
-        value: '_type',
-        sort:  '_type',
-      },
+      STEVE_STATE_COL,
+      STEVE_EVENT_LAST_SEEN,
+      STEVE_EVENT_TYPE,
       REASON,
       STEVE_EVENT_OBJECT,
       'Subobject',
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index e06b0b7474..f754d81f5c 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -515,6 +515,12 @@ export const LAST_SEEN_TIME = {
   sort:     'lastTimestamp:desc',
   tooltip:  'tableHeaders.lastSeenTooltip'
 };
+
+export const EVENT_LAST_SEEN_TIME = {
+  ...LAST_SEEN_TIME,
+  defaultSort: true,
+};
+
 export const LAST_HEARTBEAT_TIME = {
   name:      'lastHeartbeatTime',
   labelKey:  'tableHeaders.lastSeen',
diff --git a/shell/core/plugin.ts b/shell/core/plugin.ts
index a1e27da1a0..faafad8c47 100644
--- a/shell/core/plugin.ts
+++ b/shell/core/plugin.ts
@@ -13,11 +13,18 @@ import {
   LocationConfig,
   ExtensionPoint,
   TabLocation,
+  ModelExtensionConstructor,
   PluginRouteRecordRaw, RegisterStore, UnregisterStore, CoreStoreSpecifics, CoreStoreConfig, OnNavToPackage, OnNavAwayFromPackage, OnLogOut
 } from './types';
 import coreStore, { coreStoreModule, coreStoreState } from '@shell/plugins/dashboard-store';
 import { defineAsyncComponent, markRaw, Component } from 'vue';
 
+// Registration IDs used for different extension points in the extensions catalog
+export const EXT_IDS = {
+  MODELS:          'models',
+  MODEL_EXTENSION: 'model-extension',
+};
+
 export type ProductFunction = (plugin: IPlugin, store: any) => void;
 
 export class Plugin implements IPlugin {
@@ -25,6 +32,7 @@ export class Plugin implements IPlugin {
   public name: string;
   public types: any = {};
   public l10n: { [key: string]: Function[] } = {};
+  public modelExtensions: { [key: string]: Function[] } = {};
   public locales: { locale: string, label: string}[] = [];
   public products: ProductFunction[] = [];
   public productNames: string[] = [];
@@ -186,6 +194,17 @@ export class Plugin implements IPlugin {
     this._addUIConfig(ExtensionPoint.CARD, where, when, this._createAsyncComponent(card));
   }
 
+  /**
+   * Adds a model extension
+   * @experimental May change or be removed in the future
+   *
+   * @param type Model type
+   * @param clz  Class for the model extension (constructor)
+   */
+  addModelExtension(type: string, clz: ModelExtensionConstructor): void {
+    this.register(EXT_IDS.MODEL_EXTENSION, type, clz);
+  }
+
   /**
    * Wraps a component from an extensionConfig with defineAsyncComponent and
    * markRaw. This prepares the component to be loaded dynamically and prevents
@@ -317,10 +336,18 @@ export class Plugin implements IPlugin {
       }
 
       this.l10n[name].push(fn);
+
+    // Accumulate model extensions
+    } else if (type === EXT_IDS.MODEL_EXTENSION) {
+      if (!this.modelExtensions[name]) {
+        this.modelExtensions[name] = [];
+      }
+      this.modelExtensions[name].push(fn);
     } else {
       if (!this.types[type]) {
         this.types[type] = {};
       }
+
       this.types[type][name] = fn;
     }
   }
diff --git a/shell/core/plugins.js b/shell/core/plugins.js
index 6dfa825966..3f23c15c8e 100644
--- a/shell/core/plugins.js
+++ b/shell/core/plugins.js
@@ -1,12 +1,10 @@
 import { productsLoaded } from '@shell/store/type-map';
 import { clearModelCache } from '@shell/plugins/dashboard-store/model-loader';
-import { Plugin } from './plugin';
+import { EXT_IDS, Plugin } from './plugin';
 import { PluginRoutes } from './plugin-routes';
 import { UI_PLUGIN_BASE_URL } from '@shell/config/uiplugins';
 import { ExtensionPoint } from './types';
 
-const MODEL_TYPE = 'models';
-
 export default function(context, inject, vueApp) {
   const {
     app, store, $axios, redirect
@@ -26,6 +24,21 @@ export default function(context, inject, vueApp) {
     uiConfig[ExtensionPoint[ep]] = {};
   }
 
+  /**
+   * When an extension adds a model extension, it provides the class - we will instantiate that class and store and use that
+   */
+  function instantiateModelExtension($plugin, clz) {
+    const context = {
+      dispatch: store.dispatch,
+      getters:  store.getters,
+      t:        store.getters['i18n/t'],
+      $axios,
+      $plugin,
+    };
+
+    return new clz(context);
+  }
+
   inject(
     'plugin',
     {
@@ -78,72 +91,49 @@ export default function(context, inject, vueApp) {
           element.id = id;
           element.dataset.purpose = 'extension';
 
-          // id is `<product>-<version>`.
-          const oldPlugin = Object.values(plugins).find((p) => id.startsWith(p.name));
+          element.onload = () => {
+            if (!window[id] || (typeof window[id].default !== 'function')) {
+              return reject(new Error('Could not load plugin code'));
+            }
 
-          let removed = Promise.resolve();
+            // Update the timestamp that new plugins were loaded - may be needed
+            // to update caches when new plugins are loaded
+            _lastLoaded = new Date().getTime();
 
-          if (oldPlugin) {
-          // Uninstall existing plugin if there is one. This ensures that last loaded plugin is not always used
-          // (nav harv1-->harv2-->harv1 and harv2 would be shown)
-            removed = this.removePlugin(oldPlugin.name).then(() => {
-              delete window[oldPlugin.id];
+            // name is the name of the plugin, including the version number
+            const plugin = new Plugin(id);
 
-              delete plugins[oldPlugin.id];
+            plugins[id] = plugin;
 
-              const oldElement = document.getElementById(oldPlugin.id);
-
-              oldElement.parentElement.removeChild(oldElement);
-            });
-          }
-
-          removed.then(() => {
-            element.onload = () => {
-              if (!window[id]) {
-                return reject(new Error('Could not load plugin code'));
-              }
-
-              // Update the timestamp that new plugins were loaded - may be needed
-              // to update caches when new plugins are loaded
-              _lastLoaded = new Date().getTime();
-
-              // name is the name of the plugin, including the version number
-              const plugin = new Plugin(id);
-
-              plugins[id] = plugin;
-
-              // Initialize the plugin
+            // Initialize the plugin
+            try {
               window[id].default(plugin, this.internal());
+            } catch (e) {
+              delete plugins[id];
 
-              // Uninstall existing plugin if there is one
-              this.removePlugin(plugin.name); // Removing this causes the plugin to not load on refresh
+              return reject(new Error('Could not initialize plugin'));
+            }
 
-              // Load all of the types etc from the plugin
-              this.applyPlugin(plugin);
+            // Load all of the types etc from the plugin
+            this.applyPlugin(plugin);
 
-              // Add the plugin to the store
-              store.dispatch('uiplugins/addPlugin', plugin);
+            // Add the plugin to the store
+            store.dispatch('uiplugins/addPlugin', plugin);
 
-              resolve();
-            };
+            resolve();
+          };
 
-            element.onerror = (e) => {
-              element.parentElement.removeChild(element);
+          element.onerror = (e) => {
+            element.parentElement.removeChild(element);
 
-              // Massage the error into something useful
-              const errorMessage = `Failed to load script from '${ e.target.src }'`;
-
-              console.error(errorMessage, e); // eslint-disable-line no-console
-              reject(new Error(errorMessage)); // This is more useful where it's used
-            };
-
-            document.head.appendChild(element);
-          }).catch((e) => {
-            const errorMessage = `Failed to unload old plugin${ oldPlugin?.id }`;
+            // Massage the error into something useful
+            const errorMessage = `Failed to load script from '${ e.target.src }'`;
 
             console.error(errorMessage, e); // eslint-disable-line no-console
             reject(new Error(errorMessage)); // This is more useful where it's used
-          });
+          };
+
+          document.head.appendChild(element);
         });
       },
 
@@ -215,7 +205,7 @@ export default function(context, inject, vueApp) {
           Object.keys(plugin.types[typ]).forEach((name) => {
             this.unregister(typ, name);
 
-            if (typ === MODEL_TYPE) {
+            if (typ === EXT_IDS.MODELS) {
               clearModelCache(name);
             }
           });
@@ -284,6 +274,13 @@ export default function(context, inject, vueApp) {
           });
         });
 
+        // Model extensions
+        Object.keys(plugin.modelExtensions).forEach((name) => {
+          plugin.modelExtensions[name].forEach((fn) => {
+            this.register(EXT_IDS.MODEL_EXTENSION, name, instantiateModelExtension(this, fn));
+          });
+        });
+
         // Initialize the product if the store is ready
         if (productsLoaded()) {
           this.loadProducts([plugin]);
@@ -317,8 +314,8 @@ export default function(context, inject, vueApp) {
           dynamic[type] = {};
         }
 
-        // Accumulate l10n resources rather than replace
-        if (type === 'l10n') {
+        // Accumulate l10n resources and model extensions rather than replace
+        if (type === 'l10n' || type === EXT_IDS.MODEL_EXTENSION) {
           if (!dynamic[type][name]) {
             dynamic[type][name] = [];
           }
diff --git a/shell/core/types-provisioning.ts b/shell/core/types-provisioning.ts
index d9f190d1ff..c6a81b8603 100644
--- a/shell/core/types-provisioning.ts
+++ b/shell/core/types-provisioning.ts
@@ -13,6 +13,37 @@ export type ClusterSaveHook = (cluster: any) => Promise<any>
  */
 export type RegisterClusterSaveHook = (hook: ClusterSaveHook, name: string, priority?: number, fnContext?: any) => void;
 
+export type ClusterDetailTabs = {
+  /**
+   * RKE2 machine pool tabs
+   */
+  machines: boolean,
+  /**
+   * RKE2 provisioning logs
+   */
+  logs: boolean,
+  /**
+   * RKE2 registration commands
+   */
+  registration: boolean,
+  /**
+   * RKE2 snapshots
+   */
+  snapshots: boolean,
+  /**
+   * Kube resources related to the instance of provisioning.cattle.io.cluster
+   */
+  related: boolean,
+  /**
+   * Kube events associated with the instance of provisioning.cattle.io.cluster
+   */
+  events: boolean,
+  /**
+   * Kube conditions of the provisioning.cattle.io.cluster instance
+   */
+  conditions: boolean
+};
+
 /**
  * Params used when constructing an instance of the cluster provisioner
  */
@@ -57,7 +88,6 @@ export interface ClusterProvisionerContext {
  * The majority of these hooks are used in shell/edit/provisioning.cattle.io.cluster/rke2.vue
  */
 export interface IClusterProvisioner {
-
   /**
    * Unique ID of the Cluster Provisioner
    * If this overlaps with the name of an existing provisioner (seen in the type query param while creating a cluster) this provisioner will overwrite the built-in ui
@@ -233,7 +263,7 @@ export interface IClusterProvisioner {
   registerSaveHooks?(registerBeforeHook: RegisterClusterSaveHook, registerAfterHook: RegisterClusterSaveHook, cluster: any): void;
 
   /**
-   * Optionally override the save of the cluster resource itself.
+   * Optionally override the save of the cluster resource itself
    *
    * https://github.com/rancher/dashboard/blob/master/shell/mixins/create-edit-view/impl.js#L179
    *
@@ -263,3 +293,62 @@ export interface IClusterProvisioner {
    */
   provision?(cluster: any, pools: any[]): Promise<any[]>;
 }
+
+/**
+ * Interface that a model extension for the provisioning cluster model should implement
+ */
+export interface IClusterModelExtension {
+  /**
+   * Indicates if this extension should be used for the given cluster
+   *
+   * This allows the extension to determine if it should be used for a cluster based on attributes/metadata of its choosing
+   *
+   * @param cluster The cluster model (`provisioning.cattle.io.cluster`)
+   * @returns Whether to use this provisioner for the given cluster.
+   */
+  useFor(cluster: any): boolean;
+
+  /**
+   * Optionally Process the available actions for a cluster and return a (possibly modified) set of actions
+   *
+   * @param cluster The cluster model (`provisioning.cattle.io.cluster`)
+   * @returns List of actions for the cluster or undefined if the list is modified in-place
+   */
+  availableActions?(cluster: any, actions: any[]): any[] | undefined;
+
+  /**
+   * Get the display name for the machine provider for this model
+   *
+   * @param cluster The cluster model (`provisioning.cattle.io.cluster`)
+   * @returns Machine provider display name
+   */
+  machineProviderDisplay?(cluster: any): string;
+
+  /**
+   * Get the display name for the provisioner for this model
+   *
+   * @param cluster The cluster model (`provisioning.cattle.io.cluster`)
+   * @returns Provisioner display name
+   */
+  provisionerDisplay?(cluster: any): string;
+
+  /**
+   * Get the parent cluster for this cluster, or undefined if no parent cluster
+   *
+   * @param cluster The cluster model (`provisioning.cattle.io.cluster`)
+   * @returns ID of the parent cluster
+   */
+  parentCluster?(cluster: any): string;
+
+  /**
+   * Function to run after the cluster has been deleted
+   *
+   * @param cluster The cluster (`provisioning.cattle.io.cluster`)
+   */
+  postDelete?(cluster: any): void;
+
+  /**
+   * Existing tabs to show or hide in the cluster's detail view
+   */
+  get detailTabs(): ClusterDetailTabs;
+}
diff --git a/shell/core/types.ts b/shell/core/types.ts
index 96df1c615f..bd6b3a6a20 100644
--- a/shell/core/types.ts
+++ b/shell/core/types.ts
@@ -478,6 +478,37 @@ export interface DSLReturnType {
   // weightType: (input, weight, forBasic)
 }
 
+/**
+ * Context for the constructor of a model extension
+ */
+export type ModelExtensionContext = {
+  /**
+   * Dispatch vuex actions
+   */
+  dispatch: any,
+  /**
+   * Get from vuex store
+   */
+  getters: any,
+  /**
+   * Used to make http requests
+   */
+  axios: any,
+  /**
+   * Definition of the extension
+   */
+  $plugin: any,
+  /**
+   * Function to retrieve a localised string
+   */
+  t: (key: string) => string,
+};
+
+/**
+ * Constructor signature for a model extension
+ */
+export type ModelExtensionConstructor = (context: ModelExtensionContext) => Object;
+
 /**
  * Interface for a Dashboard plugin
  */
@@ -584,6 +615,15 @@ export interface IPlugin {
     onLogOut?: OnLogOut
   ): void;
 
+  /**
+   * Adds a model extension
+   * @experimental May change or be removed in the future
+   *
+   * @param type Model type
+   * @param clz  Class for the model extension (constructor)
+   */
+  addModelExtension(type: string, clz: ModelExtensionConstructor): void;
+
   /**
    * Register 'something' that can be dynamically loaded - e.g. model, edit, create, list, i18n
    * @param {String} type type of thing to register, e.g. 'edit'
diff --git a/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts b/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts
index c274017b39..92f5b0b644 100644
--- a/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts
+++ b/shell/detail/__tests__/autoscaling.horizontalpodautoscaler.test.ts
@@ -7,9 +7,18 @@ describe('view: autoscaling.horizontalpodautoscaler', () => {
       'i18n/t':                  (text: string) => text,
       t:                         (text: string) => text,
       currentStore:              () => 'current_store',
-      'current_store/schemaFor': jest.fn(),
-      'current_store/all':       jest.fn(),
-      workspace:                 jest.fn(),
+      'current_store/schemaFor': () => ({
+        attributes: {
+          columns: [
+            { name: 'Subobject', field: '' },
+            { name: 'Source', field: '' },
+            { name: 'First Seen', field: '' },
+            { name: 'Count', field: '' }]
+        }
+      }),
+      'current_store/all': jest.fn(),
+      workspace:           jest.fn(),
+      'i18n/exists':       jest.fn(),
     },
   };
 
diff --git a/shell/detail/catalog.cattle.io.app.vue b/shell/detail/catalog.cattle.io.app.vue
index 4c90ae4e7f..c6702f3f50 100644
--- a/shell/detail/catalog.cattle.io.app.vue
+++ b/shell/detail/catalog.cattle.io.app.vue
@@ -34,7 +34,7 @@ export default {
     const promises = {
       catalog:       this.$store.dispatch('catalog/load'),
       allOperations: this.$store.dispatch('cluster/findAll', { type: CATALOG.OPERATION }),
-      secrets:       this.value.fetchValues(true),
+      secret:        this.value.fetchValues(true),
     };
 
     const res = await allHash(promises);
diff --git a/shell/detail/fleet.cattle.io.cluster.vue b/shell/detail/fleet.cattle.io.cluster.vue
index 4669324062..cca17db8ac 100644
--- a/shell/detail/fleet.cattle.io.cluster.vue
+++ b/shell/detail/fleet.cattle.io.cluster.vue
@@ -29,11 +29,11 @@ export default {
   },
 
   async fetch() {
-    const clusterId = this.value?.metadata?.labels[FLEET_LABELS.CLUSTER_NAME];
+    const managementClusterId = this.value?.metadata?.labels[FLEET_LABELS.CLUSTER_NAME];
     const hash = await allHash({
       rancherCluster: this.$store.dispatch('management/find', {
         type: MANAGEMENT.CLUSTER,
-        id:   clusterId
+        id:   managementClusterId
       }),
       repos:             this.$store.dispatch('management/findAll', { type: FLEET.GIT_REPO }),
       workspaces:        this.$store.dispatch('management/findAll', { type: FLEET.WORKSPACE }),
@@ -53,7 +53,7 @@ export default {
       return this.value.bundleDeployments;
     },
     clusterId() {
-      return this.value?.metadata?.labels[FLEET_LABELS.CLUSTER_NAME];
+      return this.value.id;
     },
 
     repos() {
diff --git a/shell/detail/namespace.vue b/shell/detail/namespace.vue
index a4deb7d988..c9f785d429 100644
--- a/shell/detail/namespace.vue
+++ b/shell/detail/namespace.vue
@@ -10,9 +10,7 @@ import Tab from '@shell/components/Tabbed/Tab';
 import ResourceTable from '@shell/components/ResourceTable';
 import SortableTable from '@shell/components/SortableTable';
 import Loading from '@shell/components/Loading';
-import {
-  flatten, compact, filter, findKey, values
-} from 'lodash';
+import { flatten, compact, findKey, values } from 'lodash';
 
 export default {
   emits: ['input'],
@@ -89,6 +87,9 @@ export default {
       },
     ];
 
+    const params = this.$route.params;
+    const { id: namespaceId } = params;
+
     return {
       allWorkloads: {
         default: () => ([]),
@@ -97,7 +98,10 @@ export default {
       resourceTypes:  [],
       summaryStates:  ['success', 'info', 'warning', 'error', 'unknown'],
       headers,
-      workloadSchema: WORKLOAD_SCHEMA
+      workloadSchema: WORKLOAD_SCHEMA,
+      inStore:        this.$store.getters['currentProduct'].inStore,
+      statesByType:   getStatesByType(),
+      namespaceId,
     };
   },
 
@@ -106,10 +110,6 @@ export default {
   },
 
   computed: {
-    inStore() {
-      return this.$store.getters['currentProduct'].inStore;
-    },
-
     namespacedResourceCounts() {
       const allClusterResourceCounts = this.$store.getters[`${ this.inStore }/all`](COUNT)[0].counts;
 
@@ -148,20 +148,11 @@ export default {
       }, totals);
     },
 
-    statesByType() {
-      return getStatesByType();
-    },
-
     /**
      * Workload table data for current namespace
      */
     workloadRows() {
-      const params = this.$route.params;
-      const { id } = params;
-      const rows = flatten(compact(this.allWorkloads)).filter((row) => !row.ownedByWorkload);
-      const namespacedRows = filter(rows, ({ metadata: { namespace } }) => namespace === id);
-
-      return namespacedRows;
+      return flatten(compact(this.allWorkloads)).filter((row) => !row.ownedByWorkload);
     }
   },
 
@@ -198,7 +189,10 @@ export default {
       return Promise.all(values(WORKLOAD_TYPES)
         // You may not have RBAC to see some of the types
         .filter((type) => Boolean(this.schemaFor(type)))
-        .map((type) => this.$store.dispatch('cluster/findAll', { type }))
+        // findAll on each workload type here, argh! however...
+        // - results are shown in a single table containing all workloads rather than an SSP compatible way (one table per type)
+        // - we're restricting by namespace. not great, but a big improvement
+        .map((type) => this.$store.dispatch('cluster/findAll', { type, opt: { namespaced: this.namespaceId } }))
       );
     },
 
diff --git a/shell/detail/networking.k8s.io.ingress.vue b/shell/detail/networking.k8s.io.ingress.vue
index 1ac52715e2..3d514b006b 100644
--- a/shell/detail/networking.k8s.io.ingress.vue
+++ b/shell/detail/networking.k8s.io.ingress.vue
@@ -1,12 +1,10 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE } from '@shell/config/types';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Rules from '@shell/edit/networking.k8s.io.ingress/Rules';
 import ResourceTabs from '@shell/components/form/ResourceTabs';
 import Tab from '@shell/components/Tabbed/Tab';
-import { SECRET_TYPES as TYPES } from '@shell/config/secret';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import IngressDetailEditHelper from '@shell/utils/ingress';
 
 export default {
   name:       'CRUIngress',
@@ -18,76 +16,38 @@ export default {
   },
   mixins: [CreateEditView],
   async fetch() {
+    this.ingressHelper = new IngressDetailEditHelper({
+      $store:    this.$store,
+      namespace: this.value.metadata.namespace
+    });
     const promises = {
-      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      services:       this.ingressHelper.fetchServices(),
+      secrets:        this.ingressHelper.fetchSecrets(),
       resourceFields: this.schema.fetchResourceFields(),
     };
 
-    if (this.$store.getters[`cluster/paginationEnabled`](SECRET)) {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.value.metadata.namespace,
-        pagination: new FilterArgs({
-          filters: PaginationParamFilter.createSingleField({
-            field: 'metadata.fields.1',
-            value: TYPES.TLS
-          })
-        }),
-      };
-
-      promises.filteredSecrets = this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
-    } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET });
-    }
     const hash = await allHash(promises);
 
-    this.allServices = hash.services;
-    this.allSecrets = hash.secrets;
-    this.filteredSecrets = hash.filteredSecrets;
+    this.services = hash.services;
+    this.secrets = hash.secrets;
   },
   data() {
     return {
-      allSecrets:      null,
-      filteredSecrets: null,
-      allServices:     [],
+      secrets:  [],
+      services: [],
     };
   },
   computed: {
     serviceTargets() {
-      return this.filterByCurrentResourceNamespace(this.allServices)
-        .map((service) => ({
-          label: service.metadata.name,
-          value: service.metadata.name,
-          ports: service.spec.ports?.map((p) => p.port)
-        }));
+      return this.ingressHelper.findAndMapServiceTargets(this.services);
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      let filteredSecrets;
-
-      if (this.filteredSecrets) {
-        filteredSecrets = this.filteredSecrets;
-      } else if (this.allSecrets ) {
-        filteredSecrets = this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS));
-      } else {
-        return [];
-      }
-
-      return filteredSecrets.map((secret) => {
-        const { id } = secret;
-
-        return id.slice(id.indexOf('/') + 1);
-      });
+      return this.ingressHelper.findAndMapCerts(this.secrets);
     },
   },
-  methods: {
-    filterByCurrentResourceNamespace(resources) {
-      return resources.filter((resource) => {
-        return resource.metadata.namespace === this.value.metadata.namespace;
-      });
-    }
-  }
 };
 </script>
 <template>
diff --git a/shell/detail/provisioning.cattle.io.cluster.vue b/shell/detail/provisioning.cattle.io.cluster.vue
index 9131596a57..563670f74d 100644
--- a/shell/detail/provisioning.cattle.io.cluster.vue
+++ b/shell/detail/provisioning.cattle.io.cluster.vue
@@ -84,6 +84,7 @@ export default {
   async fetch() {
     await this.value.waitForProvisioner();
 
+    // Support for the 'provisioner' extension
     const extClass = this.$plugin.getDynamic('provisioner', this.value.machineProvider);
 
     if (extClass) {
@@ -94,6 +95,7 @@ export default {
         $plugin:  this.$store.app.$plugin,
         $t:       this.t
       });
+
       this.extDetailTabs = {
         ...this.extDetailTabs,
         ...this.extProvider.detailTabs
@@ -101,6 +103,15 @@ export default {
       this.extCustomParams = { provider: this.value.machineProvider };
     }
 
+    // Support for a model extension
+    if (this.value.customProvisionerHelper) {
+      this.extDetailTabs = {
+        ...this.extDetailTabs,
+        ...this.value.customProvisionerHelper.detailTabs
+      };
+      this.extCustomParams = { provider: this.value.machineProvider };
+    }
+
     const schema = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
     const fetchOne = { schemaDefinitions: schema.fetchResourceFields() };
 
@@ -379,7 +390,7 @@ export default {
     },
 
     showNodes() {
-      return !this.showMachines && this.haveNodes && !!this.nodes.length;
+      return !this.showMachines && this.haveNodes && !!this.nodes.length && this.extDetailTabs.machines;
     },
 
     showSnapshots() {
diff --git a/shell/detail/workload/index.vue b/shell/detail/workload/index.vue
index 58c891ed20..c461183dce 100644
--- a/shell/detail/workload/index.vue
+++ b/shell/detail/workload/index.vue
@@ -47,8 +47,9 @@ export default {
     } catch {}
 
     const hash = {
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, come from a locally applied selector in the workload model
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       allPods:      this.$store.dispatch('cluster/findAll', { type: POD }),
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }),
       allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
       // Nodes should be fetched because they may be referenced in the target
@@ -57,7 +58,7 @@ export default {
     };
 
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
-      hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
+      hash.jobs = this.value.matchingJobs();
     }
     const res = await allHash(hash);
 
@@ -91,7 +92,6 @@ export default {
       allIngresses:                    [],
       matchingServices:                [],
       matchingIngresses:               [],
-      allJobs:                         [],
       allNodes:                        [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
diff --git a/shell/dialog/AddCustomBadgeDialog.vue b/shell/dialog/AddCustomBadgeDialog.vue
index 67922da047..a1e5afe413 100644
--- a/shell/dialog/AddCustomBadgeDialog.vue
+++ b/shell/dialog/AddCustomBadgeDialog.vue
@@ -213,6 +213,7 @@ export default {
   <Card
     class="prompt-badge"
     :show-highlight-border="false"
+    :trigger-focus-trap="true"
   >
     <template #title>
       <h4 class="text-default-text">
@@ -258,7 +259,6 @@ export default {
             <Checkbox
               v-model:value="badgeAsIcon"
               :label="t('clusterBadge.modal.badgeAsIcon')"
-
               :tooltip="t('clusterBadge.modal.maxCharsTooltip')"
             />
 
@@ -312,7 +312,9 @@ export default {
         />
         <div class="buttons">
           <button
+            role="button"
             class="btn role-secondary mr-10"
+            :aria-label="t('generic.cancel')"
             @click="close"
           >
             {{ t('generic.cancel') }}
@@ -320,6 +322,8 @@ export default {
           <AsyncButton
             :action-label="t('clusterBadge.modal.buttonAction')"
             :disabled="!canSubmit"
+            role="button"
+            :aria-label="t('generic.cancel')"
             @click="apply"
           />
         </div>
diff --git a/shell/edit/__tests__/management.cattle.io.setting.test.ts b/shell/edit/__tests__/management.cattle.io.setting.test.ts
index d12ead980e..ee58a57c20 100644
--- a/shell/edit/__tests__/management.cattle.io.setting.test.ts
+++ b/shell/edit/__tests__/management.cattle.io.setting.test.ts
@@ -2,27 +2,27 @@ import { mount } from '@vue/test-utils';
 import Settings from '@shell/edit/management.cattle.io.setting.vue';
 import { SETTING } from '@shell/config/settings';
 
-describe('view: management.cattle.io.setting should', () => {
-  const requiredSetup = () => ({
-    // Remove all these mocks after migration to Vue 2.7/3 due mixin logic
-    global: {
-      mocks: {
-        $store: {
-          getters: {
-            currentStore:              () => 'current_store',
-            'current_store/schemaFor': jest.fn(),
-            'current_store/all':       jest.fn(),
-            'i18n/t':                  jest.fn(),
-            'i18n/exists':             jest.fn(),
-          },
-          dispatch: jest.fn(),
+const requiredSetup = () => ({
+  // Remove all these mocks after migration to Vue 2.7/3 due mixin logic
+  global: {
+    mocks: {
+      $store: {
+        getters: {
+          currentStore:              () => 'current_store',
+          'current_store/schemaFor': jest.fn(),
+          'current_store/all':       jest.fn(),
+          'i18n/t':                  jest.fn(),
+          'i18n/exists':             jest.fn(),
         },
-        $route:  { query: { AS: '' } },
-        $router: { applyQuery: jest.fn() },
-      }
+        dispatch: jest.fn(),
+      },
+      $route:  { query: { AS: '' } },
+      $router: { applyQuery: jest.fn() },
     }
-  });
+  }
+});
 
+describe('view: management.cattle.io.setting should', () => {
   it('allowing to save if no rules in settings', () => {
     const wrapper = mount(Settings, {
       props: { value: { value: 'anything' } },
@@ -88,3 +88,22 @@ describe('view: management.cattle.io.setting should', () => {
     });
   });
 });
+
+describe('edit: management.cattle.io.setting should', () => {
+  it('display form errors', () => {
+    const wrapper = mount(Settings, {
+      props: {
+        value: { value: 'anything' },
+        mode:  'edit',
+      },
+      data: () => ({
+        setting: { },
+        errors:  ['generic'] as any,
+      }),
+      ...requiredSetup()
+    });
+    const errorBanner = wrapper.find('[data-testid="banner-content"]');
+
+    expect(errorBanner.element.textContent).toBe('generic');
+  });
+});
diff --git a/shell/edit/auth/ldap/__tests__/config.test.ts b/shell/edit/auth/ldap/__tests__/config.test.ts
new file mode 100644
index 0000000000..945a05c82b
--- /dev/null
+++ b/shell/edit/auth/ldap/__tests__/config.test.ts
@@ -0,0 +1,18 @@
+import { mount } from '@vue/test-utils';
+import LDAPConfig from '@shell/edit/auth/ldap/config.vue';
+
+describe('lDAP config', () => {
+  it.each([
+    'openldap', 'freeipa'
+  ])('should display searchUsingServiceAccount checkbox if type %p', (type) => {
+    const wrapper = mount(LDAPConfig, {
+      propsData: {
+        value: {},
+        type,
+      }
+    });
+    const checkbox = wrapper.find('[data-testid="searchUsingServiceAccount"]');
+
+    expect(checkbox).toBeDefined();
+  });
+});
diff --git a/shell/edit/auth/ldap/config.vue b/shell/edit/auth/ldap/config.vue
index 7bdf026dc2..54b49a6664 100644
--- a/shell/edit/auth/ldap/config.vue
+++ b/shell/edit/auth/ldap/config.vue
@@ -11,6 +11,8 @@ const DEFAULT_TLS_PORT = 636;
 
 export const SHIBBOLETH = 'shibboleth';
 export const OKTA = 'okta';
+export const OPEN_LDAP = 'openldap';
+export const FREE_IPA = 'freeipa';
 
 export default {
   emits: ['update:value'],
@@ -64,6 +66,11 @@ export default {
     // Does the auth provider support LDAP for search in addition to SAML?
     isSamlProvider() {
       return this.type === SHIBBOLETH || this.type === OKTA;
+    },
+
+    // Allow to enable user search just for these providers
+    isSearchAllowed() {
+      return this.type === OPEN_LDAP || this.type === FREE_IPA;
     }
   },
 
@@ -226,6 +233,23 @@ export default {
         />
       </div>
     </div>
+
+    <div
+      v-if="isSearchAllowed"
+      class="row mb-20"
+    >
+      <div class="col">
+        <Checkbox
+          v-model:value="model.searchUsingServiceAccount"
+          :mode="mode"
+          data-testid="searchUsingServiceAccount"
+          class="full-height"
+          :label="t('authConfig.ldap.searchUsingServiceAccount.label')"
+          :tooltip="t('authConfig.ldap.searchUsingServiceAccount.tip')"
+        />
+      </div>
+    </div>
+
     <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
diff --git a/shell/edit/auth/saml.vue b/shell/edit/auth/saml.vue
index b1e84300c9..efe67b815e 100644
--- a/shell/edit/auth/saml.vue
+++ b/shell/edit/auth/saml.vue
@@ -211,12 +211,14 @@ export default {
             </Banner>
 
             <table v-if="showLdapDetails && model.openLdapConfig">
-              <tr><td>{{ t('authConfig.ldap.hostname.label') }}:</td><td>{{ ldapHosts }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.port') }}:</td><td>{{ model.openLdapConfig.port }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.protocol') }}:</td><td>{{ ldapProtocol }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.serviceAccountDN') }}:</td><td>{{ model.openLdapConfig.serviceAccountDistinguishedName }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.userSearchBase.label') }}:</td><td>{{ model.openLdapConfig.userSearchBase }}</td></tr>
-              <tr><td>{{ t('authConfig.ldap.groupSearchBase.label') }}:</td><td>{{ model.openLdapConfig.groupSearchBase }}</td></tr>
+              <tbody>
+                <tr><td>{{ t('authConfig.ldap.hostname.label') }}:</td><td>{{ ldapHosts }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.port') }}:</td><td>{{ model.openLdapConfig.port }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.protocol') }}:</td><td>{{ ldapProtocol }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.serviceAccountDN') }}:</td><td>{{ model.openLdapConfig.serviceAccountDistinguishedName }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.userSearchBase.label') }}:</td><td>{{ model.openLdapConfig.userSearchBase }}</td></tr>
+                <tr><td>{{ t('authConfig.ldap.groupSearchBase.label') }}:</td><td>{{ model.openLdapConfig.groupSearchBase }}</td></tr>
+              </tbody>
             </table>
           </template>
         </AuthBanner>
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 092d519dd5..3a40adaf4d 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -153,7 +153,13 @@ export default {
       stepRepoInfo,
       stepTargetInfo,
       displayHelmRepoURLRegex: false,
-      fvFormRuleSets:          [{ path: 'spec.repo', rules: ['required'] }]
+      fvFormRuleSets:          [{
+        path:  'spec.repo',
+        rules: [
+          'required',
+          'gitRepository'
+        ],
+      }]
     };
   },
 
diff --git a/shell/edit/logging-flow/index.vue b/shell/edit/logging-flow/index.vue
index 76c19fcb28..a8c2673c77 100644
--- a/shell/edit/logging-flow/index.vue
+++ b/shell/edit/logging-flow/index.vue
@@ -6,14 +6,12 @@ import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
-import {
-  LOGGING, NAMESPACE, NODE, POD, SCHEMA
-} from '@shell/config/types';
+import { LOGGING, NAMESPACE, NODE, SCHEMA } from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import { createYaml } from '@shell/utils/create-yaml';
 import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
 import { allHash } from '@shell/utils/promise';
-import { isArray, uniq } from '@shell/utils/array';
+import { isArray } from '@shell/utils/array';
 import { matchRuleIsPopulated } from '@shell/models/logging.banzaicloud.io.flow';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { clone } from '@shell/utils/object';
@@ -67,7 +65,6 @@ export default {
     const hasAccessToOutputs = this.$store.getters[`${ inStore }/schemaFor`](LOGGING.OUTPUT);
     const hasAccessToNamespaces = this.$store.getters[`cluster/schemaFor`](NAMESPACE);
     const hasAccessToNodes = this.$store.getters[`${ inStore }/schemaFor`](NODE);
-    const hasAccessToPods = this.$store.getters[`${ inStore }/schemaFor`](POD);
     const isFlow = this.value.type === LOGGING.FLOW;
 
     const getAllOrDefault = (type, hasAccess) => {
@@ -77,9 +74,10 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
+      // Can't remove allNamespaces yet given https://github.com/harvester/harvester/issues/7342 and
+      // https://github.com/harvester/harvester-ui-extension/blob/main/pkg/harvester/edit/harvesterhci.io.logging.clusteroutput.vue
       allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
       allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
-      allPods:           getAllOrDefault(POD, hasAccessToPods),
     });
 
     for ( const k of Object.keys(hash) ) {
@@ -134,7 +132,6 @@ export default {
       allClusterOutputs:  null,
       allNamespaces:      null,
       allNodes:           null,
-      allPods:            null,
       filtersYaml,
       initialFiltersYaml: filtersYaml,
       globalOutputRefs,
@@ -239,18 +236,6 @@ export default {
       return out;
     },
 
-    containerChoices() {
-      const out = [];
-
-      for ( const pod of this.allPods ) {
-        for ( const c of (pod.spec?.containers || []) ) {
-          out.push(c.name);
-        }
-      }
-
-      return uniq(out).sort();
-    },
-
     isHarvester() {
       return this.$store.getters['currentProduct'].inStore === VIRTUAL;
     },
diff --git a/shell/edit/management.cattle.io.setting.vue b/shell/edit/management.cattle.io.setting.vue
index 3dade3631e..c67b24a012 100644
--- a/shell/edit/management.cattle.io.setting.vue
+++ b/shell/edit/management.cattle.io.setting.vue
@@ -24,6 +24,8 @@ export default {
     Banner
   },
 
+  inheritAttrs: false,
+
   mixins: [CreateEditView, FormValidation],
 
   data() {
diff --git a/shell/edit/networking.k8s.io.ingress/index.vue b/shell/edit/networking.k8s.io.ingress/index.vue
index c54e864b99..5ed99c29ec 100644
--- a/shell/edit/networking.k8s.io.ingress/index.vue
+++ b/shell/edit/networking.k8s.io.ingress/index.vue
@@ -1,6 +1,6 @@
 <script>
 import { allHash } from '@shell/utils/promise';
-import { SECRET, SERVICE, INGRESS_CLASS } from '@shell/config/types';
+import { INGRESS_CLASS } from '@shell/config/types';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
@@ -10,13 +10,12 @@ import Labels from '@shell/components/form/Labels';
 import Error from '@shell/components/form/Error';
 import Tabbed from '@shell/components/Tabbed';
 import { get, set } from '@shell/utils/object';
-import { SECRET_TYPES as TYPES } from '@shell/config/secret';
 import DefaultBackend from './DefaultBackend';
 import Certificates from './Certificates';
 import Rules from './Rules';
 import IngressClass from './IngressClass';
 import Loading from '@shell/components/Loading';
-import { FilterArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import IngressDetailEditHelper from '@shell/utils/ingress';
 
 export default {
   name:         'CRUIngress',
@@ -50,36 +49,32 @@ export default {
   },
 
   async fetch() {
+    this.ingressHelper = new IngressDetailEditHelper({
+      $store:    this.$store,
+      namespace: this.value.metadata.namespace
+    });
+
     this.ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
 
     const promises = {
-      services:              this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      secrets:               this.ingressHelper.fetchSecrets(),
+      services:              this.ingressHelper.fetchServices(),
       ingressClasses:        this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
       ingressResourceFields: this.schema.fetchResourceFields(),
     };
 
-    this.filterByApi = this.$store.getters[`cluster/paginationEnabled`](SECRET);
-
-    if (this.filterByApi) {
-      promises.filteredSecrets = this.filterSecretsByApi();
-    } else {
-      promises.secrets = this.$store.dispatch('cluster/findAll', { type: SECRET });
-    }
-
     const hash = await allHash(promises);
 
-    this.allServices = hash.services;
-    this.allSecrets = hash.secrets;
-    this.filteredSecrets = hash.filteredSecrets;
+    this.secrets = hash.secrets;
+    this.services = hash.services;
     this.allIngressClasses = hash.ingressClasses;
   },
   data() {
     return {
       filterByApi:        null,
       ingressClassSchema: null,
-      allSecrets:         null,
-      filteredSecrets:    null,
-      allServices:        [],
+      secrets:            [],
+      services:           [],
       allIngressClasses:  [],
       fvFormRuleSets:     [
         {
@@ -111,10 +106,9 @@ export default {
   },
 
   watch: {
-    async 'value.metadata.namespace'() {
-      if (this.filterByApi) {
-        this.filteredSecrets = await this.filterSecretsByApi();
-      }
+    async 'value.metadata.namespace'(neu) {
+      this.services = await this.ingressHelper.fetchServices({ namespace: neu });
+      this.secrets = await this.ingressHelper.fetchSecrets({ namespace: neu });
     }
   },
 
@@ -162,32 +156,13 @@ export default {
       return { name: [], port: [] };
     },
     serviceTargets() {
-      return this.filterByCurrentResourceNamespace(this.allServices)
-        .map((service) => ({
-          label: service.metadata.name,
-          value: service.metadata.name,
-          ports: service.spec.ports?.map((p) => p.port)
-        }));
+      return this.ingressHelper.findAndMapServiceTargets(this.services);
     },
     firstTabLabel() {
       return this.isView ? this.t('ingress.rulesAndCertificates.title') : this.t('ingress.rules.title');
     },
     certificates() {
-      let filteredSecrets;
-
-      if (this.filteredSecrets) {
-        filteredSecrets = this.filteredSecrets;
-      } else if (this.allSecrets ) {
-        filteredSecrets = this.filterByCurrentResourceNamespace(this.allSecrets.filter((secret) => secret._type === TYPES.TLS));
-      } else {
-        return [];
-      }
-
-      return filteredSecrets.map((secret) => {
-        const { id } = secret;
-
-        return id.slice(id.indexOf('/') + 1);
-      });
+      return this.ingressHelper.findAndMapCerts(this.secrets);
     },
     ingressClasses() {
       return this.allIngressClasses.map((ingressClass) => ({
@@ -210,28 +185,6 @@ export default {
   },
 
   methods: {
-    filterSecretsByApi() {
-      const findPageArgs = { // Of type ActionFindPageArgs
-        namespaced: this.value.metadata.namespace,
-        pagination: new FilterArgs({
-          filters: PaginationParamFilter.createSingleField({
-            field: 'metadata.fields.1',
-            value: TYPES.TLS
-          })
-        }),
-      };
-
-      return this.$store.dispatch(`cluster/findPage`, { type: SECRET, opt: findPageArgs });
-    },
-
-    filterByCurrentResourceNamespace(resources) {
-      // When configuring an Ingress, the options for Secrets and
-      // default backend Services are limited to the namespace of the Ingress.
-      return resources.filter((resource) => {
-        return resource.metadata.namespace === this.value.metadata.namespace;
-      });
-    },
-
     willSave() {
       const backend = get(this.value.spec, this.value.defaultBackendPath);
       const serviceName = get(backend, this.value.serviceNamePath);
diff --git a/shell/edit/networking.k8s.io.networkpolicy/index.vue b/shell/edit/networking.k8s.io.networkpolicy/index.vue
index 19903b4cd0..8dd5f2f0c3 100644
--- a/shell/edit/networking.k8s.io.networkpolicy/index.vue
+++ b/shell/edit/networking.k8s.io.networkpolicy/index.vue
@@ -43,12 +43,12 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }),
-      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }),
+      allPods:       this.$store.dispatch('cluster/findAll', { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
+      allNamespaces: this.$store.dispatch('cluster/findAll', { type: NAMESPACE }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
     });
 
-    this.allPods = hash.allPods;
-    this.allNamespaces = hash.allNamespaces;
+    this.allPods = hash.allPods; // Used in matchingPods, and PolicyRules --> PolicyRule --> PolicyRuleTarget
+    this.allNamespaces = hash.allNamespaces; // Used in PolicyRules --> PolicyRule --> PolicyRuleTarget
 
     this.updateMatchingPods();
   },
@@ -147,7 +147,6 @@ export default {
 
   methods: {
     updateMatchingPods: throttle(function() {
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value.metadata.namespace);
       const match = matching(allInNamespace, this.podSelectorExpressions);
       const matched = match.length || 0;
diff --git a/shell/edit/provisioning.cattle.io.cluster/index.vue b/shell/edit/provisioning.cattle.io.cluster/index.vue
index d113b51a42..cb2fd3a36d 100644
--- a/shell/edit/provisioning.cattle.io.cluster/index.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/index.vue
@@ -35,6 +35,8 @@ const SORT_GROUPS = {
 
 // uSed to proxy stylesheets for custom drivers that provide custom UI (RKE1)
 const PROXY_ENDPOINT = '/meta/proxy';
+const IMPORTED = 'imported';
+const LOCAL = 'local';
 
 export default {
   name: 'CruCluster',
@@ -171,7 +173,17 @@ export default {
   },
 
   data() {
-    const subType = this.$route.query[SUB_TYPE] || null;
+    let subType = null;
+
+    subType = this.$route.query[SUB_TYPE] || null;
+
+    if ( this.$route.query[SUB_TYPE]) {
+      subType = this.$route.query[SUB_TYPE];
+    } else if (this.value.isImported) {
+      subType = IMPORTED;
+    } else if (this.value.isLocal) {
+      subType = LOCAL;
+    }
     const rkeType = this.$route.query[RKE_TYPE] || null;
     const chart = this.$route.query[CHART] || null;
     const isImport = this.realMode === _IMPORT;
diff --git a/shell/edit/provisioning.cattle.io.cluster/rke2.vue b/shell/edit/provisioning.cattle.io.cluster/rke2.vue
index f304a8bfe1..f85a6c7185 100644
--- a/shell/edit/provisioning.cattle.io.cluster/rke2.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/rke2.vue
@@ -25,10 +25,7 @@ import {
   clone, diff, set, get, isEmpty, mergeWithReplaceArrays
 } from '@shell/utils/object';
 import { allHash } from '@shell/utils/promise';
-import { sortBy } from '@shell/utils/sort';
-
-import { compare, sortable } from '@shell/utils/version';
-import { isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
+import { getAllOptionsAfterCurrentVersion, filterOutDeprecatedPatchVersions, isHarvesterSatisfiesVersion, labelForAddon } from '@shell/utils/cluster';
 
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
@@ -321,15 +318,15 @@ export default {
       const existingK3s = this.mode === _EDIT && cur.includes('k3s');
       const isAzure = this.agentConfig?.['cloud-provider-name'] === 'azure';
 
-      let allValidRke2Versions = this.getAllOptionsAfterCurrentVersion(this.rke2Versions, (existingRke2 ? cur : null), this.defaultRke2);
-      let allValidK3sVersions = this.getAllOptionsAfterCurrentVersion(this.k3sVersions, (existingK3s ? cur : null), this.defaultK3s);
+      let allValidRke2Versions = getAllOptionsAfterCurrentVersion(this.$store, this.rke2Versions, (existingRke2 ? cur : null), this.defaultRke2);
+      let allValidK3sVersions = getAllOptionsAfterCurrentVersion(this.$store, this.k3sVersions, (existingK3s ? cur : null), this.defaultK3s);
 
       if (!this.showDeprecatedPatchVersions) {
         // Normally, we only want to show the most recent patch version
         // for each Kubernetes minor version. However, if the user
         // opts in to showing deprecated versions, we don't filter them.
-        allValidRke2Versions = this.filterOutDeprecatedPatchVersions(allValidRke2Versions, cur);
-        allValidK3sVersions = this.filterOutDeprecatedPatchVersions(allValidK3sVersions, cur);
+        allValidRke2Versions = filterOutDeprecatedPatchVersions(allValidRke2Versions, cur);
+        allValidK3sVersions = filterOutDeprecatedPatchVersions(allValidK3sVersions, cur);
       }
 
       if (isAzure) {
@@ -711,7 +708,7 @@ export default {
       const first = all[0]?.value;
       const preferred = all.find((x) => x.value === this.defaultRke2)?.value;
 
-      const rke2 = this.getAllOptionsAfterCurrentVersion(this.rke2Versions, null);
+      const rke2 = getAllOptionsAfterCurrentVersion(this.$store, this.rke2Versions, null);
       const showRke2 = rke2.length;
       let out;
 
@@ -984,6 +981,10 @@ export default {
       if (this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName === undefined) {
         this.value.spec.defaultPodSecurityAdmissionConfigurationTemplateName = '';
       }
+
+      if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) ) {
+        set(this.value, 'spec.localClusterAuthEndpoint', { enabled: false });
+      }
     },
 
     /**
@@ -1111,6 +1112,17 @@ export default {
       }
     },
 
+    enableLocalClusterAuthEndpoint(neu) {
+      this.localValue.spec.localClusterAuthEndpoint.enabled = neu;
+      if (!neu) {
+        delete this.localValue.spec.localClusterAuthEndpoint.caCerts;
+        delete this.localValue.spec.localClusterAuthEndpoint.fqdn;
+      } else {
+        this.localValue.spec.localClusterAuthEndpoint.caCerts = '';
+        this.localValue.spec.localClusterAuthEndpoint.fqdn = '';
+      }
+    },
+
     /**
      * Get machine pools from the cluster configuration
      * this.value.spec.rkeConfig.machinePools
@@ -1792,110 +1804,6 @@ export default {
       this.value.spec.rkeConfig.registries.configs = configs;
     },
 
-    getAllOptionsAfterCurrentVersion(versions, currentVersion, defaultVersion) {
-      const out = (versions || []).filter((obj) => !!obj.serverArgs).map((obj) => {
-        let disabled = false;
-        let experimental = false;
-        let isCurrentVersion = false;
-        let label = obj.id;
-
-        if (currentVersion) {
-          disabled = compare(obj.id, currentVersion) < 0;
-          isCurrentVersion = compare(obj.id, currentVersion) === 0;
-        }
-
-        if (defaultVersion) {
-          experimental = compare(defaultVersion, obj.id) < 0;
-        }
-
-        if (isCurrentVersion) {
-          label = `${ label } ${ this.t('cluster.kubernetesVersion.current') }`;
-        }
-
-        if (experimental) {
-          label = `${ label } ${ this.t('cluster.kubernetesVersion.experimental') }`;
-        }
-
-        return {
-          label,
-          value:      obj.id,
-          sort:       sortable(obj.id),
-          serverArgs: obj.serverArgs,
-          agentArgs:  obj.agentArgs,
-          charts:     obj.charts,
-          disabled,
-        };
-      });
-
-      if (currentVersion && !out.find((obj) => obj.value === currentVersion)) {
-        out.push({
-          label: `${ currentVersion } ${ this.t('cluster.kubernetesVersion.current') }`,
-          value: currentVersion,
-          sort:  sortable(currentVersion),
-        });
-      }
-
-      const sorted = sortBy(out, 'sort:desc');
-
-      const mostRecentPatchVersions = this.getMostRecentPatchVersions(sorted);
-
-      const sortedWithDeprecatedLabel = sorted.map((optionData) => {
-        const majorMinor = `${ semver.major(optionData.value) }.${ semver.minor(optionData.value) }`;
-
-        if (mostRecentPatchVersions[majorMinor] === optionData.value) {
-          return optionData;
-        }
-
-        return {
-          ...optionData,
-          label: `${ optionData.label } ${ this.t('cluster.kubernetesVersion.deprecated') }`
-        };
-      });
-
-      return sortedWithDeprecatedLabel;
-    },
-
-    getMostRecentPatchVersions(sortedVersions) {
-      // Get the most recent patch version for each Kubernetes minor version.
-      const versionMap = {};
-
-      sortedVersions.forEach((version) => {
-        const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
-
-        if (!versionMap[majorMinor]) {
-          // Because we start with a sorted list of versions, we know the
-          // highest patch version is first in the list, so we only keep the
-          // first of each minor version in the list.
-          versionMap[majorMinor] = version.value;
-        }
-      });
-
-      return versionMap;
-    },
-
-    filterOutDeprecatedPatchVersions(allVersions, currentVersion) {
-      // Get the most recent patch version for each Kubernetes minor version.
-      const mostRecentPatchVersions = this.getMostRecentPatchVersions(allVersions);
-
-      const filteredVersions = allVersions.filter((version) => {
-        // Always show pre-releases
-        if (semver.prerelease(version.value)) {
-          return true;
-        }
-
-        const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
-
-        // Always show current version, else show if we haven't shown anything for this major.minor version yet
-        if (version.value === currentVersion || mostRecentPatchVersions[majorMinor] === version.value) {
-          return true;
-        }
-
-        return false;
-      });
-
-      return filteredVersions;
-    },
-
     generateYaml() {
       const resource = this.value;
       const inStore = this.$store.getters['currentStore'](resource);
@@ -2393,8 +2301,16 @@ export default {
             :mode="mode"
             :selected-version="selectedVersion"
             :truncate-limit="truncateLimit"
-            @update:value="$emit('input', $event)"
-            @truncate-hostname="truncateHostname"
+            @truncate-hostname-changed="truncateHostname"
+            @cluster-cidr-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['cluster-cidr'] = val"
+            @service-cidr-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['service-cidr'] = val"
+            @cluster-domain-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['cluster-domain'] = val"
+            @cluster-dns-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['cluster-dns'] = val"
+            @service-node-port-range-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['service-node-port-range'] = val"
+            @tls-san-changed="(val)=>localValue.spec.rkeConfig.machineGlobalConfig['tls-san'] = val"
+            @local-cluster-auth-endpoint-changed="enableLocalClusterAuthEndpoint"
+            @ca-certs-changed="(val)=>localValue.spec.localClusterAuthEndpoint.caCerts = val"
+            @fqdn-changed="(val)=>localValue.spec.localClusterAuthEndpoint.fqdn = val"
           />
         </Tab>
 
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/Basics.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/Basics.vue
index 5d6a73f8ed..fccea609f0 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/Basics.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/Basics.vue
@@ -300,7 +300,7 @@ export default {
       return name === 'rancher-vsphere';
     },
 
-    showk8s21LegacyWarning() {
+    showk8sLegacyWarning() {
       const isLegacyEnabled = this.features(LEGACY);
 
       if (!isLegacyEnabled) {
@@ -437,7 +437,7 @@ export default {
       :label="t('cluster.banner.haveArgInfo')"
     />
     <Banner
-      v-if="showk8s21LegacyWarning"
+      v-if="showk8sLegacyWarning"
       color="warning"
       :label="t('cluster.legacyWarning')"
     />
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE.vue
index b2a37a5986..1ac6bf99aa 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE.vue
@@ -2,14 +2,14 @@
 import { RadioGroup } from '@components/Form/Radio';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import FileSelector, { createOnSelected } from '@shell/components/form/FileSelector';
-import { set } from '@shell/utils/object';
-import isEmpty from 'lodash/isEmpty';
 
 export default {
   components: {
     RadioGroup, LabeledInput, FileSelector
   },
 
+  emits: ['fqdn-changed', 'ca-certs-changed', 'local-cluster-auth-endpoint-changed'],
+
   props: {
     mode: {
       type:     String,
@@ -22,57 +22,43 @@ export default {
     },
   },
 
-  data() {
-    if ( isEmpty(this.value?.spec?.localClusterAuthEndpoint) ) {
-      set(this.value, 'spec.localClusterAuthEndpoint', {
-        enabled: false,
-        caCerts: '',
-        fqdn:    '',
-      });
-    }
-
-    return {};
-  },
-
-  computed: {
-    config() {
-      return this.value.spec.localClusterAuthEndpoint;
-    },
-  },
-
-  methods: { onCertSelected: createOnSelected('config.caCerts') }
+  methods: { onCertSelected: createOnSelected('value.caCerts') }
 };
 </script>
 
 <template>
   <div>
-    <h3 v-t="'cluster.tabs.ace'" />
-
     <RadioGroup
-      v-model:value="config.enabled"
+      v-model:value="value.enabled"
       name="enabled"
+      data-testid="ace-enabled-radio-input"
       :options="[false, true]"
       :labels="[t('generic.disabled'), t('generic.enabled')]"
       :mode="mode"
+      @update:value="$emit('local-cluster-auth-endpoint-changed', $event)"
     />
 
-    <template v-if="config.enabled">
+    <template v-if="value.enabled">
       <div class="row mb-20">
         <div class="col span-6">
           <LabeledInput
-            v-model:value="config.fqdn"
+            :value="value.fqdn"
             :mode="mode"
-            label="FQDN"
+            :label="t('cluster.rke2.address.fqdn.label')"
+            data-testid="ace-fqdn-input"
             :tooltip="t('cluster.rke2.address.fqdn.toolTip')"
+            @update:value="$emit('fqdn-changed', $event)"
           />
         </div>
         <div class="col span-6">
           <LabeledInput
-            v-model:value="config.caCerts"
+            :value="value.caCerts"
             :mode="mode"
             :label="t('cluster.rke2.address.caCerts.label')"
             type="multiline"
+            data-testid="ace-cacerts-input"
             :tooltip="t('cluster.rke2.address.caCerts.toolTip')"
+            @update:value="$emit('ca-certs-changed', $event)"
           />
           <FileSelector
             :mode="mode"
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue
index 67a5acc6d1..c8d429a6b4 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue
@@ -9,7 +9,12 @@ import ACE from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE'
 const NETBIOS_TRUNCATION_LENGTH = 15;
 
 export default {
-  emits: ['update:value', 'truncate-hostname', 'input'],
+  emits: [
+    'update:value', 'cluster-cidr-changed', 'local-cluster-auth-endpoint-changed',
+    'service-cidr-changed', 'cluster-domain-changed', 'cluster-dns-changed',
+    'truncate-hostname-changed', 'ca-certs-changed', 'service-node-port-range-changed',
+    'fqdn-changed', 'tls-san-changed'
+  ],
 
   components: {
     LabeledInput,
@@ -74,7 +79,7 @@ export default {
         this.$emit('update:value', newValue);
       }
     },
-  },
+  }
 };
 </script>
 
@@ -99,10 +104,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['cluster-cidr']"
+          :value="serverConfig['cluster-cidr']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.clusterCidr.label')"
+          @update:value="$emit('cluster-cidr-changed', $event)"
         />
       </div>
       <div
@@ -110,10 +116,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['service-cidr']"
+          :value="serverConfig['service-cidr']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.serviceCidr.label')"
+          @update:value="$emit('service-cidr-changed', $event)"
         />
       </div>
     </div>
@@ -124,10 +131,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['cluster-dns']"
+          :value="serverConfig['cluster-dns']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.dns.label')"
+          @update:value="$emit('cluster-dns-changed', $event)"
         />
       </div>
       <div
@@ -135,10 +143,11 @@ export default {
         class="col span-6"
       >
         <LabeledInput
-          v-model:value="serverConfig['cluster-domain']"
+          :value="serverConfig['cluster-domain']"
           :mode="mode"
           :disabled="isEdit"
           :label="t('cluster.rke2.address.domain.label')"
+          @update:value="$emit('cluster-domain-changed', $event)"
         />
       </div>
     </div>
@@ -149,9 +158,10 @@ export default {
     >
       <div class="col span-6">
         <LabeledInput
-          v-model:value="serverConfig['service-node-port-range']"
+          :value="serverConfig['service-node-port-range']"
           :mode="mode"
           :label="t('cluster.rke2.address.nodePortRange.label')"
+          @update:value="$emit('service-node-port-range-changed', $event)"
         />
       </div>
       <div
@@ -165,7 +175,7 @@ export default {
           :mode="mode"
           :label="t('cluster.rke2.truncateHostnames')"
           data-testid="network-tab-truncate-hostname"
-          @update:value="$emit('truncate-hostname', $event)"
+          @update:value="$emit('truncate-hostname-changed', $event)"
         />
         <Banner
           v-if="hostnameTruncationManuallySet"
@@ -184,18 +194,21 @@ export default {
     >
       <div class="col span-6">
         <ArrayList
-          v-model:value="serverConfig['tls-san']"
+          :value="serverConfig['tls-san']"
           :protip="false"
           :mode="mode"
           :title="t('cluster.rke2.address.tlsSan.label')"
+          @update:value="$emit('tls-san-changed', $event)"
         />
       </div>
     </div>
-
+    <h3 v-t="'cluster.tabs.ace'" />
     <ACE
-      v-model:value="localValue"
+      v-model:value="localValue.spec.localClusterAuthEndpoint"
       :mode="mode"
-      @update:value="$emit('input', $event)"
+      @fqdn-changed="$emit('fqdn-changed', $event)"
+      @caCerts-changed="$emit('ca-certs-changed', $event)"
+      @local-cluster-auth-endpoint-changed="$emit('local-cluster-auth-endpoint-changed', $event)"
     />
   </div>
 </template>
diff --git a/shell/edit/service.vue b/shell/edit/service.vue
index d28f99ce6e..045dea57a0 100644
--- a/shell/edit/service.vue
+++ b/shell/edit/service.vue
@@ -259,7 +259,6 @@ export default {
   methods: {
     updateMatchingPods: throttle(function() {
       const { value: { spec: { selector = { } } } } = this;
-      // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
       const allInNamespace = this.allPods.filter((pod) => pod.metadata.namespace === this.value?.metadata?.namespace);
 
       if (isEmpty(selector)) {
@@ -287,7 +286,7 @@ export default {
 
         const hash = {
           provClusters:     this.$store.dispatch('management/findAll', { type: CAPI.RANCHER_CLUSTER }),
-          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+          pods:             this.$store.dispatch(`${ inStore }/findAll`, { type: POD }), // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
           harvesterConfigs: this.$store.dispatch(`management/findAll`, { type: HCI.HARVESTER_CONFIG }),
         };
 
diff --git a/shell/list/management.cattle.io.setting.vue b/shell/list/management.cattle.io.setting.vue
index fea47f6024..9b5c69461d 100644
--- a/shell/list/management.cattle.io.setting.vue
+++ b/shell/list/management.cattle.io.setting.vue
@@ -62,16 +62,31 @@ export default {
     return { settings: null };
   },
 
-  computed: { ...mapGetters({ t: 'i18n/t' }) },
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+    ...mapGetters({
+      // Use either these Vuex getters
+      // OR the props to set the action menu state,
+      // but don't use both.
+      targetElem: 'action-menu/elem',
+      shouldShow: 'action-menu/showing',
+    }),
+  },
 
   methods: {
-    showActionMenu(e, setting) {
+    toggleActionMenu(e, setting) {
       const actionElement = e.srcElement;
 
-      this.$store.commit(`action-menu/show`, {
-        resources: setting.data,
-        elem:      actionElement
-      });
+      if (!this.targetElem && !this.shouldShow) {
+        this.$store.commit(`action-menu/show`, {
+          resources: setting.data,
+          elem:      actionElement
+        });
+      } else if (this.targetElem === actionElement && this.shouldShow) {
+        // this condition is needed so that we can "toggle" the action menu with
+        // the keyboard for accessibility (row action menu)
+        this.$store.commit('action-menu/hide');
+      }
     },
   }
 };
@@ -101,7 +116,7 @@ export default {
             <span
               v-if="setting.fromEnv"
               class="modified"
-            >Set by Environment Variable</span>
+            >{{ t('advancedSettings.setEnv') }}</span>
             <span
               v-else-if="setting.customized"
               class="modified"
@@ -118,23 +133,27 @@ export default {
             aria-expanded="false"
             type="button"
             class="btn btn-sm role-multi-action actions"
-            @click="showActionMenu($event, setting)"
+            role="button"
+            :aria-label="t('advancedSettings.edit.label')"
+            @click="toggleActionMenu($event, setting)"
           >
             <i class="icon icon-actions" />
           </button>
         </div>
       </div>
       <div value>
-        <div v-if="setting.hide">
+        <div v-if="setting.canHide">
           <button
             class="btn btn-sm role-primary"
+            role="button"
+            :aria-label="t('advancedSettings.hideShow')"
             @click="setting.hide = !setting.hide"
           >
-            {{ t('advancedSettings.show') }} {{ setting.id }}
+            {{ setting.hide ? t('advancedSettings.show') : t('advancedSettings.hide') }} {{ setting.id }}
           </button>
         </div>
         <div
-          v-else
+          v-show="!setting.canHide || (setting.canHide && !setting.hide)"
           class="settings-value"
         >
           <pre v-if="setting.kind === 'json'">{{ setting.json }}</pre>
@@ -146,14 +165,6 @@ export default {
             class="text-muted"
           >&lt;{{ t('advancedSettings.none') }}&gt;</pre>
         </div>
-        <div v-if="setting.canHide && !setting.hide">
-          <button
-            class="btn btn-sm role-primary"
-            @click="setting.hide = !setting.hide"
-          >
-            {{ t('advancedSettings.hide') }} {{ setting.id }}
-          </button>
-        </div>
       </div>
     </div>
   </div>
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index c01c022274..0b57916996 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -20,7 +20,7 @@ export default {
 
   methods: {
     /**
-     * opts: FetchSecondaryResourcesOpts
+     * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
diff --git a/shell/list/node.vue b/shell/list/node.vue
index cc4c6303b0..26cb9f7f39 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
@@ -19,6 +19,7 @@ import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
 import { mapGetters } from 'vuex';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name: 'ListNode',
@@ -185,19 +186,25 @@ export default defineComponent({
       row['displayLabels'] = !row.displayLabels;
     },
 
-    fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      const hash: { [key: string]: Promise<any>} = {};
+    /**
+     * of type PagTableFetchSecondaryResources
+     */
+    async fetchSecondaryResources({ canPaginate }: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
+      if (canPaginate) {
+        return;
+      }
+      const promises = [];
 
       if (this.canViewMgmtNodes) {
-        hash.mgmtNodes = this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE });
+        promises.push(this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE }));
       }
 
       if (this.canViewNormanNodes) {
-        hash.normanNodes = this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
+        promises.push(this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE }));
       }
 
       if (this.canViewMachines) {
-        hash.machines = this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE });
+        promises.push(this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE }));
       }
 
       if (this.canViewPods) {
@@ -205,7 +212,7 @@ export default defineComponent({
         this.$store.dispatch(`cluster/findAll`, { type: POD });
       }
 
-      return hash;
+      await Promise.all(promises);
     },
 
     /**
@@ -215,7 +222,7 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {
         return;
       }
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index 1daf5583b1..86993716b1 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -1,9 +1,10 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { PVC } from '@shell/config/types';
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { FilterArgs, PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name: 'ListPersistentVolume',
@@ -38,8 +39,15 @@ export default defineComponent({
   },
 
   methods: {
-    fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      return { pvc: this.$store.dispatch(`cluster/findAll`, { type: PVC }) };
+    /**
+     * of type PagTableFetchSecondaryResources
+     */
+    async fetchSecondaryResources({ canPaginate }: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
+      if (canPaginate) {
+        return;
+      }
+
+      return this.$store.dispatch(`cluster/findAll`, { type: PVC });
     },
 
     /**
@@ -47,7 +55,7 @@ export default defineComponent({
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
-    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+    async fetchPageSecondaryResources({ canPaginate, force, page }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!page?.length) {
         return;
       }
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 458785c919..b8ce2b2f05 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -24,7 +24,7 @@ export default {
 
   methods: {
     /**
-     * opts: FetchSecondaryResourcesOpts
+     * of type PagTableFetchSecondaryResources
      */
     async fetchSecondaryResources(opts) {
       const inStore = this.$store.getters['currentStore']();
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index 18907e605c..932ea661c1 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -159,6 +159,10 @@ export default {
     }
   },
 
+  typeDisplay() {
+    // Used by shell/components/ResourceList/index.vue to override list title (usually found via schema, which doesn't exist for this virtual type)
+    return this.$store.getters['type-map/labelFor'](this.schema || workloadSchema, 99);
+  },
 };
 </script>
 
diff --git a/shell/mixins/chart.js b/shell/mixins/chart.js
index c9dc554dd9..4a64bc9386 100644
--- a/shell/mixins/chart.js
+++ b/shell/mixins/chart.js
@@ -182,9 +182,12 @@ export default {
       }
 
       if (this.existing && this.existing.upgradeAvailable === APP_UPGRADE_STATUS.NOT_APPLICABLE) {
+        const manager = this.existing?.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.MANAGED] || 'Rancher';
+
         warnings.unshift(this.t('catalog.install.warning.managed', {
           name:    this.existing.name,
-          version: this.chart ? this.query.versionName : null
+          version: this.chart ? this.query.versionName : null,
+          manager: manager === 'true' ? 'Rancher' : manager
         }, true));
       }
 
diff --git a/shell/mixins/vue-select-overrides.js b/shell/mixins/vue-select-overrides.js
index e8e3e3bce5..a4721a6ceb 100644
--- a/shell/mixins/vue-select-overrides.js
+++ b/shell/mixins/vue-select-overrides.js
@@ -1,5 +1,8 @@
 
 export default {
+  data() {
+    return { overridesMixinPreventDoubleTriggerKeysOpen: false };
+  },
   methods: {
     mappedKeys(map, vm) {
       // Defaults found at - https://github.com/sagalbot/vue-select/blob/master/src/components/Select.vue#L947
@@ -13,31 +16,19 @@ export default {
         }
 
         e.preventDefault();
-
-        const optsLen = vm.filteredOptions.length;
-        const typeAheadPointer = vm.typeAheadPointer;
-
-        if (e.shiftKey) {
-          if (typeAheadPointer === 0) {
-            return vm.onEscape();
-          }
-
-          return vm.typeAheadUp();
-        }
-        if (typeAheadPointer + 1 === optsLen) {
-          return vm.onEscape();
-        }
-
-        return vm.typeAheadDown();
       });
 
+      // escape
       (out[27] = (e) => {
         vm.open = false;
         vm.search = '';
 
+        this.$refs.select.focus();
+
         return false;
       });
 
+      // enter
       (out[13] = (e, opt) => {
         if (!vm.open) {
           vm.open = true;
@@ -60,6 +51,9 @@ export default {
           vm.$emit('option:selected', option);
 
           if (vm.closeOnSelect) {
+            // this ties in to the Select component implementation
+            // so that the enter key handler doesn't open the dropdown again
+            this.overridesMixinPreventDoubleTriggerKeysOpen = true;
             vm.open = false;
             vm.typeAheadPointer = -1;
           }
diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index f046efea82..4122ab81b0 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -42,7 +42,9 @@ export default class CatalogApp extends SteveModel {
 
   get warnDeletionMessage() {
     if (this.upgradeAvailable === APP_UPGRADE_STATUS.NOT_APPLICABLE) {
-      return this.t('catalog.delete.warning.managed', { name: this.name });
+      const manager = this.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.MANAGED] || 'Rancher';
+
+      return this.t('catalog.delete.warning.managed', { manager: manager === 'true' ? 'Rancher' : manager, name: this.name });
     }
 
     return null;
diff --git a/shell/models/catalog.cattle.io.clusterrepo.js b/shell/models/catalog.cattle.io.clusterrepo.js
index 8241c45b67..494bd19f3b 100644
--- a/shell/models/catalog.cattle.io.clusterrepo.js
+++ b/shell/models/catalog.cattle.io.clusterrepo.js
@@ -2,6 +2,7 @@ import { parse } from '@shell/utils/url';
 import { CATALOG } from '@shell/config/labels-annotations';
 import { insertAt } from '@shell/utils/array';
 import { CATALOG as CATALOG_TYPE } from '@shell/config/types';
+import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
 
 import SteveModel from '@shell/plugins/steve/steve-class';
 
@@ -12,18 +13,40 @@ export default class ClusterRepo extends SteveModel {
     }
   }
 
+  get _isClusterRepoDisabled() {
+    return this.spec?.enabled === false;
+  }
+
   get _availableActions() {
     const out = super._availableActions;
 
     insertAt(out, 0, { divider: true });
 
-    insertAt(out, 0, {
-      action:   'refresh',
-      label:    this.t('action.refresh'),
-      icon:     'icon icon-refresh',
-      enabled:  !!this.links.update,
-      bulkable: true,
-    });
+    if (this._isClusterRepoDisabled) {
+      insertAt(out, 1, {
+        action:   'enableClusterRepo',
+        label:    this.t('action.enable'),
+        icon:     'icon icon-play',
+        enabled:  true,
+        bulkable: true,
+      });
+    } else {
+      insertAt(out, 1, {
+        action:   'disableClusterRepo',
+        label:    this.t('action.disable'),
+        icon:     'icon icon-pause',
+        enabled:  true,
+        bulkable: true,
+      });
+
+      insertAt(out, 0, {
+        action:   'refresh',
+        label:    this.t('action.refresh'),
+        icon:     'icon icon-refresh',
+        enabled:  !!this.links.update,
+        bulkable: true,
+      });
+    }
 
     return out;
   }
@@ -39,6 +62,16 @@ export default class ClusterRepo extends SteveModel {
     this.$dispatch('catalog/load', { force: true, reset: true }, { root: true });
   }
 
+  async disableClusterRepo() {
+    this.spec.enabled = false;
+    await this.save();
+  }
+
+  async enableClusterRepo() {
+    this.spec.enabled = true;
+    await this.save();
+  }
+
   get isGit() {
     return !!this.spec?.gitRepo;
   }
@@ -157,6 +190,22 @@ export default class ClusterRepo extends SteveModel {
     } : undefined;
   }
 
+  get stateDisplay() {
+    if (this._isClusterRepoDisabled) {
+      return this.t('generic.disabled');
+    } else {
+      return stateDisplay(this.state);
+    }
+  }
+
+  get stateBackground() {
+    if (this._isClusterRepoDisabled) {
+      return 'badge-disabled';
+    } else {
+      return colorForState(this.state, this.stateObj?.error, this.stateObj?.transitioning).replace('text-', 'bg-');
+    }
+  }
+
   waitForOperation(operationId, timeout, interval = 2000) {
     return this.waitForTestFn(() => {
       if (!this.$getters['schemaFor'](CATALOG_TYPE.OPERATION)) {
diff --git a/shell/models/fleet.cattle.io.bundle.js b/shell/models/fleet.cattle.io.bundle.js
index 9e3443e67f..f2609e7374 100644
--- a/shell/models/fleet.cattle.io.bundle.js
+++ b/shell/models/fleet.cattle.io.bundle.js
@@ -6,17 +6,6 @@ import { FLEET } from '@shell/config/types';
 import { convertSelectorObj, matching } from '@shell/utils/selector';
 
 export default class FleetBundle extends SteveModel {
-  get deploymentInfo() {
-    const ready = this.status?.summary?.ready || 0;
-    const total = this.status?.summary?.desiredReady || 0;
-
-    return {
-      ready,
-      unready: total - ready,
-      total
-    };
-  }
-
   get lastUpdateTime() {
     return this.status?.conditions?.[0].lastUpdateTime;
   }
diff --git a/shell/models/fleet.cattle.io.cluster.js b/shell/models/fleet.cattle.io.cluster.js
index ace76744c0..92d9870d15 100644
--- a/shell/models/fleet.cattle.io.cluster.js
+++ b/shell/models/fleet.cattle.io.cluster.js
@@ -1,5 +1,5 @@
 import { LOCAL_CLUSTER, MANAGEMENT, NORMAN } from '@shell/config/types';
-import { CAPI, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
+import { CAPI, FLEET as FLEET_LABELS, SYSTEM_LABELS } from '@shell/config/labels-annotations';
 import { _RKE2 } from '@shell/store/prefs';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { escapeHtml } from '@shell/utils/string';
@@ -190,6 +190,22 @@ export default class FleetCluster extends SteveModel {
     }
   }
 
+  get customLabels() {
+    const parsedLabels = [];
+
+    if (this.labels) {
+      for (const k in this.labels) {
+        const [prefix] = k.split('/');
+
+        if (!SYSTEM_LABELS.includes(prefix) && k !== CAPI.PROVIDER) {
+          parsedLabels.push(`${ k }=${ this.labels[k] }`);
+        }
+      }
+    }
+
+    return parsedLabels;
+  }
+
   async saveYaml(yaml) {
     await this._saveYaml(yaml);
 
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 247f36293a..2ba96e4f17 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -1,5 +1,6 @@
 import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
+import isEmpty from 'lodash/isEmpty';
 import { escapeHtml } from '@shell/utils/string';
 import { FLEET } from '@shell/config/types';
 import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
@@ -7,7 +8,7 @@ import { addObject, addObjects, findBy, insertAt } from '@shell/utils/array';
 import { set } from '@shell/utils/object';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import {
-  colorForState, mapStateToEnum, primaryDisplayStatusFromCount, stateDisplay, stateSort
+  colorForState, mapStateToEnum, primaryDisplayStatusFromCount, stateDisplay, STATES_ENUM, stateSort,
 } from '@shell/plugins/dashboard-store/resource-class';
 import { NAME } from '@shell/config/product/explorer';
 import FleetUtils from '@shell/utils/fleet';
@@ -20,6 +21,26 @@ function quacksLikeAHash(str) {
   return false;
 }
 
+function normalizeStateCounts(data) {
+  if (isEmpty(data)) {
+    return {
+      total:  0,
+      states: {},
+    };
+  }
+  const { desiredReady, ...rest } = data ;
+  const states = Object.entries(rest).reduce((res, [key, value]) => {
+    res[mapStateToEnum(key)] = value;
+
+    return res;
+  }, {});
+
+  return {
+    total: desiredReady,
+    states,
+  };
+}
+
 export default class GitRepo extends SteveModel {
   applyDefaults() {
     const spec = this.spec || {};
@@ -305,18 +326,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get bundles() {
-    const all = this.$getters['all'](FLEET.BUNDLE);
-
-    return all.filter((bundle) => bundle.repoName === this.name &&
-      bundle.namespace === this.namespace &&
-      bundle.namespacedName.startsWith(`${ this.namespace }:${ this.name }`));
-  }
-
-  /**
-   * Bundles with state of active
-   */
-  get bundlesReady() {
-    return this.bundles?.filter((bundle) => bundle.state === 'active');
+    return this.$getters['matching'](FLEET.BUNDLE, { 'fleet.cattle.io/repo-name': this.name }, this.namespace);
   }
 
   get bundleDeployments() {
@@ -325,6 +335,65 @@ export default class GitRepo extends SteveModel {
     return bds.filter((bd) => bd.metadata?.labels?.['fleet.cattle.io/repo-name'] === this.name);
   }
 
+  get allBundlesStatuses() {
+    const bundleDeploymentCountsPerBundle = this.bundleDeployments.reduce((acc, bd) => {
+      const bundleId = FleetUtils.bundleIdFromBundleDeploymentLabels(bd.metadata?.labels);
+      const state = mapStateToEnum(FleetUtils.bundleDeploymentState(bd));
+
+      if (!acc[bundleId]) {
+        acc[bundleId] = {
+          total:  0,
+          states: { [STATES_ENUM.READY]: 0 },
+        };
+      }
+      acc[bundleId].total++;
+
+      if (!acc[bundleId].states[state]) {
+        acc[bundleId].states[state] = 0;
+      }
+      acc[bundleId].states[state]++;
+
+      return acc;
+    }, {});
+    const bundleIds = Object.keys(bundleDeploymentCountsPerBundle);
+
+    return bundleIds.reduce((acc, bundleId) => {
+      const state = primaryDisplayStatusFromCount(bundleDeploymentCountsPerBundle[bundleId].states);
+
+      if (!acc.states[state]) {
+        acc.states[state] = 0;
+      }
+      acc.states[state]++;
+
+      return acc;
+    }, { total: bundleIds.length, states: { [STATES_ENUM.READY]: 0 } } );
+  }
+
+  get allResourceStatuses() {
+    return normalizeStateCounts(this.status?.resourceCounts || {});
+  }
+
+  statusResourceCountsForCluster(clusterId) {
+    if (!this.targetClusters.some((c) => c.id === clusterId)) {
+      return {};
+    }
+
+    return this.bundleDeployments
+      .filter((bd) => FleetUtils.clusterIdFromBundleDeploymentLabels(bd.metadata?.labels) === clusterId)
+      .map((bd) => FleetUtils.resourcesFromBundleDeploymentStatus(bd.status))
+      .flat()
+      .map((r) => r.state)
+      .reduce((prev, state) => {
+        if (!prev[state]) {
+          prev[state] = 0;
+        }
+        prev[state]++;
+        prev.desiredReady++;
+
+        return prev;
+      }, { desiredReady: 0 });
+  }
+
   get resourcesStatuses() {
     const bundleDeployments = this.bundleDeployments || [];
     const clusters = (this.targetClusters || []).reduce((res, c) => {
@@ -357,7 +426,7 @@ export default class GitRepo extends SteveModel {
           name:   `c-cluster-product-resource${ r.namespace ? '-namespace' : '' }-id`,
           params: {
             product:   NAME,
-            cluster:   c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME],
+            cluster:   c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME], // explorer uses the "management" Cluster name, which differs from the Fleet Cluster name
             resource:  type,
             namespace: r.namespace,
             id:        r.name,
@@ -385,7 +454,6 @@ export default class GitRepo extends SteveModel {
           creationTimestamp: r.createdAt,
 
           // other properties
-          clusterLabel:    c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME],
           stateBackground: color,
           stateDisplay:    display,
           stateSort:       stateSort(color, display),
@@ -408,42 +476,10 @@ export default class GitRepo extends SteveModel {
     };
   }
 
-  get clusterResourceStatus() {
-    const clusterStatuses = this.resourcesStatuses.reduce((prev, curr) => {
-      const { clusterId, clusterLabel, state } = curr;
+  clusterState(clusterId) {
+    const resourceCounts = this.statusResourceCountsForCluster(clusterId);
 
-      if (!prev[clusterId]) {
-        prev[clusterId] = {
-          clusterLabel,
-          resourceCounts: { [state]: 0, desiredReady: 0 }
-
-        };
-      }
-
-      if (!prev[clusterId].resourceCounts[state]) {
-        prev[clusterId].resourceCounts[state] = 0;
-      }
-
-      prev[clusterId].resourceCounts[state] += 1;
-      prev[clusterId].resourceCounts.desiredReady += 1;
-
-      return prev;
-    }, {});
-
-    const values = Object.keys(clusterStatuses).map((key) => {
-      const { clusterLabel, resourceCounts } = clusterStatuses[key];
-
-      return {
-        clusterId: key,
-        clusterLabel, // FLEET LABEL
-        status:    {
-          displayStatus:  primaryDisplayStatusFromCount(resourceCounts),
-          resourceCounts: { ...resourceCounts }
-        }
-      };
-    });
-
-    return values;
+    return primaryDisplayStatusFromCount(resourceCounts) || STATES_ENUM.ACTIVE;
   }
 
   get clustersList() {
diff --git a/shell/models/provisioning.cattle.io.cluster.js b/shell/models/provisioning.cattle.io.cluster.js
index e5c14c5d13..da88bdb4b5 100644
--- a/shell/models/provisioning.cattle.io.cluster.js
+++ b/shell/models/provisioning.cattle.io.cluster.js
@@ -5,7 +5,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 import { findBy } from '@shell/utils/array';
 import { get, set } from '@shell/utils/object';
 import { sortBy } from '@shell/utils/sort';
-import { ucFirst } from '@shell/utils/string';
+import { escapeHtml, ucFirst } from '@shell/utils/string';
 import { compare } from '@shell/utils/version';
 import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
@@ -178,7 +178,15 @@ export default class ProvCluster extends SteveModel {
       });
     }
 
-    return actions.concat(out);
+    const all = actions.concat(out);
+
+    // If we have a helper that wants to modify the available actions, let it do it
+    if (this.customProvisionerHelper?.availableActions) {
+      // Provider can either modify the provided list or return one of its own
+      return this.customProvisionerHelper?.availableActions(this, all) || all;
+    }
+
+    return all;
   }
 
   get normanCluster() {
@@ -401,6 +409,11 @@ export default class ProvCluster extends SteveModel {
   }
 
   get provisionerDisplay() {
+    // Allow a model extension to override the display of the provisioner
+    if (this.customProvisionerHelper?.provisionerDisplay) {
+      return this.customProvisionerHelper?.provisionerDisplay(this);
+    }
+
     let provisioner = (this.provisioner || '').toLowerCase();
 
     // RKE provisioner can actually do K3s too...
@@ -496,6 +509,10 @@ export default class ProvCluster extends SteveModel {
   }
 
   get machineProviderDisplay() {
+    if (this.customProvisionerHelper?.machineProviderDisplay) {
+      return this.customProvisionerHelper?.machineProviderDisplay(this);
+    }
+
     if ( this.isImported ) {
       return null;
     }
@@ -954,6 +971,34 @@ export default class ProvCluster extends SteveModel {
     if ( res?._status === 204 ) {
       await this.$dispatch('ws.resource.remove', { data: this });
     }
+
+    // If this cluster has a custom provisioner, allow it to do custom deletion
+    if (this.customProvisionerHelper?.postDelete) {
+      return this.customProvisionerHelper?.postDelete(this);
+    }
+  }
+
+  /**
+   * Get the custom provisioner helper for this model
+   */
+  get customProvisionerHelper() {
+    // Find the first model extension that says it can be used for this model
+    return this.modelExtensions.find((modelExt) => modelExt.useFor ? modelExt.useFor(this) : false);
+  }
+
+  get groupByParent() {
+    // Customer helper can report if the cluster has a parent cluster
+    return this.customProvisionerHelper?.parentCluster?.(this);
+  }
+
+  get groupByLabel() {
+    const name = this.groupByParent;
+
+    if (name) {
+      return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
+    } else {
+      return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInACluster');
+    }
   }
 
   get hasError() {
diff --git a/shell/models/service.js b/shell/models/service.js
index 4f28b95fde..cb15d80bc5 100644
--- a/shell/models/service.js
+++ b/shell/models/service.js
@@ -138,6 +138,7 @@ export default class extends SteveModel {
 
   async fetchPods() {
     if (this.podRelationship) {
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       await this.$dispatch('cluster/findMatching', {
         type:      POD,
         selector:  this.podRelationship.selector,
diff --git a/shell/models/workload.js b/shell/models/workload.js
index 5e42571dc9..9e1b79444f 100644
--- a/shell/models/workload.js
+++ b/shell/models/workload.js
@@ -554,6 +554,7 @@ export default class Workload extends WorkloadService {
     if (podRelationship) {
       const pods = this.$getters['podsByNamespace'](this.metadata.namespace);
 
+      // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
       return pods.filter((obj) => {
         return matches(obj, podRelationship.selector);
       });
@@ -594,6 +595,23 @@ export default class Workload extends WorkloadService {
     return (get(this, 'metadata.relationships') || []).filter((relationship) => relationship.toType === WORKLOAD_TYPES.JOB);
   }
 
+  /**
+   * Ensure the store has all matching jobs
+   */
+  async matchingJobs() {
+    if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
+      return undefined;
+    }
+
+    // This will be 1 request per relationship, though there's not likely to be many per cron job
+    return Promise.all(this.jobRelationships.map((obj) => {
+      return this.$dispatch('find', { type: WORKLOAD_TYPES.JOB, id: obj.toId });
+    }));
+  }
+
+  /**
+   * Expects all required pods are fetched upfront
+   */
   get jobs() {
     if (this.type !== WORKLOAD_TYPES.CRON_JOB) {
       return undefined;
@@ -643,12 +661,12 @@ export default class Workload extends WorkloadService {
   }
 
   async matchingPods() {
+    // Used in conjunction with `matches/match/label selectors`. Requires https://github.com/rancher/dashboard/issues/10417 to fix
     const all = await this.$dispatch('findAll', { type: POD });
     const allInNamespace = all.filter((pod) => pod.metadata.namespace === this.metadata.namespace);
 
     const selector = convertSelectorObj(this.spec.selector);
 
-    // See https://github.com/rancher/dashboard/issues/10417, all pods bad, need to replace local selector somehow
     return matching(allInNamespace, selector);
   }
 
diff --git a/shell/package.json b/shell/package.json
index bca7c27157..c2d756c151 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rancher/shell",
-  "version": "3.0.1",
+  "version": "3.0.2-rc.2",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
     "@aws-sdk/client-eks": "3.1.0",
     "@aws-sdk/client-iam": "3.658.1",
     "@aws-sdk/client-kms": "3.8.1",
-    "@babel/plugin-proposal-optional-chaining": "7.14.5",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
     "@babel/preset-typescript": "7.16.7",
@@ -64,7 +64,7 @@
     "cookie": "0.7.0",
     "core-js": "3.40.0",
     "cron-validator": "1.3.1",
-    "cronstrue": "2.50.0",
+    "cronstrue": "2.53.0",
     "cross-env": "7.0.3",
     "css-loader": "6.7.3",
     "csv-loader": "3.0.3",
@@ -77,6 +77,7 @@
     "diff2html": "3.4.24",
     "dompurify": "2.5.4",
     "element-matches": "^0.1.2",
+    "entities": "4.5.0",
     "eslint-config-standard": "16.0.3",
     "eslint-import-resolver-node": "0.3.4",
     "eslint-module-utils": "2.6.1",
@@ -90,6 +91,7 @@
     "express": "4.17.1",
     "file-saver": "2.0.2",
     "floating-vue": "5.2.2",
+    "focus-trap": "7.6.2",
     "frontmatter-markdown-loader": "3.7.0",
     "identicon.js": "2.3.3",
     "intl-messageformat": "7.8.4",
@@ -119,7 +121,7 @@
     "set-cookie-parser": "2.4.6",
     "shell-quote": "1.7.3",
     "sinon": "8.1.1",
-    "start-server-and-test": "1.13.1",
+    "start-server-and-test": "2.0.10",
     "style-loader": "1.2.1",
     "ts-node": "8.10.2",
     "typescript": "5.6.3",
diff --git a/shell/pages/c/_cluster/apps/charts/index.vue b/shell/pages/c/_cluster/apps/charts/index.vue
index 528a591cf3..af5722521c 100644
--- a/shell/pages/c/_cluster/apps/charts/index.vue
+++ b/shell/pages/c/_cluster/apps/charts/index.vue
@@ -455,6 +455,8 @@ export default {
           class="input-sm"
           :placeholder="t('catalog.charts.search')"
           data-testid="charts-filter-input"
+          :aria-label="t('catalog.charts.search')"
+          role="textbox"
         >
 
         <button
@@ -463,6 +465,8 @@ export default {
           @shortkey="focusSearch()"
         />
         <AsyncButton
+          role="button"
+          :aria-label="t('catalog.charts.refresh')"
           class="refresh-btn"
           mode="refresh"
           size="sm"
diff --git a/shell/pages/c/_cluster/explorer/ConfigBadge.vue b/shell/pages/c/_cluster/explorer/ConfigBadge.vue
index d88a054195..100d1b1bbc 100644
--- a/shell/pages/c/_cluster/explorer/ConfigBadge.vue
+++ b/shell/pages/c/_cluster/explorer/ConfigBadge.vue
@@ -24,18 +24,23 @@ export default {
 </script>
 
 <template>
-  <div class="config-badge">
+  <div
+    class="config-badge"
+  >
     <div>
-      <a
+      <button
         class="badge-install btn btn-sm role-secondary"
         data-testid="add-custom-cluster-badge"
+        role="button"
+        tabindex="0"
         @click="customBadgeDialog"
+        @keyup.space="customBadgeDialog"
       >
         <i
           v-clean-tooltip="tooltip"
           class="icon icon-brush-icon"
         />
-      </a>
+      </button>
     </div>
   </div>
 </template>
@@ -55,10 +60,6 @@ export default {
     > I {
       line-height: inherit;
     }
-
-    &:focus {
-      outline: 0;
-    }
   }
 
 </style>
diff --git a/shell/pages/c/_cluster/explorer/index.vue b/shell/pages/c/_cluster/explorer/index.vue
index 1c5e8218e7..92228517db 100644
--- a/shell/pages/c/_cluster/explorer/index.vue
+++ b/shell/pages/c/_cluster/explorer/index.vue
@@ -641,12 +641,14 @@ export default {
       <div data-testid="clusterProvider__label">
         <label>{{ t('glance.provider') }}: </label>
         <span v-if="isHarvesterCluster">
-          <a
+          <button
+            class="btn role-link harvester-cluster-link"
             role="button"
+            :aria-label="displayProvider"
             @click="goToHarvesterCluster"
           >
             {{ displayProvider }}
-          </a>
+          </button>
         </span>
         <span v-else>
           {{ displayProvider }}
@@ -682,6 +684,8 @@ export default {
         <router-link
           :to="{name: 'c-cluster-explorer-tools'}"
           class="cluster-tools-link"
+          role="link"
+          :aria-label="t('nav.clusterTools')"
         >
           <span>{{ t('nav.clusterTools') }}</span>
         </router-link>
@@ -871,6 +875,13 @@ export default {
   grid-row-gap: 20px;
 }
 
+.harvester-cluster-link {
+  line-height: inherit;
+  min-height: inherit;
+  padding: 0;
+  vertical-align: bottom;
+}
+
 @media only screen and (max-width: map-get($breakpoints, "--viewport-9")) {
   .extension-card-container {
     grid-template-columns: 1fr !important;
@@ -935,10 +946,6 @@ export default {
     line-height: inherit;
     margin-right: 4px;
   }
-
-  &:focus {
-    outline: 0;
-  }
 }
 
 .cert-table-link {
diff --git a/shell/pages/c/_cluster/fleet/index.vue b/shell/pages/c/_cluster/fleet/index.vue
index c067d44634..c42ba52cf1 100644
--- a/shell/pages/c/_cluster/fleet/index.vue
+++ b/shell/pages/c/_cluster/fleet/index.vue
@@ -2,7 +2,12 @@
 import { mapState } from 'vuex';
 import { FLEET } from '@shell/config/types';
 import { WORKSPACE } from '@shell/store/prefs';
-import { STATES_ENUM, STATES, getStateLabel } from '@shell/plugins/dashboard-store/resource-class';
+import {
+  getStateLabel,
+  primaryDisplayStatusFromCount,
+  STATES,
+  STATES_ENUM,
+} from '@shell/plugins/dashboard-store/resource-class';
 import Loading from '@shell/components/Loading';
 import CollapsibleCard from '@shell/components/CollapsibleCard.vue';
 import ResourceTable from '@shell/components/ResourceTable';
@@ -37,10 +42,15 @@ export default {
         inStoreType: 'management',
         type:        FLEET.CLUSTER_GROUP
       },
+      allBundleDeployments: {
+        inStoreType: 'management',
+        type:        FLEET.BUNDLE_DEPLOYMENT,
+      },
       allBundles: {
         inStoreType: 'management',
         type:        FLEET.BUNDLE,
         opt:         { excludeFields: ['metadata.managedFields', 'spec.resources'] },
+        skipWait:    true,
       },
       gitRepos: {
         inStoreType: 'management',
@@ -98,7 +108,6 @@ export default {
         }
       ],
       schema:              {},
-      allBundles:          [],
       gitRepos:            [],
       fleetWorkspacesData: [],
       isCollapsed:         {},
@@ -138,14 +147,24 @@ export default {
       });
     },
     workspacesData() {
-      return this.fleetWorkspaces.filter((ws) => ws.repos && ws.repos.length);
+      return this.fleetWorkspaces.filter((ws) => ws.counts.gitRepos > 0);
     },
     emptyWorkspaces() {
-      return this.fleetWorkspaces.filter((ws) => !ws.repos || !ws.repos.length);
+      return this.fleetWorkspaces.filter((ws) => ws.counts.gitRepos === 0);
     },
     areAllCardsExpanded() {
       return Object.keys(this.isCollapsed).every((key) => !this.isCollapsed[key]);
-    }
+    },
+    gitReposCounts() {
+      return this.gitRepos.reduce((prev, gitRepo) => {
+        prev[gitRepo.id] = {
+          bundles:   gitRepo.allBundlesStatuses,
+          resources: gitRepo.allResourceStatuses,
+        };
+
+        return prev;
+      }, {});
+    },
   },
   methods: {
     setWorkspaceFilterAndLinkToGitRepo(value) {
@@ -160,108 +179,71 @@ export default {
         },
       });
     },
-    getStatusInfo(area, row) {
+    getStatusInfo(area, row, rowCounts) {
       const defaultStatusInfo = {
         badgeClass: `${ STATES[STATES_ENUM.NOT_READY].color } badge-class-default`,
         icon:       STATES[STATES_ENUM.NOT_READY].compoundIcon
       };
 
       // classes are defined in the themes SASS files...
-      return this.getBadgeClassAndIcon(area, row) || defaultStatusInfo;
+      return this.getBadgeClassAndIcon(area, row, rowCounts) || defaultStatusInfo;
     },
-    getBadgeClassAndIcon(area, row) {
-      let group;
-
+    getBadgeClassAndIcon(area, row, rowCounts) {
       if (!this.admissableAreas.includes(area)) {
         return false;
       }
 
-      if (area === 'clusters') {
-        if (row.clusterInfo?.ready === row.clusterInfo?.total && row.clusterInfo?.ready) {
-          return {
-            badgeClass: STATES[STATES_ENUM.ACTIVE].color,
-            icon:       STATES[STATES_ENUM.ACTIVE].compoundIcon
-          };
-        }
-      } else if (area === 'bundles') {
-        group = row.bundles;
-      } else if (area === 'resources') {
-        group = row.status?.resources;
-      }
-
-      if (group?.length && group?.every((item) => item.state?.toLowerCase() === STATES_ENUM.ACTIVE)) {
-        return {
-          badgeClass: STATES[STATES_ENUM.ACTIVE].color ? STATES[STATES_ENUM.ACTIVE].color : `${ STATES[STATES_ENUM.UNKNOWN].color } bg-unmapped-state`,
-          icon:       STATES[STATES_ENUM.ACTIVE].compoundIcon ? STATES[STATES_ENUM.ACTIVE].compoundIcon : `${ STATES[STATES_ENUM.UNKNOWN].compoundIcon } unmapped-icon`
-        };
-      }
-      if (group?.length && group?.some((item) => item.state?.toLowerCase() === STATES_ENUM.ERR_APPLIED)) {
-        return {
-          badgeClass: STATES[STATES_ENUM.ERR_APPLIED].color ? STATES[STATES_ENUM.ERR_APPLIED].color : `${ STATES[STATES_ENUM.UNKNOWN].color } bg-unmapped-state`,
-          icon:       STATES[STATES_ENUM.ERR_APPLIED].compoundIcon ? STATES[STATES_ENUM.ERR_APPLIED].compoundIcon : `${ STATES[STATES_ENUM.UNKNOWN].compoundIcon } unmapped-icon`
-        };
-      }
-      if (group?.length && group?.some((item) => item.state?.toLowerCase() === STATES_ENUM.NOT_READY)) {
-        return {
-          badgeClass: STATES[STATES_ENUM.NOT_READY].color ? STATES[STATES_ENUM.NOT_READY].color : `${ STATES[STATES_ENUM.UNKNOWN].color } bg-unmapped-state`,
-          icon:       STATES[STATES_ENUM.NOT_READY].compoundIcon ? STATES[STATES_ENUM.NOT_READY].compoundIcon : `${ STATES[STATES_ENUM.UNKNOWN].compoundIcon } unmapped-icon`
-        };
-      }
-
-      if (area === 'resources') {
-        if (row.status?.resourceCounts?.desiredReady === row.status?.resourceCounts?.ready && row.status?.resourceCounts?.desiredReady) {
-          return {
-            badgeClass: STATES[STATES_ENUM.ACTIVE].color,
-            icon:       STATES[STATES_ENUM.ACTIVE].compoundIcon
-          };
-        }
-      }
-
-      return {
-        badgeClass: `${ STATES[STATES_ENUM.NOT_READY].color } badge-class-area-${ area }`,
-        icon:       STATES[STATES_ENUM.NOT_READY].compoundIcon
-      };
-    },
-    getTooltipInfo(area, row) {
       let group;
 
+      if (area === 'clusters') {
+        const clusterInfo = row.clusterInfo;
+        const state = clusterInfo.ready === clusterInfo.total ? STATES_ENUM.ACTIVE : STATES_ENUM.NOT_READY;
+
+        return {
+          badgeClass: `${ STATES[state].color } badge-class-area-${ area }`,
+          icon:       STATES[state].compoundIcon
+        };
+      } else if (area === 'bundles') {
+        group = rowCounts[row.id].bundles;
+      } else if (area === 'resources') {
+        group = rowCounts[row.id].resources;
+      } else {
+        // unreachable
+        return false;
+      }
+
+      if (group.total === group.states.ready) {
+        return {
+          badgeClass: STATES[STATES_ENUM.ACTIVE].color,
+          icon:       STATES[STATES_ENUM.ACTIVE].compoundIcon,
+        };
+      }
+      const state = primaryDisplayStatusFromCount(group.states);
+
+      return {
+        badgeClass: STATES[state].color ? STATES[state].color : `${ STATES[STATES_ENUM.UNKNOWN].color } bg-unmapped-state`,
+        icon:       STATES[state].compoundIcon ? STATES[state].compoundIcon : `${ STATES[STATES_ENUM.UNKNOWN].compoundIcon } unmapped-icon`
+      };
+    },
+    getTooltipInfo(area, row, rowCounts) {
       if (!this.admissableAreas.includes(area)) {
         return {};
       }
 
-      if (area === 'clusters') {
-        group = '';
-      } else if (area === 'bundles') {
-        group = row.bundles;
+      if (area === 'bundles') {
+        return this.generateTooltipData(rowCounts[row.id].bundles.states);
       } else if (area === 'resources') {
-        group = row.status?.resources;
-      }
-
-      if (group?.length) {
-        return this.generateTooltipData(group);
+        return this.generateTooltipData(rowCounts[row.id].resources.states);
       }
 
       return '';
     },
-    generateTooltipData(data) {
-      const infoObj = {};
-      let tooltipData = '';
-
-      data.forEach((item) => {
-        if (!infoObj[item.state]) {
-          infoObj[item.state] = 0;
-        }
-
-        infoObj[item.state]++;
-      });
-
-      Object.keys(infoObj).forEach((key) => {
-        tooltipData += `${ getStateLabel(key) }: ${ infoObj[key] }<br>`;
-      });
-
-      return tooltipData;
+    generateTooltipData(infoObj) {
+      return Object.keys(infoObj)
+        .filter((key) => infoObj[key] > 0) // filter zero values
+        .map((key) => `${ getStateLabel(key) }: ${ infoObj[key] }<br>`).join('');
     },
-    getBadgeValue(area, row) {
+    getBadgeValue(area, row, rowCounts) {
       let value;
 
       if (!this.admissableAreas.includes(area)) {
@@ -269,11 +251,15 @@ export default {
       }
 
       if (area === 'clusters') {
-        return `${ row.clusterInfo.ready }/${ row.clusterInfo.total }`;
+        value = `${ row.clusterInfo.ready }/${ row.clusterInfo.total }`;
       } else if (area === 'bundles') {
-        value = xOfy(row.bundlesReady?.length, row.bundles?.length);
+        const bundles = rowCounts[row.id].bundles;
+
+        value = xOfy(bundles.states.ready || 0, bundles.total);
       } else if (area === 'resources') {
-        value = xOfy(row.status?.resourceCounts?.ready, row.status?.resourceCounts?.desiredReady);
+        const resources = rowCounts[row.id].resources;
+
+        value = xOfy(resources.states.ready || 0, resources.total);
       }
 
       return value;
@@ -413,10 +399,10 @@ export default {
               <CompoundStatusBadge
                 v-else
                 data-testid="clusters-ready"
-                :tooltip-text="getTooltipInfo('clusters', row)"
-                :badge-class="getStatusInfo('clusters', row).badgeClass"
-                :icon="getStatusInfo('clusters', row).icon"
-                :value="getBadgeValue('clusters', row)"
+                :tooltip-text="getTooltipInfo('clusters', row, gitReposCounts)"
+                :badge-class="getStatusInfo('clusters', row, gitReposCounts).badgeClass"
+                :icon="getStatusInfo('clusters', row, gitReposCounts).icon"
+                :value="getBadgeValue('clusters', row, gitReposCounts)"
               />
             </template>
             <template #cell:bundlesReady="{row}">
@@ -424,19 +410,19 @@ export default {
               <CompoundStatusBadge
                 v-else
                 data-testid="bundles-ready"
-                :tooltip-text="getTooltipInfo('bundles', row)"
-                :badge-class="getStatusInfo('bundles', row).badgeClass"
-                :icon="getStatusInfo('bundles', row).icon"
-                :value="getBadgeValue('bundles', row)"
+                :tooltip-text="getTooltipInfo('bundles', row, gitReposCounts)"
+                :badge-class="getStatusInfo('bundles', row, gitReposCounts).badgeClass"
+                :icon="getStatusInfo('bundles', row, gitReposCounts).icon"
+                :value="getBadgeValue('bundles', row, gitReposCounts)"
               />
             </template>
             <template #cell:resourcesReady="{row}">
               <CompoundStatusBadge
                 data-testid="resources-ready"
-                :tooltip-text="getTooltipInfo('resources', row)"
-                :badge-class="getStatusInfo('resources', row).badgeClass"
-                :icon="getStatusInfo('resources', row).icon"
-                :value="getBadgeValue('resources', row)"
+                :tooltip-text="getTooltipInfo('resources', row, gitReposCounts)"
+                :badge-class="getStatusInfo('resources', row, gitReposCounts).badgeClass"
+                :icon="getStatusInfo('resources', row, gitReposCounts).icon"
+                :value="getBadgeValue('resources', row, gitReposCounts)"
               />
             </template>
 
diff --git a/shell/pages/diagnostic.vue b/shell/pages/diagnostic.vue
index 3a08b9ca45..4041efc987 100644
--- a/shell/pages/diagnostic.vue
+++ b/shell/pages/diagnostic.vue
@@ -346,21 +346,23 @@ export default {
           class="full-width"
         >
           <thead @click="toggleTable(cluster.id)">
-            <th colspan="4">
-              <div class="cluster-row">
-                <span>Cluster: <b>{{ cluster.name }}</b></span>
-                <span>Namespace: <b>{{ cluster.namespace }}</b></span>
-                <span>Total Resources: <b>{{ sumResourceCount(cluster.counts) }}</b></span>
-                <span>Nodes: <b>{{ nodeCount(cluster.counts) }}</b></span>
-                <i
-                  class="icon"
-                  :class="{
-                    'icon-chevron-down': !cluster.isTableVisible,
-                    'icon-chevron-up': cluster.isTableVisible
-                  }"
-                />
-              </div>
-            </th>
+            <tr>
+              <th colspan="4">
+                <div class="cluster-row">
+                  <span>Cluster: <b>{{ cluster.name }}</b></span>
+                  <span>Namespace: <b>{{ cluster.namespace }}</b></span>
+                  <span>Total Resources: <b>{{ sumResourceCount(cluster.counts) }}</b></span>
+                  <span>Nodes: <b>{{ nodeCount(cluster.counts) }}</b></span>
+                  <i
+                    class="icon"
+                    :class="{
+                      'icon-chevron-down': !cluster.isTableVisible,
+                      'icon-chevron-up': cluster.isTableVisible
+                    }"
+                  />
+                </div>
+              </th>
+            </tr>
           </thead>
           <tbody v-show="cluster.isTableVisible">
             <tr>
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index e1cca6320b..e148344b91 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -4,7 +4,7 @@ import { mapPref, AFTER_LOGIN_ROUTE, READ_WHATS_NEW, HIDE_HOME_PAGE_CARDS } from
 import { Banner } from '@components/Banner';
 import BannerGraphic from '@shell/components/BannerGraphic.vue';
 import IndentedPanel from '@shell/components/IndentedPanel.vue';
-import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts, FetchSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { BadgeState } from '@components/BadgeState';
 import CommunityLinks from '@shell/components/CommunityLinks.vue';
 import SingleClusterInfo from '@shell/components/SingleClusterInfo.vue';
@@ -28,6 +28,7 @@ import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-
 import { PaginationParamFilter, FilterArgs, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
 import { sameContents } from '@shell/utils/array';
+import { PagTableFetchPageSecondaryResourcesOpts, PagTableFetchSecondaryResourcesOpts, PagTableFetchSecondaryResourcesReturns } from '@shell/types/components/paginatedResourceTable';
 
 export default defineComponent({
   name:       'Home',
@@ -238,9 +239,9 @@ export default defineComponent({
 
   methods: {
     /**
-     * Of type FetchSecondaryResources
+     * Of type PagTableFetchSecondaryResources
      */
-    fetchSecondaryResources(opts: FetchSecondaryResourcesOpts): Promise<any> {
+    fetchSecondaryResources(opts: PagTableFetchSecondaryResourcesOpts): PagTableFetchSecondaryResourcesReturns {
       if (opts.canPaginate) {
         return Promise.resolve({});
       }
@@ -271,7 +272,7 @@ export default defineComponent({
 
     async fetchPageSecondaryResources({
       canPaginate, force, page, pagResult
-    }: FetchPageSecondaryResourcesOpts) {
+    }: PagTableFetchPageSecondaryResourcesOpts) {
       if (!canPaginate || !page?.length) {
         this.clusterCount = 0;
 
diff --git a/shell/plugins/dashboard-store/resource-class.js b/shell/plugins/dashboard-store/resource-class.js
index 38ea3e5bfc..586f4feffa 100644
--- a/shell/plugins/dashboard-store/resource-class.js
+++ b/shell/plugins/dashboard-store/resource-class.js
@@ -604,6 +604,10 @@ export default class Resource {
     return this.$ctx.rootState;
   }
 
+  get '$plugin'() {
+    return this.$ctx.rootState?.$plugin;
+  }
+
   get customValidationRules() {
     return [
       /**
diff --git a/shell/plugins/steve/mutations.js b/shell/plugins/steve/mutations.js
index 7e9b73e54c..bc0e575cfe 100644
--- a/shell/plugins/steve/mutations.js
+++ b/shell/plugins/steve/mutations.js
@@ -31,7 +31,7 @@ function registerNamespace(state, namespace) {
 }
 
 /**
- * update the podsByNamespace cache with new or changed pods
+ * update the podsByNamespace cache with new or changed pods.
  */
 function updatePodsByNamespaceCache(state, ctx, pods, loadAll) {
   if (loadAll) {
diff --git a/shell/plugins/steve/steve-class.js b/shell/plugins/steve/steve-class.js
index 71bb47049d..882407f0fc 100644
--- a/shell/plugins/steve/steve-class.js
+++ b/shell/plugins/steve/steve-class.js
@@ -2,6 +2,7 @@ import { DESCRIPTION } from '@shell/config/labels-annotations';
 import HybridModel from './hybrid-class';
 import { NEVER_ADD } from '@shell/utils/create-yaml';
 import { deleteProperty } from '@shell/utils/object';
+import { EXT_IDS } from '@shell/core/plugin';
 
 // Some fields that are removed for YAML (NEVER_ADD) are required via API
 const STEVE_ADD = [
@@ -41,6 +42,13 @@ export default class SteveModel extends HybridModel {
     this._description = value;
   }
 
+  /**
+   * Get all model extensions for this model
+   */
+  get modelExtensions() {
+    return this.$plugin.getDynamic(EXT_IDS.MODEL_EXTENSION, this.type) || [];
+  }
+
   cleanForSave(data, forNew) {
     const val = super.cleanForSave(data);
 
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 84eac5f4d0..ef94c2c5fc 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -157,6 +157,7 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: '_type' },
       { field: 'reason' },
       { field: 'involvedObject.kind' },
+      // { field: 'involvedObject.uid' }, // Pending API Support - https://github.com/rancher/rancher/issues/48603
       { field: 'message' },
     ],
     [CATALOG.CLUSTER_REPO]: [
@@ -431,7 +432,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
               // Check if the API supports filtering by this field
               this.validateField(validateFields, schema, field.field);
 
-              const exactPartial = field.exact ? `'${ field.value }'` : field.value;
+              const value = encodeURIComponent(field.value);
+              const exactPartial = field.exact ? `'${ value }'` : value;
 
               return `${ this.convertArrayPath(field.field) }${ field.equals ? '=' : '!=' }${ exactPartial }`;
             }
diff --git a/shell/scripts/test-plugins-build.sh b/shell/scripts/test-plugins-build.sh
index dccc6129dc..12ec421f23 100755
--- a/shell/scripts/test-plugins-build.sh
+++ b/shell/scripts/test-plugins-build.sh
@@ -141,6 +141,8 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   pushd test-app > /dev/null
 
   yarn install
+  # this is the "same" as doing a yarn dev (in a build sense)
+  # it's to make sure the dev environment is running properly
   FORCE_COLOR=true yarn build | cat
 
   # Add test list component to the test package
diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
index e52e8ad0d9..7649c04421 100755
--- a/shell/scripts/typegen.sh
+++ b/shell/scripts/typegen.sh
@@ -25,6 +25,7 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/config/labels-annotations.js --de
 # # store
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/features.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/prefs.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/store/plugins.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/store > /dev/null
 
 # # plugins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
diff --git a/shell/store/catalog.js b/shell/store/catalog.js
index 481df65e51..67e84da205 100644
--- a/shell/store/catalog.js
+++ b/shell/store/catalog.js
@@ -64,7 +64,7 @@ export const getters = {
     const clustered = state.clusterRepos || [];
     const namespaced = state.namespacedRepos || [];
 
-    return [...clustered, ...namespaced];
+    return [...clustered, ...namespaced].filter((r) => r.spec?.enabled !== false);
   },
 
   // Raw charts
diff --git a/shell/types/components/paginatedResourceTable.ts b/shell/types/components/paginatedResourceTable.ts
new file mode 100644
index 0000000000..ec3cef9cc2
--- /dev/null
+++ b/shell/types/components/paginatedResourceTable.ts
@@ -0,0 +1,25 @@
+import { StorePaginationResult } from '@shell/types/store/pagination.types';
+
+/**
+ * see {@link PagTableFetchSecondaryResources}
+ */
+export type PagTableFetchSecondaryResourcesOpts = { canPaginate: boolean }
+/**
+ * see {@link PagTableFetchSecondaryResources}
+ */
+export type PagTableFetchSecondaryResourcesReturns = Promise<any>
+/**
+ * Function to fetch resources that are required to supplement information needed by rows in a PaginatedResourceTable
+ *
+ * Used in scenarios where ALL resources are expected
+ */
+export type PagTableFetchSecondaryResources = (opts: PagTableFetchSecondaryResourcesOpts) => PagTableFetchSecondaryResourcesReturns
+
+/**
+ * see {@link PagTableFetchPageSecondaryResources}
+ */
+export type PagTableFetchPageSecondaryResourcesOpts = { canPaginate: boolean, force: boolean, page: any[], pagResult: StorePaginationResult }
+/**
+ * Function to fetch resources that are required to supplement information needed by a single page in a PaginatedResourceTable
+ */
+export type PagTableFetchPageSecondaryResources = (opts: PagTableFetchPageSecondaryResourcesOpts) => Promise<any>
diff --git a/shell/types/components/resourceLabeledSelect.ts b/shell/types/components/resourceLabeledSelect.ts
new file mode 100644
index 0000000000..c65b634218
--- /dev/null
+++ b/shell/types/components/resourceLabeledSelect.ts
@@ -0,0 +1,48 @@
+import { LabelSelectPaginationFunctionOptions } from '@shell/components/form/labeled-select-utils/labeled-select.utils';
+import { LabelSelectPaginateFn } from '@shell/types/components/labeledSelect';
+
+type PaginateTypeOverridesFn = (opts: LabelSelectPaginationFunctionOptions) => LabelSelectPaginationFunctionOptions;
+
+interface SharedSettings {
+  /**
+   * Provide specific LabelSelect options for this mode (paginated / not paginated)
+   */
+  labelSelectOptions?: { [key: string]: any },
+  /**
+   * Map, filter, tweak, etc the resources to show in the LabelSelect
+   */
+  updateResources?: (resources: any[]) => any[]
+}
+
+/**
+ * Settings to use when the LabelSelect is paginating
+ */
+export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
+  /**
+   * Override the convenience function which fetches a page of results
+   */
+  overrideRequest?: LabelSelectPaginateFn,
+  /**
+   * Override the default settings used in the convenience function to fetch a page of results
+   */
+  requestSettings?: PaginateTypeOverridesFn,
+}
+
+/**
+ * Settings to use when the LabelSelect is fetching all resources (not paginating)
+ */
+export type ResourceLabeledSelectSettings = SharedSettings
+
+/**
+ * Force a specific mode
+ */
+export enum RESOURCE_LABEL_SELECT_MODE {
+  /**
+   * Fetch all resources
+   */
+  ALL_RESOURCES = 'ALL', // eslint-disable-line no-unused-vars
+  /**
+   * Determine if all resources are fetched given system settings
+   */
+  DYNAMIC = 'DYNAMIC', // eslint-disable-line no-unused-vars
+}
diff --git a/shell/types/resources/fleet.d.ts b/shell/types/resources/fleet.d.ts
index 9b346f0a03..b887dbd3dc 100644
--- a/shell/types/resources/fleet.d.ts
+++ b/shell/types/resources/fleet.d.ts
@@ -24,10 +24,19 @@ export interface BundleNonReadyBundle {
   nonReadyStatus: BundleNonReadyResource[],
 }
 
+export interface Condition {
+  status: string,
+  type: string,
+}
+
 export interface BundleDeploymentStatus {
   resources?: BundleDeploymentResource[],
   modifiedStatus?: BundleModifiedResource[],
   nonReadyStatus?: BundleNonReadyResource[],
+  appliedDeploymentId?: string,
+  ready: boolean
+  nonModified: boolean
+  conditions: Condition[],
 }
 
 export interface BundleStatusSummary {
@@ -38,3 +47,11 @@ export interface BundleStatus {
   resourceKey?: BundleResourceKey[],
   summary?: BundleStatusSummary,
 }
+
+export interface BundleDeployment {
+  spec: {
+    deploymentId: string,
+    stagedDeploymentId: string,
+  }
+  status?: BundleDeploymentStatus
+}
diff --git a/shell/utils/auth.js b/shell/utils/auth.js
index e8bf7d2afa..d59bbf8a56 100644
--- a/shell/utils/auth.js
+++ b/shell/utils/auth.js
@@ -116,7 +116,11 @@ export const checkSchemasForFindAllHash = (types, store) => {
     const validSchema = value.schemaValidator ? value.schemaValidator(schema) : !!schema;
 
     if (validSchema) {
-      hash[key] = store.dispatch(`${ value.inStoreType }/findAll`, { type: value.type, opt: value.opt } );
+      const res = store.dispatch(`${ value.inStoreType }/findAll`, { type: value.type, opt: value.opt } );
+
+      if (!value.skipWait) {
+        hash[key] = res;
+      }
     }
   }
 
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index ac05751ae4..f34f2d22a1 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -4,6 +4,8 @@ import { CAPI } from '@shell/config/labels-annotations';
 import { MANAGEMENT, VIRTUAL_HARVESTER_PROVIDER } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import { PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { compare, sortable } from '@shell/utils/version';
+import { sortBy } from '@shell/utils/sort';
 
 /**
  * Combination of paginationFilterHiddenLocalCluster and paginationFilterOnlyKubernetesClusters
@@ -190,3 +192,107 @@ export function labelForAddon(store, name, configuration = true) {
 
   return store.getters['i18n/withFallback'](key, null, fallback);
 }
+
+function getMostRecentPatchVersions(sortedVersions) {
+  // Get the most recent patch version for each Kubernetes minor version.
+  const versionMap = {};
+
+  sortedVersions.forEach((version) => {
+    const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
+
+    if (!versionMap[majorMinor]) {
+      // Because we start with a sorted list of versions, we know the
+      // highest patch version is first in the list, so we only keep the
+      // first of each minor version in the list.
+      versionMap[majorMinor] = version.value;
+    }
+  });
+
+  return versionMap;
+}
+
+export function filterOutDeprecatedPatchVersions(allVersions, currentVersion) {
+  // Get the most recent patch version for each Kubernetes minor version.
+  const mostRecentPatchVersions = getMostRecentPatchVersions(allVersions);
+
+  const filteredVersions = allVersions.filter((version) => {
+    // Always show pre-releases
+    if (semver.prerelease(version.value)) {
+      return true;
+    }
+
+    const majorMinor = `${ semver.major(version.value) }.${ semver.minor(version.value) }`;
+
+    // Always show current version, else show if we haven't shown anything for this major.minor version yet
+    if (version.value === currentVersion || mostRecentPatchVersions[majorMinor] === version.value) {
+      return true;
+    }
+
+    return false;
+  });
+
+  return filteredVersions;
+}
+
+export function getAllOptionsAfterCurrentVersion(store, versions, currentVersion, defaultVersion) {
+  const out = (versions || []).filter((obj) => !!obj.serverArgs).map((obj) => {
+    let disabled = false;
+    let experimental = false;
+    let isCurrentVersion = false;
+    let label = obj.id;
+
+    if (currentVersion) {
+      disabled = compare(obj.id, currentVersion) < 0;
+      isCurrentVersion = compare(obj.id, currentVersion) === 0;
+    }
+
+    if (defaultVersion) {
+      experimental = compare(defaultVersion, obj.id) < 0;
+    }
+
+    if (isCurrentVersion) {
+      label = `${ label } ${ store.getters['i18n/t']('cluster.kubernetesVersion.current') }`;
+    }
+
+    if (experimental) {
+      label = `${ label } ${ store.getters['i18n/t']('cluster.kubernetesVersion.experimental') }`;
+    }
+
+    return {
+      label,
+      value:      obj.id,
+      sort:       sortable(obj.id),
+      serverArgs: obj.serverArgs,
+      agentArgs:  obj.agentArgs,
+      charts:     obj.charts,
+      disabled,
+    };
+  });
+
+  if (currentVersion && !out.find((obj) => obj.value === currentVersion)) {
+    out.push({
+      label: `${ currentVersion } ${ store.getters['i18n/t']('cluster.kubernetesVersion.current') }`,
+      value: currentVersion,
+      sort:  sortable(currentVersion),
+    });
+  }
+
+  const sorted = sortBy(out, 'sort:desc');
+
+  const mostRecentPatchVersions = getMostRecentPatchVersions(sorted);
+
+  const sortedWithDeprecatedLabel = sorted.map((optionData) => {
+    const majorMinor = `${ semver.major(optionData.value) }.${ semver.minor(optionData.value) }`;
+
+    if (mostRecentPatchVersions[majorMinor] === optionData.value) {
+      return optionData;
+    }
+
+    return {
+      ...optionData,
+      label: `${ optionData.label } ${ store.getters['i18n/t']('cluster.kubernetesVersion.deprecated') }`
+    };
+  });
+
+  return sortedWithDeprecatedLabel;
+}
diff --git a/shell/utils/fleet.ts b/shell/utils/fleet.ts
index 5921c1b234..272c7f8253 100644
--- a/shell/utils/fleet.ts
+++ b/shell/utils/fleet.ts
@@ -1,11 +1,13 @@
 import {
   BundleDeploymentResource,
   BundleResourceKey,
+  BundleDeployment,
   BundleDeploymentStatus,
   BundleStatus,
+  Condition,
 } from '@shell/types/resources/fleet';
 import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
-import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
+import { FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
 
 interface Resource extends BundleDeploymentResource {
   state: string,
@@ -28,6 +30,14 @@ function resourceKey(r: BundleResourceKey): string {
   return `${ r.kind }/${ r.namespace }/${ r.name }`;
 }
 
+function conditionIsTrue(conditions: Condition[] | undefined, type: string): boolean {
+  if (!conditions) {
+    return false;
+  }
+
+  return !!conditions.find((c) => c.type === type && c.status.toLowerCase() === 'true');
+}
+
 class Fleet {
   resourceId(r: BundleResourceKey): string {
     return r.namespace ? `${ r.namespace }/${ r.name }` : r.name;
@@ -147,11 +157,33 @@ class Fleet {
   }
 
   clusterIdFromBundleDeploymentLabels(labels?: Labels): string {
-    const clusterNamespace = labels?.[FLEET_ANNOTATIONS.CLUSTER_NAMESPACE];
-    const clusterName = labels?.[FLEET_ANNOTATIONS.CLUSTER];
+    const clusterNamespace = labels?.[FLEET_LABELS.CLUSTER_NAMESPACE];
+    const clusterName = labels?.[FLEET_LABELS.CLUSTER];
 
     return `${ clusterNamespace }/${ clusterName }`;
   }
+
+  bundleIdFromBundleDeploymentLabels(labels?: Labels): string {
+    const bundleNamespace = labels?.[FLEET_LABELS.BUNDLE_NAMESPACE];
+    const bundleName = labels?.[FLEET_LABELS.BUNDLE_NAME];
+
+    return `${ bundleNamespace }/${ bundleName }`;
+  }
+
+  bundleDeploymentState(bd: BundleDeployment): string {
+    // Ported from https://github.com/rancher/fleet/blob/534dbfdd6f74caf97bccd4cf977e42c5009b2432/internal/cmd/controller/summary/summary.go#L89
+    if (bd.status?.appliedDeploymentId !== bd.spec.deploymentId) {
+      return conditionIsTrue(bd.status?.conditions, 'Deployed') ? STATES_ENUM.WAIT_APPLIED : STATES_ENUM.ERR_APPLIED;
+    } else if (!bd.status?.ready) {
+      return STATES_ENUM.NOT_READY;
+    } else if (bd.spec.deploymentId !== bd.spec.stagedDeploymentId) {
+      return STATES_ENUM.OUT_OF_SYNC;
+    } else if (!bd.status?.nonModified) {
+      return STATES_ENUM.MODIFIED;
+    } else {
+      return STATES_ENUM.READY;
+    }
+  }
 }
 
 const instance = new Fleet();
diff --git a/shell/utils/ingress.ts b/shell/utils/ingress.ts
new file mode 100644
index 0000000000..048490e415
--- /dev/null
+++ b/shell/utils/ingress.ts
@@ -0,0 +1,64 @@
+import { SECRET, SERVICE } from '@shell/config/types';
+import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+import { VuexStore } from '@shell/types/store/vuex';
+
+/**
+ * Helper class for common functionality shared between the detail and edit ingress pages
+ *
+ * This could be an untyped mixin.. but this setups up us better for the future
+ */
+class IngressDetailEditHelper {
+  private $store: VuexStore;
+  private namespace: string;
+
+  constructor({
+    $store,
+    namespace,
+  }: {
+    $store: VuexStore
+    namespace: string,
+  }) {
+    this.$store = $store;
+    this.namespace = namespace;
+  }
+
+  /**
+   * Fetch services that will either be used to show
+   * - Create - the possible rule's target service
+   * - Edit - the selected and possible rule's target service
+   * - Detail - the selected rule's target service
+   */
+  async fetchServices(args?: { namespace: string}): Promise<any[]> {
+    return this.$store.dispatch('cluster/findAll', { type: SERVICE, opt: { namespaced: args?.namespace || this.namespace } });
+  }
+
+  /**
+   * Fetch secrets that will either be used to show
+   * - Create - the possible secrets to use as a certificates
+   * - Edit - the selected and possible secrets to use as a certificates
+   * - Detail - the selected secrets to use as certificates
+   */
+  async fetchSecrets(args?: { namespace: string}): Promise<any[]> {
+    return this.$store.dispatch('cluster/findAll', { type: SECRET, opt: { namespaced: args?.namespace || this.namespace } });
+  }
+
+  findAndMapCerts(secrets: any[]) {
+    return secrets
+      .filter((secret) => secret._type === TYPES.TLS)
+      .map((secret) => {
+        const { id } = secret;
+
+        return id.slice(id.indexOf('/') + 1);
+      });
+  }
+
+  findAndMapServiceTargets(services: any[]) {
+    return services.map((service) => ({
+      label: service.metadata.name,
+      value: service.metadata.name,
+      ports: service.spec.ports?.map((p: any) => p.port)
+    }));
+  }
+}
+
+export default IngressDetailEditHelper;
diff --git a/shell/utils/uiplugins.ts b/shell/utils/uiplugins.ts
index c748e2260b..88b3023b24 100644
--- a/shell/utils/uiplugins.ts
+++ b/shell/utils/uiplugins.ts
@@ -1,3 +1,4 @@
+import { matchesSomeRegex } from '@shell/utils/string';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { CATALOG } from '@shell/config/types';
 import { UI_PLUGIN_BASE_URL, isSupportedChartVersion } from '@shell/config/uiplugins';
@@ -158,37 +159,56 @@ export async function installHelmChart(repo: any, chart: any, values: any = {},
 }
 
 /**
- * Get the Helm repository object
  *
  * @param store Vue store
- * @param url The url of the Helm repository
- * @param branch The branch of the Helm repository
+ * @param url Repository Url
  * @returns HelmRepository
  */
-export async function getHelmRepository(store: any, url: string, branch?: string): Promise<HelmRepository> {
+export async function getHelmRepositoryExact(store: any, url: string): Promise<HelmRepository> {
+  return await getHelmRepository(store, (repository: any) => {
+    const target = repository.spec?.gitRepo || repository.spec?.url;
+
+    return target === url;
+  });
+}
+
+/**
+ *
+ * @param store Vue store
+ * @param urlRegexes Regex to match a community repository
+ * @returns HelmRepository
+ */
+export async function getHelmRepositoryMatch(store: any, urlRegexes: string[]): Promise<HelmRepository> {
+  return await getHelmRepository(store, (repository: any) => {
+    const target = repository.spec?.gitBranch ? repository.spec?.gitRepo : repository.spec?.url;
+
+    return matchesSomeRegex(target, urlRegexes);
+  });
+}
+
+/**
+ *
+ * @param store Vue store
+ * @param matchFn Match function for repository's urls
+ * @returns HelmRepository
+ */
+async function getHelmRepository(store: any, matchFn: (repository: any) => boolean): Promise<HelmRepository> {
   if (store.getters['management/schemaFor'](CATALOG.CLUSTER_REPO)) {
     const repos = await store.dispatch('management/findAll', { type: CATALOG.CLUSTER_REPO, opt: { force: true, watch: false } });
 
-    return repos.find((r: any) => {
-      const target = branch ? r.spec?.gitRepo : r.spec?.url ;
-
-      return target === url;
-    });
+    return repos.find(matchFn);
   } else {
     throw new Error('No permissions');
   }
 }
 
 /**
- * Refresh the Helm repository
- * Ensures that we find the latest extension versions
  *
  * @param store Vue store
- * @param gitRepo Extension Repository url
- * @param gitBranch Extension Repository branch
+ * @param url Repository Url
  */
-export async function refreshHelmRepository(store: any, gitRepo: string, gitBranch: string): Promise<void> {
-  const repository = await getHelmRepository(store, gitRepo, gitBranch);
+export async function refreshHelmRepository(store: any, url: string): Promise<void> {
+  const repository = await getHelmRepositoryExact(store, url);
 
   const now = (new Date()).toISOString().replace(/\.\d+Z$/, 'Z');
 
@@ -202,40 +222,32 @@ export async function refreshHelmRepository(store: any, gitRepo: string, gitBran
 }
 
 /**
- * Ensure the required Helm Repository exits, if it does not, add it with the specified name
- *
- * Wait until the newly added repository has been downloaded
  *
  * @param store Vue store
- * @param url The url of the Helm repository
- * @param name The name of the cluster repository
- * @param branch The branch of the Helm repository
- * @returns HelmRepository object
+ * @param name Repository name
+ * @param url Repository Url
+ * @param branch Repository Branch
+ * @returns HelmRepository
  */
-export async function ensureHelmRepository(store: any, url: string, name: string, branch?: string): Promise<HelmRepository> {
-  let helmRepo = await getHelmRepository(store, url, branch);
+export async function createHelmRepository(store: any, name: string, url: string, branch?: string): Promise<HelmRepository> {
+  const data = {
+    type:     CATALOG.CLUSTER_REPO,
+    metadata: { name },
+    spec:     {} as any
+  };
 
-  // Add the Helm repository, if it is not there
-  if (!helmRepo) {
-    const data = {
-      type:     CATALOG.CLUSTER_REPO,
-      metadata: { name },
-      spec:     {} as any
-    };
-
-    if (branch) {
-      data.spec.gitBranch = branch;
-      data.spec.gitRepo = url;
-    } else {
-      data.spec.url = url;
-    }
-
-    // Create a model for the new repository and save it
-    const repo = await store.dispatch('management/create', data);
-
-    helmRepo = await repo.save();
+  if (branch) {
+    data.spec.gitBranch = branch;
+    data.spec.gitRepo = url;
+  } else {
+    data.spec.url = url;
   }
 
+  // Create a model for the new repository and save it
+  const repo = await store.dispatch('management/create', data);
+
+  const helmRepo = await repo.save();
+
   // Poll the repository until it says it has been downloaded
   let fetched = false;
   let tries = 0;
@@ -278,7 +290,7 @@ export async function ensureHelmRepository(store: any, url: string, name: string
  * Get the given Helm Chart from the specified Helm Repository
  *
  * @param store Vue store
- * @param repository Helm Repository
+ * @param repository Repository Url
  * @param chartName Helm Chart name
  * @returns Helm Chart
  */
diff --git a/shell/utils/validators/cron-schedule.js b/shell/utils/validators/cron-schedule.js
index adfabbfe00..bc59c0c454 100644
--- a/shell/utils/validators/cron-schedule.js
+++ b/shell/utils/validators/cron-schedule.js
@@ -2,8 +2,13 @@ import cronstrue from 'cronstrue';
 
 export function cronSchedule(schedule = '', getters, errors) {
   try {
-    cronstrue.toString(schedule, { verbose: true });
+    cronScheduleRule.validation(schedule);
   } catch (e) {
-    errors.push(getters['i18n/t']('validation.invalidCron'));
+    errors.push(getters['i18n/t'](cronScheduleRule.message));
   }
 }
+
+export const cronScheduleRule = {
+  validation: (text) => cronstrue.toString(text, { verbose: true }),
+  message:    'validation.invalidCron'
+};
diff --git a/shell/utils/validators/formRules/__tests__/index.test.ts b/shell/utils/validators/formRules/__tests__/index.test.ts
index d021a36091..083e8cfebe 100644
--- a/shell/utils/validators/formRules/__tests__/index.test.ts
+++ b/shell/utils/validators/formRules/__tests__/index.test.ts
@@ -27,22 +27,6 @@ describe('formRules', () => {
     expect(formRuleResult).toStrictEqual(expectedResult);
   });
 
-  it('"cronSchedule" : returns undefined when valid cron string value supplied', () => {
-    const testValue = '0 * * * *';
-    const formRuleResult = formRules.cronSchedule(testValue);
-
-    expect(formRuleResult).toBeUndefined();
-  });
-
-  it('"cronSchedule" : returns the correct message when invalid cron string value supplied', () => {
-    // specific logic of what constitutes a cron string is in the "cronstrue" function in an external library and not tested here
-    const testValue = '0 * * **';
-    const formRuleResult = formRules.cronSchedule(testValue);
-    const expectedResult = JSON.stringify({ message: 'validation.invalidCron' });
-
-    expect(formRuleResult).toStrictEqual(expectedResult);
-  });
-
   it('"https" : returns undefined when valid https url value is supplied', () => {
     const testValue = 'https://url.com';
     const formRuleResult = formRules.https(testValue);
@@ -103,6 +87,45 @@ describe('formRules', () => {
     );
   });
 
+  describe('gitRepository', () => {
+    const message = JSON.stringify({ message: 'validation.git.repository' });
+    const testCases = [
+      // Valid HTTP(s)
+      ['https://github.com/rancher/dashboard.git', undefined],
+      ['http://github.com/rancher/dashboard.git', undefined],
+      ['https://github.com/rancher/dashboard', undefined],
+      ['https://github.com/rancher/dashboard/', undefined],
+
+      // Valid SSH
+      ['git@github.com:rancher/dashboard.git', undefined],
+      ['git@github.com:rancher/dashboard', undefined],
+      ['git@github.com:rancher/dashboard/', undefined],
+
+      // Not valid HTTP(s)
+      ['https://github.com/rancher/  dashboard.git', message],
+      ['http://github.com/rancher/  dashboard.git', message],
+      ['https://github.com/rancher/dashboard ', message],
+      ['foo://github.com/rancher/dashboard/', message],
+      ['github.com/rancher/dashboard/', message],
+
+      // Not valid SSH
+      ['git@github.com:rancher/  dashboard.git', message],
+      ['git@github.com:rancher/dashboard  ', message],
+      ['git@github.comrancher/dashboard', message],
+
+      [undefined, undefined]
+    ];
+
+    it.each(testCases)(
+      'should return undefined or correct message based on the provided Git url: %p',
+      (url, expected) => {
+        const formRuleResult = formRules.gitRepository(url);
+
+        expect(formRuleResult).toStrictEqual(expected);
+      }
+    );
+  });
+
   describe('alphanumeric', () => {
     const message = JSON.stringify({ message: 'validation.alphanumeric', key: 'testDisplayKey' });
     const testCases = [
@@ -1112,6 +1135,13 @@ describe('formRules', () => {
     expect(formRuleResult).toStrictEqual(expectedResult);
   });
 
+  /**
+   * Test all factory validators
+   * @param rule - the name of the factory validator
+   * @param argument - the value to validate
+   * @param correctValues - an array of values that should pass the validation
+   * @param wrongValues - an array of values that should fail the validation
+   */
   describe.each([
     ['minValue', 2, [3], [1]],
     ['maxValue', 256, [1], [300]],
@@ -1133,12 +1163,18 @@ describe('formRules', () => {
     });
   });
 
+  /**
+   * Test all standard validators
+   * @param rule - the name of the standard validator
+   * @param correctValues - an array of values that should pass the validation
+   * @param wrongValues - an array of values that should fail the validation
+   */
   describe.each([
     ['requiredInt', [2, 2.2], ['e']],
     ['isInteger', ['2', 2, 0], [2.2, 'e', '1.0']],
     ['isPositive', ['0', 1], [-1]],
     ['isOctal', ['0', 0, 10], ['01']],
-
+    ['cronSchedule', ['0 * * * *', '@daily'], ['0 * * **']],
   ])('given validator %p', (rule, correctValues, wrongValues) => {
     it.each(wrongValues as [])('should return error for value %p', (wrong) => {
       const formRuleResult = (formRules as any)[rule](wrong);
diff --git a/shell/utils/validators/formRules/index.ts b/shell/utils/validators/formRules/index.ts
index 3df2d01963..507795922f 100644
--- a/shell/utils/validators/formRules/index.ts
+++ b/shell/utils/validators/formRules/index.ts
@@ -4,14 +4,26 @@ import isEmpty from 'lodash/isEmpty';
 import has from 'lodash/has';
 import isUrl from 'is-url';
 // import uniq from 'lodash/uniq';
-import cronstrue from 'cronstrue';
 import { Translation } from '@shell/types/t';
 import { isHttps, isLocalhost, hasTrailingForwardSlash } from '@shell/utils/validators/setting';
+import { cronScheduleRule } from '@shell/utils/validators/cron-schedule';
 
 // import uniq from 'lodash/uniq';
-export type Validator<T = undefined | string> = (val: any, arg?: any) => T;
 
-export type ValidatorFactory = (arg1: any, arg2?: any) => Validator
+/**
+ * Fixed validation rule which require only the value to be evaluated
+ * @param value
+ * @returns { string | undefined }
+ */
+export type Validator<T = undefined | string> = (value: any, arg?: any) => T;
+
+/**
+ * Factory function which returns a validation rule
+ * @param arg Argument used as part of the validation rule process, not necessarily as parameter of the validation rule
+ * @param value Value to be evaluated
+ * @returns { Validator }
+ */
+export type ValidatorFactory = (arg: any, value?: any) => Validator
 
 type ServicePort = {
   name?: string,
@@ -131,9 +143,9 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
 
   const cronSchedule: Validator = (val: string) => {
     try {
-      cronstrue.toString(val, { verbose: true });
+      cronScheduleRule.validation(val);
     } catch (e) {
-      return t('validation.invalidCron');
+      return t(cronScheduleRule.message);
     }
   };
 
@@ -145,6 +157,8 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
 
   const url: Validator = (val: string) => val && !isUrl(val) ? t('validation.setting.serverUrl.url') : undefined;
 
+  const gitRepository: Validator = (val: string) => val && !/^((http|git|ssh|http(s)|file|\/?)|(git@[\w\.]+))(:(\/\/)?)([\w\.@\:\/\-]+)([\d\/\w.-]+?)(.git){0,1}(\/)?$/gm.test(val) ? t('validation.git.repository') : undefined;
+
   const alphanumeric: Validator = (val: string) => val && !/^[a-zA-Z0-9]+$/.test(val) ? t('validation.alphanumeric', { key }) : undefined;
 
   const interval: Validator = (val: string) => !/^\d+[hms]$/.test(val) ? t('validation.monitoring.route.interval', { key }) : undefined;
@@ -474,6 +488,7 @@ export default function(t: Translation, { key = 'Value' }: ValidationOptions): {
     dnsLabelRestricted,
     externalName,
     fileRequired,
+    gitRepository,
     groupsAreValid,
     hostname,
     imageUrl,
diff --git a/shell/yarn.lock b/shell/yarn.lock
index 179a2fa02e..e22301f625 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -1453,6 +1453,15 @@
     "@babel/highlight" "^7.24.7"
     picocolors "^1.0.0"
 
+"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2":
   version "7.25.2"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5"
@@ -1489,6 +1498,17 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458"
+  integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==
+  dependencies:
+    "@babel/parser" "^7.26.5"
+    "@babel/types" "^7.26.5"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
@@ -1588,10 +1608,10 @@
   dependencies:
     "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
-  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
+  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
 
 "@babel/helper-remap-async-to-generator@^7.24.7", "@babel/helper-remap-async-to-generator@^7.25.0":
   version "7.25.0"
@@ -1619,24 +1639,34 @@
     "@babel/traverse" "^7.24.7"
     "@babel/types" "^7.24.7"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
-  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
+  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
   dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
 "@babel/helper-string-parser@^7.24.8":
   version "7.24.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
   integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
 
+"@babel/helper-string-parser@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
+  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+
 "@babel/helper-validator-identifier@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
   integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
+"@babel/helper-validator-identifier@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
+
 "@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.24.8":
   version "7.24.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
@@ -1676,6 +1706,13 @@
   dependencies:
     "@babel/types" "^7.25.2"
 
+"@babel/parser@^7.25.9", "@babel/parser@^7.26.5", "@babel/parser@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.7.tgz#e114cd099e5f7d17b05368678da0fb9f69b3385c"
+  integrity sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==
+  dependencies:
+    "@babel/types" "^7.26.7"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
   version "7.25.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f"
@@ -1732,13 +1769,13 @@
     "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-decorators" "^7.24.7"
 
-"@babel/plugin-proposal-optional-chaining@7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
-  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
+"@babel/plugin-proposal-optional-chaining@7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@7.18.6":
@@ -2463,6 +2500,15 @@
     "@babel/parser" "^7.25.0"
     "@babel/types" "^7.25.0"
 
+"@babel/template@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
+  integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
+  dependencies:
+    "@babel/code-frame" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
 "@babel/traverse@^7.23.9", "@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.25.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490"
@@ -2476,6 +2522,19 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
+"@babel/traverse@^7.25.9":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.7.tgz#99a0a136f6a75e7fb8b0a1ace421e0b25994b8bb"
+  integrity sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==
+  dependencies:
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.5"
+    "@babel/parser" "^7.26.7"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.26.7"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.25.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
@@ -2485,6 +2544,14 @@
     "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.25.9", "@babel/types@^7.26.5", "@babel/types@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.7.tgz#5e2b89c0768e874d4d061961f3a5a153d71dc17a"
+  integrity sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -4741,6 +4808,11 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
+arg@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -4945,13 +5017,22 @@ axios-retry@3.1.9:
   dependencies:
     is-retry-allowed "^1.1.0"
 
-axios@0.21.4, axios@^0.21.1:
+axios@0.21.4:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^1.7.9:
+  version "1.7.9"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
+  integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-eslint@10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
@@ -6051,10 +6132,10 @@ cron-validator@1.3.1:
   resolved "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.3.1.tgz#8f2fe430f92140df77f91178ae31fc1e3a48a20e"
   integrity sha512-C1HsxuPCY/5opR55G5/WNzyEGDWFVG+6GLrA+fW/sCTcP6A6NTjUP2AK7B8n2PyFs90kDG2qzwm8LMheADku6A==
 
-cronstrue@2.50.0:
-  version "2.50.0"
-  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.50.0.tgz#eabba0f915f186765258b707b7a3950c663b5573"
-  integrity sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==
+cronstrue@2.53.0:
+  version "2.53.0"
+  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.53.0.tgz#5bbcd7483636b99379480f624faef5056f3efbd8"
+  integrity sha512-CkAcaI94xL8h6N7cGxgXfR5D7oV2yVtDzB9vMZP8tIgPyEv/oc/7nq9rlk7LMxvc3N+q6LKZmNLCVxJRpyEg8A==
 
 cross-env@7.0.3:
   version "7.0.3"
@@ -6663,19 +6744,12 @@ debug@2.6.9, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
-  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+debug@4, debug@4.4.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
   dependencies:
-    ms "2.1.2"
-
-debug@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
@@ -7072,16 +7146,16 @@ enquirer@^2.3.5, enquirer@^2.3.6:
     ansi-colors "^4.1.1"
     strip-ansi "^6.0.1"
 
+entities@4.5.0, entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -8025,7 +8099,14 @@ floating-vue@5.2.2:
     "@floating-ui/dom" "~1.1.1"
     vue-resize "^2.0.0-alpha.1"
 
-follow-redirects@1.15.2, follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+focus-trap@7.6.2:
+  version "7.6.2"
+  resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz#a501988821ca23d0150a7229eb7a20a3695bdf0e"
+  integrity sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==
+  dependencies:
+    tabbable "^6.2.0"
+
+follow-redirects@1.15.2, follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.6:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -8078,6 +8159,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
+  integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -9863,7 +9953,7 @@ jexl@2.3.0:
   dependencies:
     "@babel/runtime" "^7.10.2"
 
-joi@^17.4.0:
+joi@^17.13.3, joi@^17.4.0:
   version "17.13.3"
   resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
   integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
@@ -9989,6 +10079,11 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -10605,7 +10700,7 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -10654,12 +10749,7 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -11778,6 +11868,11 @@ proxy-from-env@1.0.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
   integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 ps-tree@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd"
@@ -12215,7 +12310,7 @@ rw@1:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
 
-rxjs@^7.1.0, rxjs@^7.5.1:
+rxjs@^7.5.1, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
@@ -12852,18 +12947,19 @@ stackframe@^1.3.4:
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
-start-server-and-test@1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.13.1.tgz#c06eb18c3f31d610724722b7eecbdf2550b03582"
-  integrity sha512-wZjksmjG5scEHXmV/3HWzImxNzUgaNQ6W8kkqL2GbiOldM+nqiqh7niimlC9ZGNopTGj16kheWZnZtSWgdBZNQ==
+start-server-and-test@2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-2.0.10.tgz#cb0ee4bd86a611f7a4e702028a86d0793a2a8342"
+  integrity sha512-nZphcfcqGqwk74lbZkqSwClkYz+M5ZPGOMgWxNVJrdztPKN96qe6HooRu6L3TpwITn0lKJJdKACqHbJtqythOQ==
   dependencies:
+    arg "^5.0.2"
     bluebird "3.7.2"
     check-more-types "2.24.0"
-    debug "4.3.2"
+    debug "4.4.0"
     execa "5.1.1"
     lazy-ass "1.6.0"
     ps-tree "1.2.0"
-    wait-on "6.0.0"
+    wait-on "8.0.2"
 
 statuses@2.0.1:
   version "2.0.1"
@@ -13117,6 +13213,11 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+tabbable@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
+  integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
+
 table@^6.0.9:
   version "6.8.2"
   resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
@@ -13860,16 +13961,16 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-wait-on@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7"
-  integrity sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==
+wait-on@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-8.0.2.tgz#0c7929abf7c5e625b733e992a9c0bd8b7691afe3"
+  integrity sha512-qHlU6AawrgAIHlueGQHQ+ETcPLAauXbnoTKl3RKq20W0T8x0DKVAo5xWIYjHSyvHxQlcYbFdR0jp4T9bDVITFA==
   dependencies:
-    axios "^0.21.1"
-    joi "^17.4.0"
+    axios "^1.7.9"
+    joi "^17.13.3"
     lodash "^4.17.21"
-    minimist "^1.2.5"
-    rxjs "^7.1.0"
+    minimist "^1.2.8"
+    rxjs "^7.8.1"
 
 walker@^1.0.7:
   version "1.0.8"
diff --git a/storybook/src/stories/Form/Input.mdx b/storybook/src/stories/Form/Input.mdx
index 11b980008e..a27fa6b95a 100644
--- a/storybook/src/stories/Form/Input.mdx
+++ b/storybook/src/stories/Form/Input.mdx
@@ -34,3 +34,23 @@ Input elements with type ‘text’ allow users to enter any combination of lett
 #### Error
 
 <Canvas of={LabeledInput.Error} />
+
+#### SubLabel
+
+Addition information can be added to the input field using the `subLabel` prop.
+
+<Canvas of={LabeledInput.SubLabel} />
+
+#### Cron Type
+
+The `cron` prop can be used to add [Cron language](https://en.wikipedia.org/wiki/Cron) hints.
+
+<Canvas of={LabeledInput.CronType} />
+
+<Canvas of={LabeledInput.CronTypeDaily} />
+
+<Canvas of={LabeledInput.CronTypeError} />
+
+#### Multiline Type
+
+<Canvas of={LabeledInput.MultilineType} />
diff --git a/storybook/src/stories/Form/Input.stories.ts b/storybook/src/stories/Form/Input.stories.ts
index f7adf84778..9502cb1613 100644
--- a/storybook/src/stories/Form/Input.stories.ts
+++ b/storybook/src/stories/Form/Input.stories.ts
@@ -64,3 +64,53 @@ export const Error: Story = {
     tooltipKey: 'Error message'
   },
 };
+
+export const SubLabel: Story = {
+  ...Default,
+  args: {
+    label:    'Name',
+    subLabel: 'Additional information',
+    type:     'text',
+    value:    'Simon',
+  },
+};
+
+export const CronType: Story = {
+  ...Default,
+  args: {
+    label: 'Period',
+    type:  'cron',
+    value: '0 * * * *',
+  },
+};
+
+export const CronTypeDaily: Story = {
+  ...Default,
+  args: {
+    label: 'Period',
+    type:  'cron',
+    value: '@daily',
+  },
+};
+
+export const CronTypeError: Story = {
+  ...Default,
+  args: {
+    label: 'Period',
+    type:  'cron',
+    value: 'not a cron expression',
+  },
+};
+
+export const MultilineType: Story = {
+  ...Default,
+  args: {
+    label: 'Period',
+    type:  'multiline',
+    value: `this
+is
+a
+multiline
+text`,
+  },
+};
diff --git a/yarn.lock b/yarn.lock
index 6ce78325c0..c82878623c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1453,6 +1453,15 @@
     "@babel/highlight" "^7.24.7"
     picocolors "^1.0.0"
 
+"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2", "@babel/compat-data@^7.25.4":
   version "7.25.4"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
@@ -1489,6 +1498,17 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458"
+  integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==
+  dependencies:
+    "@babel/parser" "^7.26.5"
+    "@babel/types" "^7.26.5"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.24.7":
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
@@ -1581,10 +1601,10 @@
   dependencies:
     "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.24.8"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
-  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
+  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
 
 "@babel/helper-remap-async-to-generator@^7.24.7", "@babel/helper-remap-async-to-generator@^7.25.0":
   version "7.25.0"
@@ -1612,24 +1632,34 @@
     "@babel/traverse" "^7.24.7"
     "@babel/types" "^7.24.7"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
-  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
+  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
   dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
 "@babel/helper-string-parser@^7.24.8":
   version "7.24.8"
   resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
   integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
 
+"@babel/helper-string-parser@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
+  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+
 "@babel/helper-validator-identifier@^7.24.7":
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
   integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
+"@babel/helper-validator-identifier@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
+
 "@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.24.8":
   version "7.24.8"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
@@ -1669,6 +1699,13 @@
   dependencies:
     "@babel/types" "^7.25.6"
 
+"@babel/parser@^7.25.9", "@babel/parser@^7.26.5", "@babel/parser@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.7.tgz#e114cd099e5f7d17b05368678da0fb9f69b3385c"
+  integrity sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==
+  dependencies:
+    "@babel/types" "^7.26.7"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
   version "7.25.3"
   resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f"
@@ -1725,13 +1762,13 @@
     "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-decorators" "^7.24.7"
 
-"@babel/plugin-proposal-optional-chaining@7.14.5":
-  version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
-  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
+"@babel/plugin-proposal-optional-chaining@7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@7.18.6":
@@ -2464,6 +2501,15 @@
     "@babel/parser" "^7.25.0"
     "@babel/types" "^7.25.0"
 
+"@babel/template@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
+  integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
+  dependencies:
+    "@babel/code-frame" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
 "@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.25.4", "@babel/traverse@^7.25.6", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.25.6"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41"
@@ -2477,6 +2523,19 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
+"@babel/traverse@^7.25.9":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.7.tgz#99a0a136f6a75e7fb8b0a1ace421e0b25994b8bb"
+  integrity sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==
+  dependencies:
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.5"
+    "@babel/parser" "^7.26.7"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.26.7"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.25.6"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
@@ -2486,6 +2545,14 @@
     "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.25.9", "@babel/types@^7.26.5", "@babel/types@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.7.tgz#5e2b89c0768e874d4d061961f3a5a153d71dc17a"
+  integrity sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -4982,6 +5049,11 @@ arg@^4.1.0:
   resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
+arg@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -5199,13 +5271,22 @@ axios-retry@3.1.9:
   dependencies:
     is-retry-allowed "^1.1.0"
 
-axios@0.21.4, axios@^0.21.1:
+axios@0.21.4:
   version "0.21.4"
   resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^1.7.9:
+  version "1.7.9"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
+  integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-core@7.0.0-bridge.0:
   version "7.0.0-bridge.0"
   resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
@@ -6386,15 +6467,10 @@ cron-validator@1.3.1:
   resolved "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.3.1.tgz#8f2fe430f92140df77f91178ae31fc1e3a48a20e"
   integrity sha512-C1HsxuPCY/5opR55G5/WNzyEGDWFVG+6GLrA+fW/sCTcP6A6NTjUP2AK7B8n2PyFs90kDG2qzwm8LMheADku6A==
 
-cronstrue@1.95.0:
-  version "1.95.0"
-  resolved "https://registry.npmjs.org/cronstrue/-/cronstrue-1.95.0.tgz#171df1fad8b0f0cb636354dd1d7842161c15478f"
-  integrity sha512-CdbQ17Z8Na2IdrK1SiD3zmXfE66KerQZ8/iApkGsxjmUVGJPS9M9oK4FZC3LM6ohUjjq3UeaSk+90Cf3QbXDfw==
-
-cronstrue@2.50.0:
-  version "2.50.0"
-  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.50.0.tgz#eabba0f915f186765258b707b7a3950c663b5573"
-  integrity sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==
+cronstrue@2.53.0:
+  version "2.53.0"
+  resolved "https://registry.npmjs.org/cronstrue/-/cronstrue-2.53.0.tgz#5bbcd7483636b99379480f624faef5056f3efbd8"
+  integrity sha512-CkAcaI94xL8h6N7cGxgXfR5D7oV2yVtDzB9vMZP8tIgPyEv/oc/7nq9rlk7LMxvc3N+q6LKZmNLCVxJRpyEg8A==
 
 cross-env@7.0.3:
   version "7.0.3"
@@ -7055,20 +7131,13 @@ debug@2.6.9, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.3.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+debug@4, debug@4.4.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
   dependencies:
     ms "^2.1.3"
 
-debug@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 debug@4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -8554,7 +8623,14 @@ flush-promises@1.0.2:
   resolved "https://registry.npmjs.org/flush-promises/-/flush-promises-1.0.2.tgz#4948fd58f15281fed79cbafc86293d5bb09b2ced"
   integrity sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+focus-trap@7.6.2:
+  version "7.6.2"
+  resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz#a501988821ca23d0150a7229eb7a20a3695bdf0e"
+  integrity sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==
+  dependencies:
+    tabbable "^6.2.0"
+
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.6:
   version "1.15.9"
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
   integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
@@ -8615,6 +8691,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
+  integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -10604,7 +10689,7 @@ jexl@2.3.0:
   dependencies:
     "@babel/runtime" "^7.10.2"
 
-joi@^17.4.0:
+joi@^17.13.3, joi@^17.4.0:
   version "17.13.3"
   resolved "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
   integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
@@ -10730,6 +10815,11 @@ jsesc@^2.5.1:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -11401,7 +11491,7 @@ minimatch@^9.0.4:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -12767,6 +12857,11 @@ proxy-from-env@1.0.0:
   resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
   integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 ps-tree@1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd"
@@ -13255,7 +13350,7 @@ rw@1:
   resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
 
-rxjs@^7.1.0, rxjs@^7.5.1:
+rxjs@^7.5.1, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
@@ -13958,18 +14053,19 @@ stackframe@^1.3.4:
   resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
-start-server-and-test@1.13.1:
-  version "1.13.1"
-  resolved "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.13.1.tgz#c06eb18c3f31d610724722b7eecbdf2550b03582"
-  integrity sha512-wZjksmjG5scEHXmV/3HWzImxNzUgaNQ6W8kkqL2GbiOldM+nqiqh7niimlC9ZGNopTGj16kheWZnZtSWgdBZNQ==
+start-server-and-test@2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-2.0.10.tgz#cb0ee4bd86a611f7a4e702028a86d0793a2a8342"
+  integrity sha512-nZphcfcqGqwk74lbZkqSwClkYz+M5ZPGOMgWxNVJrdztPKN96qe6HooRu6L3TpwITn0lKJJdKACqHbJtqythOQ==
   dependencies:
+    arg "^5.0.2"
     bluebird "3.7.2"
     check-more-types "2.24.0"
-    debug "4.3.2"
+    debug "4.4.0"
     execa "5.1.1"
     lazy-ass "1.6.0"
     ps-tree "1.2.0"
-    wait-on "6.0.0"
+    wait-on "8.0.2"
 
 statuses@2.0.1:
   version "2.0.1"
@@ -14264,6 +14360,11 @@ symbol-tree@^3.2.4:
   resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+tabbable@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
+  integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
+
 table@^6.0.9:
   version "6.8.2"
   resolved "https://registry.npmjs.org/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
@@ -15095,16 +15196,16 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-wait-on@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7"
-  integrity sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==
+wait-on@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-8.0.2.tgz#0c7929abf7c5e625b733e992a9c0bd8b7691afe3"
+  integrity sha512-qHlU6AawrgAIHlueGQHQ+ETcPLAauXbnoTKl3RKq20W0T8x0DKVAo5xWIYjHSyvHxQlcYbFdR0jp4T9bDVITFA==
   dependencies:
-    axios "^0.21.1"
-    joi "^17.4.0"
+    axios "^1.7.9"
+    joi "^17.13.3"
     lodash "^4.17.21"
-    minimist "^1.2.5"
-    rxjs "^7.1.0"
+    minimist "^1.2.8"
+    rxjs "^7.8.1"
 
 walker@^1.0.7:
   version "1.0.8"