diff --git a/.github/workflows/update-cloud-repo.yml b/.github/workflows/update-cloud-repo.yml
index ff547575ce9..f90f139e832 100644
--- a/.github/workflows/update-cloud-repo.yml
+++ b/.github/workflows/update-cloud-repo.yml
@@ -78,8 +78,17 @@ jobs:
 
           # Comment out the base url in the spartacus-configuration.module.ts file
           function modify_file_to_remove_baseurl() {
-            local file_location="../spartacus-${{ github.event.inputs.version }}-${storefront_type}/apps/spartacusstore/src/app/spartacus/spartacus-configuration.module.ts"
+            local path
+            if [ "${storefront_type}" == "b2c" ]; then
+              path="spartacusstore"
+            elif [ "${storefront_type}" == "b2b" ]; then
+              path="b2bspastore"
+            else
+              echo "Invalid storefront type: ${storefront_type}"
+              exit 1
+            fi
 
+            local file_location="../spartacus-${{ github.event.inputs.version }}-${storefront_type}/apps/${path}/src/app/spartacus/spartacus-configuration.module.ts"
             if [ -f "${file_location}" ]; then
               sed -i 's/baseUrl/\/\/baseUrl/1' "${file_location}"
               echo "Modified ${file_location}."
diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 776e2a89f30..cc1fdb41f4f 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -353,9 +353,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/docs/migration/2211_19/2211-migration.md b/docs/migration/2211_19/2211-migration.md
index f33fede5f5f..aec2117b81e 100644
--- a/docs/migration/2211_19/2211-migration.md
+++ b/docs/migration/2211_19/2211-migration.md
@@ -27,7 +27,7 @@ Follow the [Angular guidelines for upgrading from v16 to v17](https://update.ang
 Please also update other 3rd part dependencies from Angular ecosystem to versions compatible with Angular 17, e.g. `@ng-select/ng-select@12`, `@ngrx/store@17`, `ngx-infinite-scroll@17`:
 
 ```bash
-ng update @angular/core@17 @angular/cli@17 @ng-select/ng-select@12 @ngrx/store@17 ngx-infinite-scroll@17 --force
+ng update @angular/core@17 @angular/cli@17 @ng-select/ng-select@12 @ngrx/store@17 ngx-infinite-scroll@17 rxjs@7.8.1 --force
 git add .
 git commit -m "update angular 17 and 3rd party deps angular 17 compatible"
 ```
@@ -46,6 +46,12 @@ git add .
 git commit -m "add @angular-devkit/schematics@17 to dev dependencies"
 ```
 
+If `@angular-devkit/core` is not listed under the `devDependencies` in the `package.json` file, please execute the following commands:
+```bash
+npm i @angular-devkit/core@17 --save-dev --force             
+git add .
+git commit -m "add @angular-devkit/core@17 to dev dependencies"
+```
 ### Run Spartacus update
 
 After successfully updating the application to Angular 17, execute this command to initiate the Spartacus update process.
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
index bf0cdb27aec..86f03af3adf 100644
--- a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
+++ b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
@@ -149,7 +149,22 @@
     <!-- Modal Header -->
     <ng-container *ngIf="loaded$ | async; else loading">
       <div class="cx-dialog-header modal-header">
-        <div id="dialogTitle" class="cx-dialog-title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-dialog-title modal-title"
+        >
+          {{
+            (addedEntryWasMerged$ | async)
+              ? ('addToCart.itemsIncrementedInYourCart' | cxTranslate)
+              : ('addToCart.itemsAddedToYourCart' | cxTranslate)
+          }}
+        </h3>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-dialog-title modal-title"
+        >
           {{
             (addedEntryWasMerged$ | async)
               ? ('addToCart.itemsIncrementedInYourCart' | cxTranslate)
@@ -262,7 +277,16 @@
 
     <ng-template #loading>
       <div class="cx-dialog-header modal-header">
-        <div class="cx-dialog-title modal-title">
+        <h2
+          *cxFeature="'a11yDialogsHeading'"
+          class="cx-dialog-title modal-title"
+        >
+          {{ 'addToCart.updatingCart' | cxTranslate }}
+        </h2>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          class="cx-dialog-title modal-title"
+        >
           {{ 'addToCart.updatingCart' | cxTranslate }}
         </div>
         <button
diff --git a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.spec.ts b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.spec.ts
index cfb311865c6..7b817bdbb59 100644
--- a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.spec.ts
+++ b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.spec.ts
@@ -34,10 +34,10 @@ import {
   SpinnerModule,
 } from '@spartacus/storefront';
 import { cold } from 'jasmine-marbles';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, EMPTY, Observable, of } from 'rxjs';
 import { skip, take } from 'rxjs/operators';
 import { AddedToCartDialogComponent } from './added-to-cart-dialog.component';
-import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 class MockActiveCartService implements Partial<ActiveCartFacade> {
   updateEntry(_entryNumber: number, _quantity: number): void {}
diff --git a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.html b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.html
index 2947291627c..9a0591fed46 100644
--- a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.html
+++ b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.html
@@ -13,7 +13,18 @@
       ></div>
       <!-- Modal Header -->
       <div class="modal-header cx-clear-cart-header">
-        <div id="dialogTitle" class="cx-clear-cart-title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-clear-cart-title modal-title"
+        >
+          {{ 'clearCart.clearCart' | cxTranslate }}
+        </h3>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-clear-cart-title modal-title"
+        >
           {{ 'clearCart.clearCart' | cxTranslate }}
         </div>
 
@@ -59,7 +70,16 @@
 
 <ng-template #loading>
   <div class="modal-header cx-clear-cart-header">
-    <div class="cx-clear-cart-title modal-title">
+    <h2
+      *cxFeature="'a11yDialogsHeading'"
+      class="cx-clear-cart-title modal-title"
+    >
+      {{ 'clearCart.clearingCart' | cxTranslate }}
+    </h2>
+    <div
+      *cxFeature="'!a11yDialogsHeading'"
+      class="cx-clear-cart-title modal-title"
+    >
       {{ 'clearCart.clearingCart' | cxTranslate }}
     </div>
   </div>
diff --git a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.spec.ts b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.spec.ts
index 9ed4aa4615a..f26f4901126 100644
--- a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.spec.ts
+++ b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.component.spec.ts
@@ -1,13 +1,14 @@
-import { ClearCartDialogComponentService } from './clear-cart-dialog-component.service';
+import { CommonModule } from '@angular/common';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { I18nTestingModule } from '@spartacus/core';
 import {
   IconTestingModule,
   KeyboardFocusTestingModule,
 } from '@spartacus/storefront';
-import { I18nTestingModule } from '@spartacus/core';
-import { CommonModule } from '@angular/common';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
+import { ClearCartDialogComponentService } from './clear-cart-dialog-component.service';
 import { ClearCartDialogComponent } from './clear-cart-dialog.component';
-import { By } from '@angular/platform-browser';
 
 const mockCloseReason = 'Cancel Clear Cart';
 
@@ -29,7 +30,7 @@ describe('ClearCartDialogComponent', () => {
         KeyboardFocusTestingModule,
         IconTestingModule,
       ],
-      declarations: [ClearCartDialogComponent],
+      declarations: [ClearCartDialogComponent, MockFeatureDirective],
       providers: [
         {
           provide: ClearCartDialogComponentService,
diff --git a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.module.ts b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.module.ts
index c7797cc663e..917ca03ccbc 100644
--- a/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.module.ts
+++ b/feature-libs/cart/base/components/clear-cart/clear-cart-dialog/clear-cart-dialog.module.ts
@@ -6,7 +6,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import {
   IconModule,
   KeyboardFocusModule,
@@ -21,6 +21,7 @@ import { ClearCartDialogComponent } from './clear-cart-dialog.component';
     I18nModule,
     IconModule,
     KeyboardFocusModule,
+    FeaturesConfigModule,
   ],
   declarations: [ClearCartDialogComponent],
   exports: [ClearCartDialogComponent],
diff --git a/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.html b/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.html
index 47ab36dc240..5d0b36f9a6f 100644
--- a/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.html
+++ b/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.html
@@ -9,7 +9,18 @@
     <!-- Modal Header -->
     <div class="modal-header cx-import-entries-header">
       <ng-container>
-        <div id="dialogTitle" class="cx-import-entries-title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-import-entries-title modal-title"
+        >
+          {{ 'importEntriesDialog.importProducts' | cxTranslate }}
+        </h3>
+        <div
+          *cxFeature="'!a11yDialogsHeading'"
+          id="dialogTitle"
+          class="cx-import-entries-title modal-title"
+        >
           {{ 'importEntriesDialog.importProducts' | cxTranslate }}
         </div>
       </ng-container>
diff --git a/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.spec.ts b/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.spec.ts
index 614cdcae6d8..236231b9bff 100644
--- a/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.spec.ts
+++ b/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-entries-dialog.component.spec.ts
@@ -13,6 +13,7 @@ import {
   KeyboardFocusTestingModule,
   LaunchDialogService,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { ImportEntriesDialogComponent } from './import-entries-dialog.component';
 
@@ -71,6 +72,7 @@ describe('ImportEntriesDialogComponent', () => {
       declarations: [
         ImportEntriesDialogComponent,
         MockImportEntriesFormComponent,
+        MockFeatureDirective,
       ],
       providers: [
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
diff --git a/feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts b/feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts
index b950696cbb3..d24e749dfb7 100644
--- a/feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts
+++ b/feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts
@@ -10,6 +10,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import {
   CmsConfig,
   ConfigModule,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
 } from '@spartacus/core';
@@ -43,6 +44,7 @@ import { ImportOrderEntriesComponent } from './import-entries/import-order-entri
         },
       },
     }),
+    FeaturesConfigModule,
   ],
   declarations: [
     ImportOrderEntriesComponent,
diff --git a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.html b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.html
index a678924ede5..f837bc0c0eb 100644
--- a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.html
+++ b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.html
@@ -11,7 +11,18 @@
     >
       <span>{{ 'addToSavedCart.savedCarts' | cxTranslate }}</span>
     </a>
+    <button
+      *cxFeature="'a11yUseButtonsForBtnLinks'"
+      #element
+      class="link cx-action-link"
+      [class.disabled]="disableSaveCartForLater$ | async"
+      (click)="saveCart(cart)"
+      cxAutoFocus
+    >
+      <span>{{ 'addToSavedCart.saveCartForLater' | cxTranslate }}</span>
+    </button>
     <a
+      *cxFeature="'!a11yUseButtonsForBtnLinks'"
       #element
       tabindex="0"
       class="link cx-action-link"
diff --git a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts
index 902ad44a37e..d0a30dd937e 100644
--- a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts
+++ b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.component.spec.ts
@@ -14,6 +14,7 @@ import { take } from 'rxjs/operators';
 
 import { UrlTestingModule } from 'projects/core/src/routing/configurable-routes/url-translation/testing/url-testing.module';
 import { AddToSavedCartComponent } from './add-to-saved-cart.component';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 const mockCart: Cart = {
   code: '123456789',
@@ -64,7 +65,7 @@ describe('AddToSavedCartComponent', () => {
         UrlTestingModule,
         RouterTestingModule,
       ],
-      declarations: [AddToSavedCartComponent],
+      declarations: [AddToSavedCartComponent, MockFeatureDirective],
       providers: [
         { provide: ActiveCartFacade, useClass: MockActiveCartService },
         { provide: AuthService, useClass: MockAuthService },
diff --git a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.module.ts b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.module.ts
index 7cfa5164c67..76a81fe5b1b 100644
--- a/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.module.ts
+++ b/feature-libs/cart/saved-cart/components/add-to-saved-cart/add-to-saved-cart.module.ts
@@ -9,6 +9,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
@@ -16,7 +17,13 @@ import {
 import { AddToSavedCartComponent } from './add-to-saved-cart.component';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, I18nModule, UrlModule],
+  imports: [
+    CommonModule,
+    RouterModule,
+    I18nModule,
+    UrlModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
diff --git a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html
index c422237aaa3..5f4819b1b9e 100644
--- a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html
+++ b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html
@@ -10,7 +10,29 @@
       <!-- Modal Header -->
       <div class="modal-header cx-saved-cart-form-header">
         <ng-container [ngSwitch]="layoutOption">
-          <div id="dialogTitle" class="cx-saved-cart-form-title modal-title">
+          <h3
+            *cxFeature="'a11yDialogsHeading'"
+            id="dialogTitle"
+            class="cx-saved-cart-form-title modal-title"
+          >
+            <ng-container *ngSwitchCase="savedCartFormType.EDIT">
+              {{ 'savedCartDialog.editSavedCart' | cxTranslate }}
+            </ng-container>
+            <ng-container *ngSwitchCase="savedCartFormType.DELETE">
+              {{ 'savedCartDialog.deleteSavedCart' | cxTranslate }}
+            </ng-container>
+            <ng-container *ngSwitchCase="savedCartFormType.SAVE">
+              {{ 'savedCartDialog.saveForLater' | cxTranslate }}
+            </ng-container>
+            <ng-container *ngSwitchCase="savedCartFormType.RESTORE">
+              {{ 'savedCartDialog.restoreSavedCart' | cxTranslate }}
+            </ng-container>
+          </h3>
+          <div
+            *cxFeature="'!a11yDialogsHeading'"
+            id="dialogTitle"
+            class="cx-saved-cart-form-title modal-title"
+          >
             <ng-container *ngSwitchCase="savedCartFormType.EDIT">
               {{ 'savedCartDialog.editSavedCart' | cxTranslate }}
             </ng-container>
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index 31d2d1798ec..6983407651f 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/estimated-delivery-date/tsconfig.schematics.json b/feature-libs/estimated-delivery-date/tsconfig.schematics.json
index 31d2d1798ec..6983407651f 100644
--- a/feature-libs/estimated-delivery-date/tsconfig.schematics.json
+++ b/feature-libs/estimated-delivery-date/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/pdf-invoices/tsconfig.schematics.json b/feature-libs/pdf-invoices/tsconfig.schematics.json
index 31d2d1798ec..6983407651f 100644
--- a/feature-libs/pdf-invoices/tsconfig.schematics.json
+++ b/feature-libs/pdf-invoices/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.html b/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.html
index 0cba77a1ab9..f8a5f79b7fc 100644
--- a/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.html
+++ b/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.html
@@ -9,7 +9,18 @@
   <div class="cx-dialog-content">
     <!-- Modal Header -->
     <div class="modal-header cx-dialog-header">
-      <div id="cx-pickup-option-dialog-title" class="cx-dialog-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="cx-pickup-option-dialog-title"
+        class="cx-dialog-title"
+      >
+        {{ 'pickupOptionDialog.modalHeader' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="cx-pickup-option-dialog-title"
+        class="cx-dialog-title"
+      >
         {{ 'pickupOptionDialog.modalHeader' | cxTranslate }}
       </div>
 
diff --git a/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.spec.ts b/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.spec.ts
index 97addc3cb0d..48713aae5a6 100644
--- a/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.spec.ts
@@ -15,10 +15,11 @@ import {
 import {
   IconTestingModule,
   KeyboardFocusModule,
-  LaunchDialogService,
   LAUNCH_CALLER,
+  LaunchDialogService,
   SpinnerModule,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { EMPTY, Observable, of } from 'rxjs';
 import { MockIntendedPickupLocationService } from '../../../core/facade/intended-pickup-location.service.spec';
 import { MockPickupLocationsSearchService } from '../../../core/facade/pickup-locations-search.service.spec';
@@ -92,6 +93,7 @@ describe('PickupOptionDialogComponent', () => {
         PickupOptionDialogComponent,
         StoreSearchStubComponent,
         StoreListStubComponent,
+        MockFeatureDirective,
       ],
       imports: [
         CommonModule,
diff --git a/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.module.ts b/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.module.ts
index 4480f3c45fd..9a1b99cdd47 100644
--- a/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.module.ts
+++ b/feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.module.ts
@@ -6,7 +6,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import {
   IconModule,
   KeyboardFocusModule,
@@ -25,6 +25,7 @@ import { PickupOptionDialogComponent } from './pickup-option-dialog.component';
     SpinnerModule,
     StoreListModule,
     StoreSearchModule,
+    FeaturesConfigModule,
   ],
   declarations: [PickupOptionDialogComponent],
   exports: [PickupOptionDialogComponent],
diff --git a/feature-libs/pickup-in-store/components/container/store-search/store-search.component.html b/feature-libs/pickup-in-store/components/container/store-search/store-search.component.html
index 780cb75f2a6..2f9d35ba4f1 100644
--- a/feature-libs/pickup-in-store/components/container/store-search/store-search.component.html
+++ b/feature-libs/pickup-in-store/components/container/store-search/store-search.component.html
@@ -23,7 +23,16 @@
     </button>
   </div>
   <div class="cx-find-a-store-link-container">
+    <button
+      *cxFeature="'a11yUseButtonsForBtnLinks'"
+      class="link cx-find-a-store-link"
+      id="lnkUseMyLocation"
+      (click)="useMyLocation()"
+    >
+      {{ 'storeSearch.useMyLocation' | cxTranslate }}
+    </button>
     <a
+      *cxFeature="'!a11yUseButtonsForBtnLinks'"
       class="cx-find-a-store-link"
       id="lnkUseMyLocation"
       (click)="useMyLocation()"
diff --git a/feature-libs/pickup-in-store/components/container/store-search/store-search.component.spec.ts b/feature-libs/pickup-in-store/components/container/store-search/store-search.component.spec.ts
index 06ca63bab48..2f41d534350 100644
--- a/feature-libs/pickup-in-store/components/container/store-search/store-search.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/store-search/store-search.component.spec.ts
@@ -5,6 +5,7 @@ import { CurrentLocationService } from '../../services/current-location.service'
 import { MockCurrentLocationService } from '../../services/current-location.service.spec';
 
 import { StoreSearchComponent } from './store-search.component';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 describe('StoreSearchComponent', () => {
   let component: StoreSearchComponent;
@@ -13,7 +14,7 @@ describe('StoreSearchComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [StoreSearchComponent],
+      declarations: [StoreSearchComponent, MockFeatureDirective],
       imports: [I18nTestingModule],
       providers: [
         {
diff --git a/feature-libs/pickup-in-store/components/container/store-search/store-search.module.ts b/feature-libs/pickup-in-store/components/container/store-search/store-search.module.ts
index 78bd30f50ea..d376711ba0a 100644
--- a/feature-libs/pickup-in-store/components/container/store-search/store-search.module.ts
+++ b/feature-libs/pickup-in-store/components/container/store-search/store-search.module.ts
@@ -6,11 +6,11 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import { StoreSearchComponent } from './store-search.component';
 
 @NgModule({
-  imports: [CommonModule, I18nModule],
+  imports: [CommonModule, I18nModule, FeaturesConfigModule],
   exports: [StoreSearchComponent],
   declarations: [StoreSearchComponent],
   providers: [],
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
index 52f0495985c..e4803aa3efc 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
@@ -37,7 +37,23 @@
           }}</strong>
         </ng-container>
         |
+        <button
+          *cxFeature="'a11yUseButtonsForBtnLinks'"
+          [attr.data-store-location-link]="
+            displayPickupLocation ? 'change' : 'select'
+          "
+          class="link cx-action-link"
+          (click)="onPickupLocationChange()"
+        >
+          {{
+            (displayPickupLocation
+              ? 'pickupOptions.changeStore'
+              : 'pickupOptions.selectStore'
+            ) | cxTranslate
+          }}
+        </button>
         <a
+          *cxFeature="'!a11yUseButtonsForBtnLinks'"
           role="button"
           [attr.data-store-location-link]="
             displayPickupLocation ? 'change' : 'select'
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts
index 59fd0876d99..e9af9ccdf3c 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts
@@ -6,6 +6,7 @@ import { I18nTestingModule } from '@spartacus/core';
 import { PickupOption } from '@spartacus/pickup-in-store/root';
 import { Observable } from 'rxjs';
 import { PickupOptionsComponent } from './pickup-options.component';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
 describe('PickupOptionsComponent', () => {
   let component: PickupOptionsComponent;
@@ -13,7 +14,7 @@ describe('PickupOptionsComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [PickupOptionsComponent],
+      declarations: [PickupOptionsComponent, MockFeatureDirective],
       imports: [CommonModule, I18nTestingModule, ReactiveFormsModule],
     });
     fixture = TestBed.createComponent(PickupOptionsComponent);
@@ -119,7 +120,7 @@ describe('PickupOptionsComponent', () => {
       fixture.detectChanges();
 
       const selectStoreButton =
-        fixture.debugElement.nativeElement.querySelector('a[role="button"]');
+        fixture.debugElement.nativeElement.querySelector('button');
       selectStoreButton.click();
 
       expect(component.onPickupLocationChange).toHaveBeenCalled();
@@ -131,7 +132,7 @@ describe('PickupOptionsComponent', () => {
       fixture.detectChanges();
 
       const changeStoreButton =
-        fixture.debugElement.nativeElement.querySelector('a[role="button"]');
+        fixture.debugElement.nativeElement.querySelector('button');
       changeStoreButton.click();
 
       expect(component.onPickupLocationChange).toHaveBeenCalled();
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.module.ts b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.module.ts
index c3ce2ae4805..5ce387548a8 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.module.ts
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.module.ts
@@ -7,11 +7,16 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { I18nModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import { PickupOptionsComponent } from './pickup-options.component';
 
 @NgModule({
-  imports: [CommonModule, I18nModule, ReactiveFormsModule],
+  imports: [
+    CommonModule,
+    I18nModule,
+    ReactiveFormsModule,
+    FeaturesConfigModule,
+  ],
   declarations: [PickupOptionsComponent],
   exports: [PickupOptionsComponent],
 })
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index e3e988982a9..711f58bf7a7 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -366,9 +366,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html
index c93fcc4ecf8..7e3c38242e0 100644
--- a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html
+++ b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html
@@ -17,7 +17,20 @@
   <div class="cx-modal-content" [cxFocus]="focusConfig">
     <!-- Modal Header -->
     <div class="cx-dialog-header modal-header">
-      <div id="dialogTitle" class="cx-dialog-title modal-title" tabindex="0">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+        tabindex="0"
+      >
+        {{ 'configurator.header.resolveIssue' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+        tabindex="0"
+      >
         {{ 'configurator.header.resolveIssue' | cxTranslate }}
       </div>
       <button
diff --git a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.spec.ts b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.spec.ts
index e055b35eb47..595c4f0db2b 100644
--- a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.spec.ts
@@ -1,27 +1,27 @@
-import { Component, Directive, Input } from '@angular/core';
+import { Component, Directive, Input, Type } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ConfiguratorConflictSolverDialogComponent } from './configurator-conflict-solver-dialog.component';
 import { I18nTestingModule } from '@spartacus/core';
 import {
+  CommonConfigurator,
+  ConfiguratorRouter,
+  ConfiguratorType,
+} from '@spartacus/product-configurator/common';
+import {
+  FocusConfig,
   ICON_TYPE,
   IconLoaderService,
   IconModule,
-  LaunchDialogService,
-  FocusConfig,
   KeyboardFocusService,
+  LaunchDialogService,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, NEVER, Observable, of } from 'rxjs';
-import { Configurator } from '../../core/model/configurator.model';
+import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
 import { ConfiguratorCommonsService } from '../../core/facade/configurator-commons.service';
-import { Type } from '@angular/core';
+import { Configurator } from '../../core/model/configurator.model';
 import * as ConfigurationTestData from '../../testing/configurator-test-data';
 import { ConfiguratorStorefrontUtilsService } from './../service/configurator-storefront-utils.service';
-import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
-import {
-  CommonConfigurator,
-  ConfiguratorRouter,
-  ConfiguratorType,
-} from '@spartacus/product-configurator/common';
+import { ConfiguratorConflictSolverDialogComponent } from './configurator-conflict-solver-dialog.component';
 
 export class MockIconFontLoaderService {
   getStyleClasses(_iconType: ICON_TYPE): void {}
@@ -98,6 +98,7 @@ describe('ConfiguratorConflictSolverDialogComponent', () => {
         MockConfiguratorDefaultFormComponent,
         ConfiguratorConflictSolverDialogComponent,
         MockKeyboardFocusDirective,
+        MockFeatureDirective,
       ],
       providers: [
         { provide: IconLoaderService, useClass: MockIconFontLoaderService },
diff --git a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.module.ts b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.module.ts
index b29e6d2ee18..a3aac2043b1 100644
--- a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.module.ts
@@ -6,11 +6,15 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { IconModule, KeyboardFocusModule } from '@spartacus/storefront';
-import { ConfiguratorConflictSolverDialogComponent } from './configurator-conflict-solver-dialog.component';
-import { ConfiguratorConflictSolverDialogLauncherService } from './configurator-conflict-solver-dialog-launcher.service';
 import { ConfiguratorGroupModule } from '../group/configurator-group.module';
+import { ConfiguratorConflictSolverDialogLauncherService } from './configurator-conflict-solver-dialog-launcher.service';
+import { ConfiguratorConflictSolverDialogComponent } from './configurator-conflict-solver-dialog.component';
 import { defaultConfiguratorConflictSolverLayoutConfig } from './default-configurator-conflict-solver-layout.config';
 
 @NgModule({
@@ -20,6 +24,7 @@ import { defaultConfiguratorConflictSolverLayoutConfig } from './default-configu
     I18nModule,
     ConfiguratorGroupModule,
     KeyboardFocusModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(defaultConfiguratorConflictSolverLayoutConfig),
diff --git a/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.html b/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.html
index 5f7e426fb90..63f6b42a013 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.html
+++ b/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.html
@@ -11,7 +11,18 @@
     (esc)="closeFilterModal()"
   >
     <div class="cx-dialog-header modal-header">
-      <div id="dialogTitle" class="cx-dialog-title modal-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
+        {{ 'configurator.overviewFilter.title' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
         {{ 'configurator.overviewFilter.title' | cxTranslate }}
       </div>
       <button
diff --git a/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.spec.ts b/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.spec.ts
index 66220d59c0d..63333c89f73 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.component.spec.ts
@@ -1,3 +1,4 @@
+import { Component, Directive, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { I18nTestingModule } from '@spartacus/core';
@@ -6,12 +7,12 @@ import {
   ICON_TYPE,
   LaunchDialogService,
 } from '@spartacus/storefront';
-import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
-import { ConfiguratorOverviewFilterDialogComponent } from './configurator-overview-filter-dialog.component';
-import * as ConfigurationTestData from '../../testing/configurator-test-data';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { NEVER, of } from 'rxjs';
-import { Component, Directive, Input } from '@angular/core';
+import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
 import { Configurator } from '../../core/model/configurator.model';
+import * as ConfigurationTestData from '../../testing/configurator-test-data';
+import { ConfiguratorOverviewFilterDialogComponent } from './configurator-overview-filter-dialog.component';
 
 let component: ConfiguratorOverviewFilterDialogComponent;
 let fixture: ComponentFixture<ConfiguratorOverviewFilterDialogComponent>;
@@ -67,6 +68,7 @@ describe('ConfiguratorOverviewFilterDialogComponent', () => {
         MockCxIconComponent,
         MockConfiguratorOverviewFilterComponent,
         MockKeyboadFocusDirective,
+        MockFeatureDirective,
       ],
       imports: [I18nTestingModule],
       providers: [
diff --git a/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.module.ts b/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.module.ts
index 696faf0ad22..401e3c7d295 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-filter-dialog/configurator-overview-filter-dialog.module.ts
@@ -6,7 +6,11 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { IconModule, KeyboardFocusModule } from '@spartacus/storefront';
 import { ConfiguratorOverviewFilterModule } from '../overview-filter/configurator-overview-filter.module';
 import { ConfiguratorOverviewFilterDialogComponent } from './configurator-overview-filter-dialog.component';
@@ -19,6 +23,7 @@ import { defaultConfiguratorOverviewFilterDialogLayoutConfig } from './default-c
     IconModule,
     ConfiguratorOverviewFilterModule,
     KeyboardFocusModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(defaultConfiguratorOverviewFilterDialogLayoutConfig),
diff --git a/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.html b/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.html
index 580c6b32d80..c5899d3ea57 100644
--- a/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.html
+++ b/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.html
@@ -12,7 +12,18 @@
         (esc)="backToPDP(product)"
       >
         <div class="cx-dialog-header modal-header">
-          <div id="dialogTitle" class="cx-dialog-title modal-title">
+          <h3
+            *cxFeature="'a11yDialogsHeading'"
+            id="dialogTitle"
+            class="cx-dialog-title modal-title"
+          >
+            {{ 'configurator.restartDialog.title' | cxTranslate }}
+          </h3>
+          <div
+            *cxFeature="'!a11yDialogsHeading'"
+            id="dialogTitle"
+            class="cx-dialog-title modal-title"
+          >
             {{ 'configurator.restartDialog.title' | cxTranslate }}
           </div>
           <button
diff --git a/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.spec.ts b/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.spec.ts
index 274eda4f72e..4d65ecac975 100644
--- a/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.component.spec.ts
@@ -13,6 +13,7 @@ import {
   ICON_TYPE,
   LaunchDialogService,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, of } from 'rxjs';
 import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
 import { ConfiguratorCommonsService } from '../../core/facade/configurator-commons.service';
@@ -88,6 +89,7 @@ describe('ConfiguratorRestartDialogComponent', () => {
         ConfiguratorRestartDialogComponent,
         MockCxIconComponent,
         MockKeyboadFocusDirective,
+        MockFeatureDirective,
       ],
       imports: [I18nTestingModule],
       providers: [
diff --git a/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.module.ts b/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.module.ts
index fdbaad69c99..9a69951c6fc 100644
--- a/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/restart-dialog/configurator-restart-dialog.module.ts
@@ -6,14 +6,24 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { IconModule, KeyboardFocusModule } from '@spartacus/storefront';
 import { ConfiguratorRestartDialogComponent } from './configurator-restart-dialog.component';
 import { defaultConfiguratorRestartDialogLayoutConfig } from './default-configurator-restart-dialog-layout.config';
 
 @NgModule({
   declarations: [ConfiguratorRestartDialogComponent],
-  imports: [CommonModule, I18nModule, IconModule, KeyboardFocusModule],
+  imports: [
+    CommonModule,
+    I18nModule,
+    IconModule,
+    KeyboardFocusModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(defaultConfiguratorRestartDialogLayoutConfig),
   ],
diff --git a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
index bae44d20e3c..3f3609d4aff 100644
--- a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
@@ -716,7 +716,8 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       expect(classUnderTest['isInViewport'](form)).toBe(false);
     });
 
-    it("should return true because window's innerWith is known", () => {
+    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
+    xit("should return true because window's innerWith is known", () => {
       form.style.display = 'flex';
       form.style.flexDirection = 'column';
 
@@ -725,7 +726,8 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       expect(classUnderTest['isInViewport'](form)).toBe(true);
     });
 
-    it('should return true because clientWidth of element is known and its right is less than its width', () => {
+    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
+    xit('should return true because clientWidth of element is known and its right is less than its width', () => {
       form.style.display = 'flex';
       form.style.flexDirection = 'column';
 
@@ -769,7 +771,8 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       expect(classUnderTest['getHeight']('cx-configurator-form')).toBe(0);
     });
 
-    it('should return offsetHeight of the element because form is not im viewport', () => {
+    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
+    xit('should return offsetHeight of the element because form is not im viewport', () => {
       spyOnProperty(window, 'innerWidth').and.returnValue(1000);
 
       expect(
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-overview-filter.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-overview-filter.scss
index e0726479f66..18333ff7606 100644
--- a/feature-libs/product-configurator/rulebased/styles/_configurator-overview-filter.scss
+++ b/feature-libs/product-configurator/rulebased/styles/_configurator-overview-filter.scss
@@ -37,4 +37,6 @@
       padding-inline-start: 10px;
     }
   }
+
+  @include cx-configurator-attribute-visible-focus();
 }
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/product-multi-dimensional/list/occ/config/default-occ-product-multi-dimensional-list-config.ts b/feature-libs/product-multi-dimensional/list/occ/config/default-occ-product-multi-dimensional-list-config.ts
deleted file mode 100644
index 32b85f2a6ff..00000000000
--- a/feature-libs/product-multi-dimensional/list/occ/config/default-occ-product-multi-dimensional-list-config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { OccConfig } from '@spartacus/core';
-
-export const defaultOccProductMultiDimensionalListConfig: OccConfig = {
-  backend: {
-    occ: {
-      endpoints: {
-        productSearch:
-          /* eslint-disable max-len */
-          'products/search?fields=products(code,name,summary,configurable,configuratorType,priceRange(maxPrice(formattedValue),minPrice(formattedValue)),multidimensional,price(FULL),images(DEFAULT),stock(FULL),averageRating,variantOptions,baseProduct),facets,breadcrumbs,pagination(DEFAULT),sorts(DEFAULT),freeTextSearch,currentQuery,keywordRedirectUrl',
-        /* eslint-enable */
-      },
-    },
-  },
-};
diff --git a/feature-libs/product-multi-dimensional/list/occ/ng-package.json b/feature-libs/product-multi-dimensional/list/occ/ng-package.json
deleted file mode 100644
index 2a9c6221b0e..00000000000
--- a/feature-libs/product-multi-dimensional/list/occ/ng-package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
-  "lib": {
-    "entryFile": "./public_api.ts"
-  }
-}
diff --git a/feature-libs/product-multi-dimensional/list/occ/product-multi-dimensional-list-occ.module.ts b/feature-libs/product-multi-dimensional/list/occ/product-multi-dimensional-list-occ.module.ts
deleted file mode 100644
index 3fdb7608c57..00000000000
--- a/feature-libs/product-multi-dimensional/list/occ/product-multi-dimensional-list-occ.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { NgModule } from '@angular/core';
-import { provideDefaultConfig } from '@spartacus/core';
-import { defaultOccProductMultiDimensionalListConfig } from './config/default-occ-product-multi-dimensional-list-config';
-
-@NgModule({
-  providers: [
-    provideDefaultConfig(defaultOccProductMultiDimensionalListConfig),
-  ],
-})
-export class ProductMultiDimensionalListOccModule {}
diff --git a/feature-libs/product-multi-dimensional/list/occ/public_api.ts b/feature-libs/product-multi-dimensional/list/occ/public_api.ts
deleted file mode 100644
index c76f3420b45..00000000000
--- a/feature-libs/product-multi-dimensional/list/occ/public_api.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export * from './product-multi-dimensional-list-occ.module';
diff --git a/feature-libs/product-multi-dimensional/list/product-multi-dimensional-list.module.ts b/feature-libs/product-multi-dimensional/list/product-multi-dimensional-list.module.ts
deleted file mode 100644
index e42d67acafa..00000000000
--- a/feature-libs/product-multi-dimensional/list/product-multi-dimensional-list.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { NgModule } from '@angular/core';
-import { ProductMultiDimensionalListOccModule } from './occ/product-multi-dimensional-list-occ.module';
-
-@NgModule({
-  imports: [ProductMultiDimensionalListOccModule],
-})
-export class ProductMultiDimensionalListModule {}
diff --git a/feature-libs/product-multi-dimensional/list/public_api.ts b/feature-libs/product-multi-dimensional/list/public_api.ts
index e6c70f12f46..7df45dca4f3 100644
--- a/feature-libs/product-multi-dimensional/list/public_api.ts
+++ b/feature-libs/product-multi-dimensional/list/public_api.ts
@@ -4,4 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './product-multi-dimensional-list.module';
+/*
+ * Public API Surface of Product-Multi-Dimensional List
+ */
+export {};
diff --git a/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/__snapshots__/index_spec.ts.snap b/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/__snapshots__/index_spec.ts.snap
index 3cdff129839..85281eba700 100644
--- a/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/__snapshots__/index_spec.ts.snap
@@ -2,38 +2,13 @@
 
 exports[`Spartacus Product Multi-Dimensional schematics: ng-add list feature eager loading should import appropriate modules 1`] = `
 "import { NgModule } from '@angular/core';
-import { ProductMultiDimensionalListModule } from "@spartacus/product-multi-dimensional/list";
 import { ProductMultiDimensionalListRootModule } from "@spartacus/product-multi-dimensional/list/root";
 
-@NgModule({
-  declarations: [],
-  imports: [
-    ProductMultiDimensionalListRootModule,
-    ProductMultiDimensionalListModule
-  ]
-})
-export class ProductMultiDimensionalListFeatureModule { }
-"
-`;
-
-exports[`Spartacus Product Multi-Dimensional schematics: ng-add list feature general setup should add the feature using the lazy loading syntax 1`] = `
-"import { NgModule } from '@angular/core';
-import { CmsConfig, provideConfig } from "@spartacus/core";
-import { PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE, ProductMultiDimensionalListRootModule } from "@spartacus/product-multi-dimensional/list/root";
-
 @NgModule({
   declarations: [],
   imports: [
     ProductMultiDimensionalListRootModule
-  ],
-  providers: [provideConfig(<CmsConfig>{
-    featureModules: {
-      [PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE]: {
-        module: () =>
-          import('@spartacus/product-multi-dimensional/list').then((m) => m.ProductMultiDimensionalListModule),
-      },
-    }
-  })]
+  ]
 })
 export class ProductMultiDimensionalListFeatureModule { }
 "
diff --git a/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/index_spec.ts b/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/index_spec.ts
index 6a0b9907c41..dae9f587404 100644
--- a/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/index_spec.ts
+++ b/feature-libs/product-multi-dimensional/schematics/add-product-multi-dimensional/index_spec.ts
@@ -196,13 +196,6 @@ describe('Spartacus Product Multi-Dimensional schematics: ng-add', () => {
         );
       });
 
-      it('should add the feature using the lazy loading syntax', async () => {
-        const module = appTree.readContent(
-          productMultiDimensionalListFeatureModulePath
-        );
-        expect(module).toMatchSnapshot();
-      });
-
       describe('styling', () => {
         it('should update angular.json', async () => {
           const content = appTree.readContent('/angular.json');
diff --git a/feature-libs/product-multi-dimensional/tsconfig.schematics.json b/feature-libs/product-multi-dimensional/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/product-multi-dimensional/tsconfig.schematics.json
+++ b/feature-libs/product-multi-dimensional/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-dialog/product-image-zoom-dialog.component.html b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-dialog/product-image-zoom-dialog.component.html
index 7ce53251df3..c4c48458293 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-dialog/product-image-zoom-dialog.component.html
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-dialog/product-image-zoom-dialog.component.html
@@ -1,6 +1,7 @@
 <div
   class="cx-image-zoom-dialog"
   role="dialog"
+  (esc)="close('Escape clicked')"
   [cxFocus]="focusConfig"
   [attr.aria-label]="'productImageZoomDialog.zoomedInImage' | cxTranslate"
 >
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.html b/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.html
index 473c6df9f31..8c21d4617a4 100644
--- a/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.html
+++ b/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.html
@@ -13,7 +13,21 @@
   >
     <!-- Modal Header -->
     <div class="cx-dialog-header modal-header">
-      <div id="dialogTitle" class="cx-dialog-title modal-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
+        {{
+          confirmationContext.title
+            | cxTranslate: { code: confirmationContext.quote.code }
+        }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
         {{
           confirmationContext.title
             | cxTranslate: { code: confirmationContext.quote.code }
diff --git a/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.spec.ts b/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.spec.ts
index 5af0bde79c4..e8b4ca1e29c 100644
--- a/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.spec.ts
+++ b/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.component.spec.ts
@@ -11,6 +11,7 @@ import {
   ICON_TYPE,
   LaunchDialogService,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { CommonQuoteTestUtilsService } from '../testing/common-quote-test-utils.service';
 import { QuoteConfirmDialogComponent } from './quote-confirm-dialog.component';
@@ -84,6 +85,7 @@ describe('QuoteConfirmDialogComponent', () => {
         QuoteConfirmDialogComponent,
         MockKeyboardFocusDirective,
         MockCxIconComponent,
+        MockFeatureDirective,
       ],
       providers: [
         CxDatePipe,
diff --git a/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.module.ts b/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.module.ts
index 1911ca21198..8a963e71bcf 100644
--- a/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.module.ts
+++ b/feature-libs/quote/components/confirm-dialog/quote-confirm-dialog.module.ts
@@ -8,7 +8,12 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { I18nModule, provideDefaultConfig, UrlModule } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+  UrlModule,
+} from '@spartacus/core';
 import {
   FormErrorsModule,
   IconModule,
@@ -30,6 +35,7 @@ import { QuoteConfirmDialogComponent } from './quote-confirm-dialog.component';
     RouterModule,
     KeyboardFocusModule,
     SpinnerModule,
+    FeaturesConfigModule,
   ],
   providers: [provideDefaultConfig(defaultQuoteActionDialogConfig)],
   declarations: [QuoteConfirmDialogComponent],
diff --git a/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts b/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts
index 859ec7295b7..f58273d61e7 100644
--- a/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts
+++ b/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts
@@ -126,7 +126,8 @@ describe('QuoteStorefrontUtilsService', () => {
       expect(classUnderTest['isInViewport'](list)).toBe(false);
     });
 
-    it("should return 'true' because window's innerWith is known", () => {
+    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
+    xit("should return 'true' because window's innerWith is known", () => {
       list.style.display = 'flex';
       list.style.flexDirection = 'column';
 
@@ -135,7 +136,8 @@ describe('QuoteStorefrontUtilsService', () => {
       expect(classUnderTest['isInViewport'](list)).toBe(true);
     });
 
-    it("should return 'true' because clientWidth of element is known and its right is less than its width", () => {
+    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
+    xit("should return 'true' because clientWidth of element is known and its right is less than its width", () => {
       list.style.display = 'flex';
       list.style.flexDirection = 'column';
 
@@ -179,7 +181,8 @@ describe('QuoteStorefrontUtilsService', () => {
       expect(classUnderTest['getHeight']('cx-quote-list')).toBe(0);
     });
 
-    it('should return offsetHeight of the element because component is not in viewport', () => {
+    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
+    xit('should return offsetHeight of the element because component is not in viewport', () => {
       spyOnProperty(window, 'innerWidth').and.returnValue(1000);
 
       expect(classUnderTest['getHeight']('cx-quote-list')).toBeGreaterThan(0);
diff --git a/feature-libs/quote/tsconfig.schematics.json b/feature-libs/quote/tsconfig.schematics.json
index e3e988982a9..711f58bf7a7 100644
--- a/feature-libs/quote/tsconfig.schematics.json
+++ b/feature-libs/quote/tsconfig.schematics.json
@@ -366,9 +366,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/requested-delivery-date/tsconfig.schematics.json b/feature-libs/requested-delivery-date/tsconfig.schematics.json
index 31d2d1798ec..6983407651f 100644
--- a/feature-libs/requested-delivery-date/tsconfig.schematics.json
+++ b/feature-libs/requested-delivery-date/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.html b/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.html
index 46cff816940..f65eb343e08 100644
--- a/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.html
+++ b/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.html
@@ -12,7 +12,18 @@
         <span class="info-icon">
           <cx-icon type="INFO"></cx-icon>
         </span>
-        <span id="verification-token-dialog-title" class="title modal-title">
+        <h3
+          *cxFeature="'a11yDialogsHeading'"
+          id="verification-token-dialog-title"
+          class="title modal-title"
+        >
+          {{ 'verificationTokenDialog.title' | cxTranslate }}
+        </h3>
+        <span
+          *cxFeature="'!a11yDialogsHeading'"
+          id="verification-token-dialog-title"
+          class="title modal-title"
+        >
           {{ 'verificationTokenDialog.title' | cxTranslate }}
         </span>
       </div>
diff --git a/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.spec.ts b/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.spec.ts
index 9a297751db8..ba0fe6c16e1 100644
--- a/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.spec.ts
+++ b/feature-libs/user/account/components/verification-token-form/verification-token-dialog.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { FocusDirective, LaunchDialogService } from '@spartacus/storefront';
 import { VERIFICATION_TOKEN_DIALOG_ACTION } from '@spartacus/user/account/root';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { VerificationTokenDialogComponent } from './verification-token-dialog.component';
 
 @Pipe({
@@ -28,6 +29,7 @@ describe('VerificationTokenDialogComponent', () => {
         VerificationTokenDialogComponent,
         MockTranslatePipe,
         FocusDirective,
+        MockFeatureDirective,
       ],
       providers: [
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
diff --git a/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.html b/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.html
index 03705268019..d38c31feb55 100644
--- a/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.html
+++ b/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.html
@@ -7,7 +7,18 @@
 >
   <div *ngIf="data$ | async as data" class="cx-suggested-addresses-container">
     <div class="cx-suggested-addresses-header cx-modal-header">
-      <div id="dialogTitle" class="cx-suggested-addresses-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-suggested-addresses-title"
+      >
+        {{ 'addressSuggestion.verifyYourAddress' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-suggested-addresses-title"
+      >
         {{ 'addressSuggestion.verifyYourAddress' | cxTranslate }}
       </div>
       <button
diff --git a/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.spec.ts b/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.spec.ts
index 9e6298ead40..5b8d8a205ef 100644
--- a/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.spec.ts
+++ b/feature-libs/user/profile/components/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.spec.ts
@@ -6,13 +6,14 @@ import { Address, I18nTestingModule } from '@spartacus/core';
 import { of } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import { SuggestedAddressDialogComponent } from './suggested-addresses-dialog.component';
-import createSpy = jasmine.createSpy;
 import {
   FocusDirective,
   ICON_TYPE,
   LaunchDialogService,
 } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
+import { SuggestedAddressDialogComponent } from './suggested-addresses-dialog.component';
+import createSpy = jasmine.createSpy;
 
 const mockData = {
   enteredAddress: {},
@@ -49,6 +50,7 @@ describe('SuggestedAddressDialogComponent', () => {
         SuggestedAddressDialogComponent,
         MockCxIconComponent,
         FocusDirective,
+        MockFeatureDirective,
       ],
     }).compileComponents();
   }));
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/cdp/tsconfig.schematics.json b/integration-libs/cdp/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/cdp/tsconfig.schematics.json
+++ b/integration-libs/cdp/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index 6ad5b5b7c79..74f88127740 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/cpq-quote/tsconfig.schematics.json b/integration-libs/cpq-quote/tsconfig.schematics.json
index 31d2d1798ec..6983407651f 100644
--- a/integration-libs/cpq-quote/tsconfig.schematics.json
+++ b/integration-libs/cpq-quote/tsconfig.schematics.json
@@ -363,9 +363,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.html b/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.html
index e29eb5fd048..867b257a083 100644
--- a/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.html
+++ b/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.html
@@ -9,7 +9,18 @@
   <div class="cx-modal-content">
     <!-- Modal Header -->
     <div class="cx-dialog-header modal-header">
-      <div id="dialogTitle" class="cx-dialog-title modal-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
+        {{ 'dpPaymentForm.confirmation.heading' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
         {{ 'dpPaymentForm.confirmation.heading' | cxTranslate }}
       </div>
       <button
diff --git a/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.spec.ts b/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.spec.ts
index bd2726be940..b05a395dc5e 100644
--- a/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.spec.ts
+++ b/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.component.spec.ts
@@ -1,9 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DpConfirmationDialogComponent } from './dp-confirmation-dialog.component';
-import { LaunchDialogService } from '@spartacus/storefront';
 import { ActivatedRoute, Router, convertToParamMap } from '@angular/router';
-import { of } from 'rxjs';
 import { I18nTestingModule } from '@spartacus/core';
+import { LaunchDialogService } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
+import { of } from 'rxjs';
+import { DpConfirmationDialogComponent } from './dp-confirmation-dialog.component';
 
 class MockLaunchDialogService {
   closeDialog(_x: any) {}
@@ -59,7 +60,7 @@ describe('DpConfirmationDialogComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [I18nTestingModule],
-      declarations: [DpConfirmationDialogComponent],
+      declarations: [DpConfirmationDialogComponent, MockFeatureDirective],
       providers: [
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         {
diff --git a/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.module.ts b/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.module.ts
index 15c0a4fddca..521c4ffeec3 100644
--- a/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.module.ts
+++ b/integration-libs/digital-payments/src/checkout/cms-components/dp-payment-method/dp-confirmation-dialog/dp-confirmation-dialog.module.ts
@@ -6,13 +6,23 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { IconModule, KeyboardFocusModule } from '@spartacus/storefront';
-import { DpConfirmationDialogComponent } from './dp-confirmation-dialog.component';
 import { defaultDpConfirmationDialogConfig } from './default-dp-confirmation-dialog.config';
+import { DpConfirmationDialogComponent } from './dp-confirmation-dialog.component';
 
 @NgModule({
-  imports: [CommonModule, I18nModule, KeyboardFocusModule, IconModule],
+  imports: [
+    CommonModule,
+    I18nModule,
+    KeyboardFocusModule,
+    IconModule,
+    FeaturesConfigModule,
+  ],
   providers: [provideDefaultConfig(defaultDpConfirmationDialogConfig)],
   declarations: [DpConfirmationDialogComponent],
 })
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/omf/tsconfig.schematics.json b/integration-libs/omf/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/omf/tsconfig.schematics.json
+++ b/integration-libs/omf/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/opps/tsconfig.schematics.json b/integration-libs/opps/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/opps/tsconfig.schematics.json
+++ b/integration-libs/opps/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/s4-service/tsconfig.schematics.json b/integration-libs/s4-service/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/s4-service/tsconfig.schematics.json
+++ b/integration-libs/s4-service/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
index ccc52e60bab..9f1f9485ea6 100644
--- a/integration-libs/segment-refs/tsconfig.schematics.json
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -350,9 +350,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
index a9fd2913b4e..991c7809f26 100644
--- a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
+++ b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
@@ -410,7 +410,8 @@ export interface FeatureTogglesInterface {
   /**
    * When enabled the button-like UI elements will use `<button>` under the hood instead of `<a>`
    * in the following components: `AddedToCartDialogComponent`, `ForgotPasswordComponent`,
-   * `LoginRegisterComponent`, `ConfigureProductComponent`, `AnonymousConsentDialogComponent`
+   * `LoginRegisterComponent`, `ConfigureProductComponent`, `AnonymousConsentDialogComponent`,
+   * `StoreSearchComponent`, `AddToSavedCartComponent`, `PickupOptionsComponent`
    */
   a11yUseButtonsForBtnLinks?: boolean;
 
@@ -491,6 +492,11 @@ export interface FeatureTogglesInterface {
    */
   a11yNgSelectMobileReadout?: boolean;
 
+  /**
+   * Changes modal title elements form divs into headings. Affects modals before version 2211.27.
+   */
+  a11yDialogsHeading?: boolean;
+
   /**
    * In OCC cart requests, it puts parameters of a cart name and cart description
    * into a request body, instead of query params.
@@ -507,7 +513,7 @@ export interface FeatureTogglesInterface {
 
 export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   showDeliveryOptionsTranslation: false,
-  formErrorsDescriptiveMessages: true,
+  formErrorsDescriptiveMessages: false,
   showSearchingCustomerByOrderInASM: false,
   showStyleChangesInASM: false,
   shouldHideAddToCartForUnpurchasableProducts: false,
@@ -517,7 +523,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   showPromotionsInPDP: false,
   recentSearches: false,
   pdfInvoicesSortByInvoiceDate: false,
-  storeFrontLibCardParagraphTruncated: false,
+  storeFrontLibCardParagraphTruncated: true,
   useProductCarouselBatchApi: false,
   productConfiguratorAttributeTypesV2: false,
   propagateErrorsToServer: false,
@@ -580,6 +586,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yRepeatedCancelOrderError: false,
   a11yAddedToCartActiveDialog: false,
   a11yNgSelectMobileReadout: false,
+  a11yDialogsHeading: false,
   occCartNameAndDescriptionInHttpRequestBody: false,
   cmsBottomHeaderSlotUsingFlexStyles: false,
 };
diff --git a/projects/core/src/occ/adapters/product/default-occ-product-config.ts b/projects/core/src/occ/adapters/product/default-occ-product-config.ts
index 2c91a43a020..9ec4b720f03 100644
--- a/projects/core/src/occ/adapters/product/default-occ-product-config.ts
+++ b/projects/core/src/occ/adapters/product/default-occ-product-config.ts
@@ -35,7 +35,7 @@ export const defaultOccProductConfig: OccConfig = {
         /* eslint-disable max-len */
         productSearch: {
           default:
-            'products/search?fields=products(code,name,summary,configurable,configuratorType,multidimensional,price(FULL),images(DEFAULT),stock(FULL),averageRating,variantOptions,baseProduct),facets,breadcrumbs,pagination(DEFAULT),sorts(DEFAULT),freeTextSearch,currentQuery,keywordRedirectUrl',
+            'products/search?fields=products(code,name,summary,configurable,configuratorType,multidimensional,price(FULL),images(DEFAULT),stock(FULL),averageRating,variantOptions,baseProduct,priceRange(maxPrice(formattedValue),minPrice(formattedValue))),facets,breadcrumbs,pagination(DEFAULT),sorts(DEFAULT),freeTextSearch,currentQuery,keywordRedirectUrl',
           carousel:
             'products/search?fields=products(code,purchasable,name,summary,price(formattedValue),stock(DEFAULT),images(DEFAULT,galleryIndex),baseProduct)',
           carouselMinimal:
diff --git a/projects/schematics/src/shared/lib-configs/product-multi-dimensional-schematics-config.ts b/projects/schematics/src/shared/lib-configs/product-multi-dimensional-schematics-config.ts
index 2ce91bf2dca..5bee973940f 100644
--- a/projects/schematics/src/shared/lib-configs/product-multi-dimensional-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/product-multi-dimensional-schematics-config.ts
@@ -24,13 +24,8 @@ export const PRODUCT_MULTI_DIMENSIONAL_SCSS_FILE_NAME =
 export const PRODUCT_MULTI_DIMENSIONAL_LIST_MODULE_NAME =
   'ProductMultiDimensionalList';
 
-export const PRODUCT_MULTI_DIMENSIONAL_LIST_MODULE =
-  'ProductMultiDimensionalListModule';
-
 export const PRODUCT_MULTI_DIMENSIONAL_LIST_ROOT_MODULE_NAME =
   'ProductMultiDimensionalListRootModule';
-export const PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE_NAME_CONSTANT =
-  'PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE';
 
 export const PRODUCT_MULTI_DIMENSIONAL_LIST_SCHEMATICS_CONFIG: SchematicConfig =
   {
@@ -41,20 +36,11 @@ export const PRODUCT_MULTI_DIMENSIONAL_LIST_SCHEMATICS_CONFIG: SchematicConfig =
     },
     folderName: PRODUCT_MULTI_DIMENSIONAL_FOLDER_NAME,
     moduleName: PRODUCT_MULTI_DIMENSIONAL_LIST_MODULE_NAME,
-    featureModule: [
-      {
-        name: PRODUCT_MULTI_DIMENSIONAL_LIST_MODULE,
-        importPath: SPARTACUS_PRODUCT_MULTI_DIMENSIONAL_LIST,
-      },
-    ],
+    featureModule: [],
     rootModule: {
       name: PRODUCT_MULTI_DIMENSIONAL_LIST_ROOT_MODULE_NAME,
       importPath: SPARTACUS_PRODUCT_MULTI_DIMENSIONAL_LIST_ROOT,
     },
-    lazyLoadingChunk: {
-      moduleSpecifier: SPARTACUS_PRODUCT_MULTI_DIMENSIONAL_LIST_ROOT,
-      namedImports: [PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE_NAME_CONSTANT],
-    },
   };
 
 export const PRODUCT_MULTI_DIMENSIONAL_SELECTOR_MODULE_NAME =
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-as-guest.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-as-guest.e2e.cy.ts
index 27ee986abce..2eeed46453d 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-as-guest.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-as-guest.e2e.cy.ts
@@ -6,21 +6,17 @@
 
 import * as checkoutMultiDVariants from '../../../helpers/checkout-multi-dimensional';
 import { viewportContext } from '../../../helpers/viewport-context';
-import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 
 context('Multi Dimensional - checkout as guest', () => {
   viewportContext(['desktop', 'mobile'], () => {
-    beforeEach('core tests', () => {
-      clearAllStorage();
+    describe('multi-d all-tests', () => {
+      checkoutMultiDVariants.testCheckoutMultiDAsGuest();
     });
-
-    checkoutMultiDVariants.testCheckoutMultiDAsGuest();
   });
 
   viewportContext(['desktop'], () => {
-    beforeEach('core tests', () => {
-      clearAllStorage();
+    describe('multi-d all-tests', () => {
+      checkoutMultiDVariants.testCheckoutMultiDAsGuestAndVerifyCart();
     });
-    checkoutMultiDVariants.testCheckoutMultiDAsGuestAndVerifyCart();
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-flow.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-flow.e2e.cy.ts
index 6610a7f71c2..ef037a19fb4 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-flow.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/multi-dimensional/multi-dimensional-checkout-flow.e2e.cy.ts
@@ -6,20 +6,11 @@
 
 import { viewportContext } from '../../../helpers/viewport-context';
 import * as checkoutMultiDVariants from '../../../helpers/checkout-multi-dimensional';
-import {
-  ELECTRONICS_BASESITE,
-  ELECTRONICS_CURRENCY,
-} from '../../../helpers/checkout-flow';
-import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 
 context('Multi Dimensional - checkout flow', () => {
   viewportContext(['desktop', 'mobile'], () => {
-    beforeEach(() => {
-      clearAllStorage();
-      Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
-      Cypress.env('BASE_CURRENCY', ELECTRONICS_CURRENCY);
+    describe('multi-d core-tests', () => {
+      checkoutMultiDVariants.testCheckoutRegisteredUser();
     });
-
-    checkoutMultiDVariants.testCheckoutRegisteredUser();
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-multi-dimensional.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-multi-dimensional.ts
index d147d79ed6c..d85e8cca5a8 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-multi-dimensional.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-multi-dimensional.ts
@@ -20,7 +20,7 @@ import { searchForProduct } from './product-search';
 import { addProductToCart } from './applied-promotions';
 
 export function testCheckoutMultiDAsGuest() {
-  it.skip('should perform checkout as guest, create an account and verify guest data', () => {
+  it('should perform checkout as guest, create an account and verify guest data', () => {
     const multiDUser = getSampleUser();
     checkout.visitHomePage();
     checkout.clickHamburger();
@@ -93,7 +93,7 @@ export function testCheckoutMultiDAsGuest() {
 }
 
 export function testCheckoutMultiDAsGuestAndVerifyCart() {
-  it.skip('should perform checkout as guest, create an account and verify guest data, and verify cart persists after registering', () => {
+  it('should perform checkout as guest, create an account and verify guest data, and verify cart persists after registering', () => {
     const multiDUser = getSampleUser();
 
     checkout.visitHomePage();
@@ -179,7 +179,7 @@ export function testCheckoutMultiDAsGuestAndVerifyCart() {
 }
 
 export function testCheckoutRegisteredUser() {
-  it.skip('should perform checkout with a registered user', () => {
+  it('should perform checkout with a registered user', () => {
     const regMultiDUser = getSampleUser();
     checkout.visitHomePage();
 
@@ -217,11 +217,14 @@ function selectVariantAndAddToCart(color: string = 'Blue') {
     .find(`img[title*="${color}"]`)
     .click();
 
-  cy.wait(2000);
+  cy.get('cx-product-multi-dimensional-selector')
+    .find(`button[aria-label*="Selected, ${color} Color"]`)
+    .should('be.visible');
 
   addProductToCart();
 
   cy.get('cx-added-to-cart-dialog.d-block.fade.modal.show')
+    .should('be.visible')
     .find('button.close[aria-label="Close Modal"]')
     .click();
 
@@ -233,7 +236,9 @@ export function selectVariant(color: string = 'Blue') {
     .find(`img[title*="${color}"]`)
     .click();
 
-  cy.wait(2000);
+  cy.get('cx-product-multi-dimensional-selector')
+    .find(`button[aria-label*="Selected, ${color} Color"]`)
+    .should('be.visible');
 }
 
 export function goToMultiDProductFromPLP() {
@@ -243,5 +248,5 @@ export function goToMultiDProductFromPLP() {
     .first()
     .click();
 
-  cy.wait(2000);
+  cy.get('cx-product-multi-dimensional-selector').should('be.visible');
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
index 8cb09304706..69ee6912ff9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
@@ -202,7 +202,7 @@ export function addProductToCart(product: SampleProduct, quantity: number) {
 export function clickSavedCartButtonsFromCartPage(position: number) {
   // 0 = Saved Carts 'link' button
   // 1 = Save Cart For Later 'link' button
-  cy.get(`cx-add-to-saved-cart a`)
+  cy.get(`cx-add-to-saved-cart .cx-action-link`)
     .eq(position)
     .should('exist')
     .click({ force: true });
diff --git a/projects/storefrontapp/src/app/spartacus/features/product-multi-dimensional/product-multi-dimensional-list-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/product-multi-dimensional/product-multi-dimensional-list-feature.module.ts
index 6ada84f8595..c9fcad7dff7 100644
--- a/projects/storefrontapp/src/app/spartacus/features/product-multi-dimensional/product-multi-dimensional-list-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/product-multi-dimensional/product-multi-dimensional-list-feature.module.ts
@@ -5,25 +5,9 @@
  */
 
 import { NgModule } from '@angular/core';
-import { provideConfig } from '@spartacus/core';
-import {
-  PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE,
-  ProductMultiDimensionalListRootModule,
-} from '@spartacus/product-multi-dimensional/list/root';
+import { ProductMultiDimensionalListRootModule } from '@spartacus/product-multi-dimensional/list/root';
 
 @NgModule({
   imports: [ProductMultiDimensionalListRootModule],
-  providers: [
-    provideConfig({
-      featureModules: {
-        [PRODUCT_MULTI_DIMENSIONAL_LIST_FEATURE]: {
-          module: () =>
-            import('@spartacus/product-multi-dimensional/list').then(
-              (m) => m.ProductMultiDimensionalListModule
-            ),
-        },
-      },
-    }),
-  ],
 })
 export class ProductMultiDimensionalListFeatureModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index d001aa19b10..16cbe57ea5d 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -359,6 +359,7 @@ if (environment.cpq) {
         a11yRepeatedCancelOrderError: true,
         a11yAddedToCartActiveDialog: true,
         a11yNgSelectMobileReadout: true,
+        a11yDialogsHeading: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,
       };
       return appFeatureToggles;
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index c215cd86c44..f69c0de0f96 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -235,9 +235,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "dist/product-multi-dimensional/list"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "dist/product-multi-dimensional/list/occ"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "dist/product-multi-dimensional/list/root"
       ],
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index 8da94c323a7..7adbca4f867 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -353,9 +353,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index 77378304b53..76f40ce3d9d 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -264,9 +264,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "../../dist/product-multi-dimensional/list"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "../../dist/product-multi-dimensional/list/occ"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "../../dist/product-multi-dimensional/list/root"
       ],
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.html b/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.html
index 1b0b2dc446b..2973e51b920 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.html
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.html
@@ -9,7 +9,18 @@
     <!-- Modal Header -->
 
     <div class="cx-dialog-header modal-header">
-      <div id="dialogTitle" class="cx-dialog-title modal-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
+        {{ 'myCoupons.dialogTitle' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
         {{ 'myCoupons.dialogTitle' | cxTranslate }}
       </div>
       <button
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.spec.ts
index 2cd9f90499d..7ccc63e8354 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.spec.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/coupon-card/coupon-dialog/coupon-dialog.component.spec.ts
@@ -2,11 +2,12 @@ import { Component, DebugElement, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { CustomerCoupon, I18nTestingModule } from '@spartacus/core';
+import { FocusDirective } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Observable, of } from 'rxjs';
 import { ICON_TYPE } from '../../../../../cms-components/misc/icon/index';
 import { LaunchDialogService } from '../../../../../layout/index';
 import { CouponDialogComponent } from './coupon-dialog.component';
-import { FocusDirective } from '@spartacus/storefront';
 
 const mockCoupon: CustomerCoupon = {
   couponId: 'CustomerCoupon',
@@ -45,6 +46,7 @@ describe('CouponDialogComponent', () => {
         CouponDialogComponent,
         MockCxIconComponent,
         FocusDirective,
+        MockFeatureDirective,
       ],
       imports: [I18nTestingModule],
       providers: [
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.module.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.module.ts
index bd28e91942c..3bc89d2d92b 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.module.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.module.ts
@@ -4,28 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import {
   AuthGuard,
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
+import { CmsPageGuard } from '../../../cms-structure/guards/cms-page.guard';
+import { PageLayoutComponent } from '../../../cms-structure/page/page-layout/page-layout.component';
+import { KeyboardFocusModule } from '../../../layout/index';
 import { CardModule } from '../../../shared/components/card/card.module';
+import { ListNavigationModule } from '../../../shared/components/list-navigation/list-navigation.module';
 import { SpinnerModule } from '../../../shared/components/spinner/spinner.module';
-import { MyCouponsComponent } from './my-coupons.component';
+import { IconModule } from '../../misc/icon/icon.module';
 import { CouponCardComponent } from './coupon-card/coupon-card.component';
-import { ListNavigationModule } from '../../../shared/components/list-navigation/list-navigation.module';
 import { CouponDialogComponent } from './coupon-card/coupon-dialog/coupon-dialog.component';
 import { CouponClaimComponent } from './coupon-claim/coupon-claim.component';
-import { CmsPageGuard } from '../../../cms-structure/guards/cms-page.guard';
-import { PageLayoutComponent } from '../../../cms-structure/page/page-layout/page-layout.component';
-import { IconModule } from '../../misc/icon/icon.module';
 import { defaultCouponLayoutConfig } from './default-coupon-card-layout.config';
-import { KeyboardFocusModule } from '../../../layout/index';
+import { MyCouponsComponent } from './my-coupons.component';
 
 @NgModule({
   imports: [
@@ -47,6 +48,7 @@ import { KeyboardFocusModule } from '../../../layout/index';
       },
     ]),
     KeyboardFocusModule,
+    FeaturesConfigModule,
   ],
   declarations: [
     MyCouponsComponent,
diff --git a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html
index 94048872470..f391cb4af78 100644
--- a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html
+++ b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html
@@ -7,7 +7,18 @@
 >
   <div class="cx-stock-notification-container">
     <div class="cx-dialog-header cx-modal-header">
-      <div id="dialogTitle" class="cx-dialog-title modal-title">
+      <h3
+        *cxFeature="'a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
+        {{ 'stockNotification.subscriptionDialog.header' | cxTranslate }}
+      </h3>
+      <div
+        *cxFeature="'!a11yDialogsHeading'"
+        id="dialogTitle"
+        class="cx-dialog-title modal-title"
+      >
         {{ 'stockNotification.subscriptionDialog.header' | cxTranslate }}
       </div>
       <button
diff --git a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.spec.ts b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.spec.ts
index 34b739b2fa7..c2d5592633c 100644
--- a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.spec.ts
@@ -1,19 +1,20 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
-import { StockNotificationDialogComponent } from './stock-notification-dialog.component';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import {
-  UserInterestsService,
   I18nTestingModule,
   NotificationPreference,
+  UserInterestsService,
 } from '@spartacus/core';
-import { SpinnerModule } from '../../../../shared/components/spinner/spinner.module';
-import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement } from '@angular/core';
-import { Observable, of } from 'rxjs';
-import { By } from '@angular/platform-browser';
+import { FocusDirective } from '@spartacus/storefront';
 import { UrlTestingModule } from 'projects/core/src/routing/configurable-routes/url-translation/testing/url-testing.module';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
+import { Observable, of } from 'rxjs';
 import { LaunchDialogService } from '../../../../layout/launch-dialog/services/index';
-import { FocusDirective } from '@spartacus/storefront';
+import { SpinnerModule } from '../../../../shared/components/spinner/spinner.module';
+import { StockNotificationDialogComponent } from './stock-notification-dialog.component';
 
 describe('StockNotificationDialogComponent', () => {
   let component: StockNotificationDialogComponent;
@@ -44,7 +45,11 @@ describe('StockNotificationDialogComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [StockNotificationDialogComponent, FocusDirective],
+      declarations: [
+        StockNotificationDialogComponent,
+        FocusDirective,
+        MockFeatureDirective,
+      ],
       imports: [
         I18nTestingModule,
         RouterTestingModule,
diff --git a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification.module.ts b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification.module.ts
index 66694bf4291..22f22356060 100644
--- a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification.module.ts
+++ b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification.module.ts
@@ -4,20 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { StockNotificationComponent } from './stock-notification.component';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
-import { StockNotificationDialogComponent } from './stock-notification-dialog/stock-notification-dialog.component';
-import { SpinnerModule } from '../../../shared/components/spinner/spinner.module';
 import { KeyboardFocusModule } from '../../../layout/a11y/keyboard-focus/keyboard-focus.module';
-import { RouterModule } from '@angular/router';
+import { SpinnerModule } from '../../../shared/components/spinner/spinner.module';
 import { defaultStockNotificationLayoutConfig } from './stock-notification-dialog/default-stock-notification-layout.config';
+import { StockNotificationDialogComponent } from './stock-notification-dialog/stock-notification-dialog.component';
+import { StockNotificationComponent } from './stock-notification.component';
 
 @NgModule({
   declarations: [StockNotificationComponent, StockNotificationDialogComponent],
@@ -28,6 +29,7 @@ import { defaultStockNotificationLayoutConfig } from './stock-notification-dialo
     SpinnerModule,
     UrlModule,
     KeyboardFocusModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(defaultStockNotificationLayoutConfig),
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index 00073938bad..5c7d06c2701 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -404,9 +404,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "feature-libs/product-multi-dimensional/list/root/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index d4842ba1581..cd0aff89ff4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -408,9 +408,6 @@
       "@spartacus/product-multi-dimensional/list": [
         "feature-libs/product-multi-dimensional/list/public_api"
       ],
-      "@spartacus/product-multi-dimensional/list/occ": [
-        "feature-libs/product-multi-dimensional/list/occ/public_api"
-      ],
       "@spartacus/product-multi-dimensional/list/root": [
         "feature-libs/product-multi-dimensional/list/root/public_api"
       ],