diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a76339bc13d..282b9ef6594 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Cache node_modules
@@ -277,7 +277,7 @@ jobs:
       - name: Notify the slack channel of when build conclusion failed
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        uses: slackapi/slack-github-action@v1.27.0
+        uses: slackapi/slack-github-action@v1.27.1
         with:
           channel-id: ${{ secrets.SLACK_NOTIFICATION_CHANNEL }}
           payload: |
diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index 55537ae3115..91f388e3a9f 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -16,15 +16,15 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular/core": "^18.2.9",
     "@angular/ssr": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1"
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/user": "2211.32.0"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^18.2.9",
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html
index 80a3a9f3b21..0e7c14a6698 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html
@@ -49,10 +49,13 @@ <h2 id="asm-create-customer-form-title" class="title modal-title">
                   placeholder="{{
                     'asm.createCustomerForm.firstName.placeholder' | cxTranslate
                   }}"
+                  [attr.aria-describedby]="'firstNameError'"
                   formControlName="firstName"
                   name="text"
                 />
                 <cx-form-errors
+                  id="firstNameError"
+                  aria-live="off"
                   [control]="registerForm.get('firstName')"
                 ></cx-form-errors>
               </label>
@@ -69,10 +72,13 @@ <h2 id="asm-create-customer-form-title" class="title modal-title">
                   placeholder="{{
                     'asm.createCustomerForm.lastName.placeholder' | cxTranslate
                   }}"
+                  [attr.aria-describedby]="'lastNameError'"
                   name="text"
                   formControlName="lastName"
                 />
                 <cx-form-errors
+                  id="lastNameError"
+                  aria-live="off"
                   [control]="registerForm.get('lastName')"
                 ></cx-form-errors>
               </label>
@@ -90,10 +96,13 @@ <h2 id="asm-create-customer-form-title" class="title modal-title">
                     'asm.createCustomerForm.emailAddress.placeholder'
                       | cxTranslate
                   }}"
+                  [attr.aria-describedby]="'emailError'"
                   name="email"
                   formControlName="email"
                 />
                 <cx-form-errors
+                  id="emailError"
+                  aria-live="off"
                   [control]="registerForm.get('email')"
                 ></cx-form-errors>
               </label>
diff --git a/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.html b/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.html
index 91b8238c42d..1c5cea09fde 100644
--- a/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.html
+++ b/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.html
@@ -12,11 +12,14 @@
       type="text"
       formControlName="userId"
       [attr.aria-label]="'asm.loginForm.userId.label' | cxTranslate"
+      [attr.aria-describedby]="'userIdError'"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="userIdError"
+      aria-live="off"
       [translationParams]="{
         label: 'asm.loginForm.userId.label' | cxTranslate,
       }"
@@ -38,12 +41,15 @@
       type="password"
       formControlName="password"
       [attr.aria-label]="'asm.loginForm.password.label' | cxTranslate"
+      [attr.aria-describedby]="'passwordError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="passwordError"
+      aria-live="off"
       [translationParams]="{
         label: 'asm.loginForm.password.label' | cxTranslate,
       }"
diff --git a/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.ts b/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.ts
index 0395366b38a..2a2f4b9beeb 100644
--- a/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.ts
+++ b/feature-libs/asm/components/csagent-login-form/csagent-login-form.component.ts
@@ -26,7 +26,7 @@ export class CSAgentLoginFormComponent implements OnInit {
   submitEvent = new EventEmitter<{ userId: string; password: string }>();
 
   constructor(protected fb: UntypedFormBuilder) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
     useFeatureStyles('a11yTextSpacingAdjustments');
   }
 
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.html b/feature-libs/asm/components/customer-selection/customer-selection.component.html
index 138e9f043db..185dea88af4 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.html
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.html
@@ -175,6 +175,7 @@
         type="text"
         formControlName="searchTerm"
         [attr.aria-label]="'asm.customerSearch.searchTerm.label' | cxTranslate"
+        [attr.aria-describedby]="'searchTermError'"
         placeholder="{{ 'asm.customerSearch.searchTerm.label' | cxTranslate }}"
         (keydown.arrowdown)="focusFirstItem($event)"
         (keydown.end)="setSelectionEnd($event)"
@@ -183,6 +184,8 @@
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="searchTermError"
+        aria-live="off"
         [translationParams]="{
           label: 'asm.customerSearch.searchTerm.label' | cxTranslate,
         }"
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index fa67208ade4..90dccf51338 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,14 +32,14 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefinder": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefinder": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
index 6be6a177de3..9ddda4e5208 100644
--- a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
+++ b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
@@ -43,6 +43,7 @@
     "
     type="submit"
     [disabled]="disabled || quantity <= 0 || quantity > maxQuantity"
+    [attr.aria-describedby]="productCode + '_header'"
   >
     <span
       *ngIf="
diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
index ee44fbb38f7..9e2e48606b5 100644
--- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
+++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
@@ -64,6 +64,7 @@
           <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
           <input
             [attr.aria-labelledby]="'card-coupon-input-label'"
+            [attr.aria-describedby]="'couponCodeError'"
             required="true"
             type="text"
             class="form-control input-coupon-code"
@@ -81,6 +82,8 @@
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="couponCodeError"
+            aria-live="off"
             [translationParams]="{
               label: 'voucher.placeholder' | cxTranslate,
             }"
diff --git a/feature-libs/cart/base/components/mini-cart/mini-cart.component.ts b/feature-libs/cart/base/components/mini-cart/mini-cart.component.ts
index 471803f9dae..f5ed0177d50 100644
--- a/feature-libs/cart/base/components/mini-cart/mini-cart.component.ts
+++ b/feature-libs/cart/base/components/mini-cart/mini-cart.component.ts
@@ -6,6 +6,7 @@
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ICON_TYPE } from '@spartacus/storefront';
+import { useFeatureStyles } from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { MiniCartComponentService } from './mini-cart-component.service';
 
@@ -21,5 +22,7 @@ export class MiniCartComponent {
 
   total$: Observable<string> = this.miniCartComponentService.getTotalPrice();
 
-  constructor(protected miniCartComponentService: MiniCartComponentService) {}
+  constructor(protected miniCartComponentService: MiniCartComponentService) {
+    useFeatureStyles('a11yMiniCartFocusOnMobile');
+  }
 }
diff --git a/feature-libs/cart/base/styles/components/_mini-cart.scss b/feature-libs/cart/base/styles/components/_mini-cart.scss
index 2a0022a780b..df40b478ded 100644
--- a/feature-libs/cart/base/styles/components/_mini-cart.scss
+++ b/feature-libs/cart/base/styles/components/_mini-cart.scss
@@ -51,27 +51,21 @@
     }
   }
 
-  @mixin native-high-contrast-fix {
-    @media (forced-colors: active) {
+  @include forFeature('a11yMiniCartFocusOnMobile') {
+    @include media-breakpoint-down(md) {
       a {
-        forced-color-adjust: none;
-        background: LinkText;
-        color: Canvas;
-
-        &:hover {
-          background: LinkText;
-          color: Canvas;
+        &:focus {
+          outline-offset: -4px;
+          outline-color: var(--cx-color-inverse);
+          box-shadow: 0 0 0 2px var(--cx-color-visual-focus) inset;
         }
       }
     }
   }
 
-  @include native-high-contrast-fix;
-
   @include cx-highContrastTheme {
     a {
       color: var(--cx-color-medium);
     }
-    @include native-high-contrast-fix;
   }
 }
diff --git a/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-to-new-saved-cart-form/import-to-new-saved-cart-form.component.html b/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-to-new-saved-cart-form/import-to-new-saved-cart-form.component.html
index b8e8e34e0a5..711f004a6e0 100644
--- a/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-to-new-saved-cart-form/import-to-new-saved-cart-form.component.html
+++ b/feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-to-new-saved-cart-form/import-to-new-saved-cart-form.component.html
@@ -49,8 +49,13 @@
         formControlName="name"
         required
         type="text"
+        [attr.aria-describedby]="'nameError'"
       />
-      <cx-form-errors [control]="form.get('name')"></cx-form-errors>
+      <cx-form-errors
+        id="nameError"
+        aria-live="off"
+        [control]="form.get('name')"
+      ></cx-form-errors>
     </label>
   </div>
 
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index c3a3cd684b6..bc86a4b3275 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -26,7 +26,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
index 9677c8c9ba7..0f38b0d9f18 100644
--- a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
+++ b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
@@ -71,6 +71,7 @@
         class="quick-order-results-product-container"
       >
         <button
+          *cxFeature="'!a11yQuickOrderSearchListKeyboardNavigation'"
           (blur)="onBlur($event)"
           (mousedown)="add(product, $event)"
           (keydown.arrowdown)="focusNextChild($event)"
@@ -103,6 +104,42 @@
           </span>
           <span class="price">{{ product.price?.formattedValue }}</span>
         </button>
+        <button
+          *cxFeature="'a11yQuickOrderSearchListKeyboardNavigation'"
+          (blur)="onBlur($event)"
+          (mousedown)="add(product, $event)"
+          (keydown.arrowdown)="focusNextChild($event)"
+          (keydown.arrowup)="focusPreviousChild($event)"
+          (keydown.enter)="add(product, $event)"
+          (keydown.escape)="clear($event)"
+          (keydown.tab)="close()"
+          (keydown.shift.tab)="close()"
+          [class.has-media]="
+            config?.quickOrder?.searchForm?.displayProductImages
+          "
+          class="quick-order-results-product"
+          role="option"
+        >
+          <cx-media
+            *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
+            [alt]="product.name"
+            [container]="product.images?.PRIMARY"
+            class="media"
+            format="thumbnail"
+            role="presentation"
+          ></cx-media>
+          <div class="name" [innerHTML]="product.name"></div>
+          <span class="id">
+            {{
+              'quickOrderForm.id'
+                | cxTranslate
+                  : {
+                      id: product.code,
+                    }
+            }}
+          </span>
+          <span class="price">{{ product.price?.formattedValue }}</span>
+        </button>
       </li>
     </ul>
 
diff --git a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.spec.ts b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.spec.ts
index 3a080868a6c..a525c31dd52 100644
--- a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.spec.ts
+++ b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.spec.ts
@@ -7,6 +7,7 @@ import {
   QuickOrderFacade,
 } from '@spartacus/cart/quick-order/root';
 import {
+  FeatureConfigService,
   FeaturesConfig,
   GlobalMessageService,
   GlobalMessageType,
@@ -64,6 +65,12 @@ class MockGlobalMessageService implements Partial<GlobalMessageService> {
   ): void {}
 }
 
+class MockFeatureConfigService {
+  isEnabled() {
+    return true;
+  }
+}
+
 @Component({
   selector: 'cx-icon',
   template: '',
@@ -101,6 +108,7 @@ describe('QuickOrderFormComponent', () => {
             features: { level: '5.1' },
           },
         },
+        { provide: FeatureConfigService, useClass: MockFeatureConfigService },
       ],
     }).compileComponents();
 
@@ -214,6 +222,20 @@ describe('QuickOrderFormComponent', () => {
       component.clear(ev as Event);
       expect(ev.preventDefault).toHaveBeenCalled();
     });
+
+    it('sets focus back to the input if results box was open', (done) => {
+      const inputSearch: HTMLElement = fixture.debugElement.query(
+        By.css('input')
+      ).nativeElement;
+
+      component.open();
+      expect(inputSearch).not.toBe(getFocusedElement());
+      component.clear();
+      requestAnimationFrame(() => {
+        expect(inputSearch).toBe(getFocusedElement());
+        done();
+      });
+    });
   });
 
   it('should not change focus on focusNextChild if results list is empty', () => {
diff --git a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.ts b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.ts
index 11d033d994f..485e895d860 100644
--- a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.ts
+++ b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.ts
@@ -9,6 +9,7 @@ import {
   ChangeDetectorRef,
   Component,
   ElementRef,
+  inject,
   Input,
   OnDestroy,
   OnInit,
@@ -16,7 +17,13 @@ import {
 } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { QuickOrderFacade } from '@spartacus/cart/quick-order/root';
-import { Config, Product, WindowRef, useFeatureStyles } from '@spartacus/core';
+import {
+  Config,
+  FeatureConfigService,
+  Product,
+  useFeatureStyles,
+  WindowRef,
+} from '@spartacus/core';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { Observable, Subscription } from 'rxjs';
 import {
@@ -45,6 +52,7 @@ export class QuickOrderFormComponent implements OnInit, OnDestroy {
 
   @ViewChild('quickOrderInput') quickOrderInput: ElementRef;
 
+  private featureConfigService = inject(FeatureConfigService);
   protected subscription = new Subscription();
   protected searchSubscription = new Subscription();
 
@@ -78,6 +86,15 @@ export class QuickOrderFormComponent implements OnInit, OnDestroy {
 
     if (this.isResultsBoxOpen()) {
       this.toggleBodyClass(SEARCH_BOX_ACTIVE_CLASS, false);
+      if (
+        this.featureConfigService.isEnabled(
+          'a11yQuickOrderSearchBoxRefocusOnClose'
+        )
+      ) {
+        requestAnimationFrame(() => {
+          this.quickOrderInput.nativeElement.focus();
+        });
+      }
     }
 
     const product = this.form.get('product')?.value;
@@ -140,6 +157,15 @@ export class QuickOrderFormComponent implements OnInit, OnDestroy {
 
     // Focus on first index moving to last
     if (results.length) {
+      if (
+        this.featureConfigService.isEnabled(
+          'a11ySearchableDropdownFirstElementFocus'
+        )
+      ) {
+        this.winRef.document
+          .querySelector('main')
+          ?.classList.remove('mouse-focus');
+      }
       if (focusedIndex >= results.length - 1) {
         results[0].focus();
       } else {
diff --git a/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.ts b/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.ts
index 70c463aec55..e7a9671ccc7 100644
--- a/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.ts
+++ b/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.ts
@@ -65,6 +65,7 @@ export class SavedCartListComponent implements OnInit, OnDestroy {
   ) {
     useFeatureStyles('a11ySavedCartsZoom');
     useFeatureStyles('a11yQTY2Quantity');
+    useFeatureStyles('a11yHighContrastBorders');
   }
 
   ngOnInit(): void {
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 1936e7f93f4..d2e90b698d9 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
@@ -236,6 +236,7 @@
                   required="true"
                   [maxLength]="nameMaxLength"
                   class="form-control"
+                  [attr.aria-describedby]="'nameError'"
                   formControlName="name"
                   required
                   type="text"
@@ -244,6 +245,8 @@
                 <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                 <cx-form-errors
                   *cxFeature="'formErrorsDescriptiveMessages'"
+                  id="nameError"
+                  aria-live="off"
                   [translationParams]="{
                     label: 'savedCartDialog.savedCartName' | cxTranslate,
                   }"
@@ -269,6 +272,7 @@
               <textarea
                 [maxLength]="descriptionMaxLength"
                 class="form-control"
+                [attr.aria-describedby]="'descriptionError'"
                 formControlName="description"
                 rows="5"
               ></textarea>
@@ -276,6 +280,8 @@
               <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
               <cx-form-errors
                 *cxFeature="'formErrorsDescriptiveMessages'"
+                id="descriptionError"
+                aria-live="off"
                 [translationParams]="{
                   label: 'savedCartDialog.savedCartDescription' | cxTranslate,
                 }"
diff --git a/feature-libs/cart/saved-cart/styles/_saved-cart-list.scss b/feature-libs/cart/saved-cart/styles/_saved-cart-list.scss
index e1dddeeacda..f397f0cb08a 100644
--- a/feature-libs/cart/saved-cart/styles/_saved-cart-list.scss
+++ b/feature-libs/cart/saved-cart/styles/_saved-cart-list.scss
@@ -149,6 +149,15 @@ cx-saved-cart-list {
         font-weight: $font-weight-normal;
       }
     }
+
+    @include cx-highContrastTheme {
+      @include forFeature('a11yHighContrastBorders') {
+        border-color: var(--cx-color-dark);
+        tr {
+          border-bottom-color: var(--cx-color-dark);
+        }
+      }
+    }
   }
 
   .cx-saved-cart-list-no-saved-carts {
diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html
index 02bfc18934a..41e4da72bf1 100644
--- a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html
+++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html
@@ -89,8 +89,11 @@
               'addressForm.firstName.placeholder' | cxTranslate
             }}"
             formControlName="firstName"
+            [attr.aria-describedby]="'firstNameError'"
           />
           <cx-form-errors
+            id="firstNameError"
+            aria-live="off"
             [control]="billingAddressForm.get('firstName')"
           ></cx-form-errors>
         </label>
@@ -107,8 +110,11 @@
             class="form-control"
             placeholder="{{ 'addressForm.lastName.placeholder' | cxTranslate }}"
             formControlName="lastName"
+            [attr.aria-describedby]="'lastNameError'"
           />
           <cx-form-errors
+            id="lastNameError"
+            aria-live="off"
             [control]="billingAddressForm.get('lastName')"
           ></cx-form-errors>
         </label>
@@ -125,8 +131,11 @@
             class="form-control"
             placeholder="{{ 'addressForm.streetAddress' | cxTranslate }}"
             formControlName="line1"
+            [attr.aria-describedby]="'line1Error'"
           />
           <cx-form-errors
+            id="line1Error"
+            aria-live="off"
             [control]="billingAddressForm.get('line1')"
           ></cx-form-errors>
         </label>
@@ -157,8 +166,11 @@
               class="form-control"
               placeholder="{{ 'addressForm.city.placeholder' | cxTranslate }}"
               formControlName="town"
+              [attr.aria-describedby]="'townError'"
             />
             <cx-form-errors
+              id="townError"
+              aria-live="off"
               [control]="billingAddressForm.get('town')"
             ></cx-form-errors>
           </label>
@@ -177,8 +189,11 @@
                 'addressForm.zipCode.placeholder' | cxTranslate
               }}"
               formControlName="postalCode"
+              [attr.aria-describedby]="'postalCodeError'"
             />
             <cx-form-errors
+              id="postalCodeError"
+              aria-live="off"
               [control]="billingAddressForm.get('postalCode')"
             ></cx-form-errors>
           </label>
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
index 782e22c6dba..53a504d2601 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
@@ -1,5 +1,11 @@
 import { ChangeDetectionStrategy, Component, Input, Type } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { ActiveCartFacade } from '@spartacus/cart/base/root';
@@ -547,4 +553,25 @@ describe('CheckoutDeliveryAddressComponent', () => {
       expect(getSpinner()).toBeFalsy();
     });
   });
+
+  describe('focusCardAfterSelecting', () => {
+    it('should refocus the selected card after updating', fakeAsync(() => {
+      const card = document.createElement('cx-card');
+      const selectButton = document.createElement('button');
+      card.appendChild(selectButton);
+      card.tabIndex = 0;
+      document.body.appendChild(card);
+      selectButton.focus();
+      component['isUpdating$'] = of(false);
+      spyOn(card, 'focus');
+      spyOn(component['focusService'], 'findFirstFocusable').and.returnValue(
+        card
+      );
+
+      component.focusCardAfterSelecting();
+      tick(16); // Wait for requestAnimationFrame
+
+      expect(card.focus).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
index c1d9e5b34fd..1cbf8ebf925 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
@@ -24,15 +24,21 @@ import {
   GlobalMessageType,
   TranslationService,
   UserAddressService,
+  WindowRef,
   getLastValueSync,
 } from '@spartacus/core';
-import { Card, getAddressNumbers } from '@spartacus/storefront';
+import {
+  Card,
+  SelectFocusUtility,
+  getAddressNumbers,
+} from '@spartacus/storefront';
 import { BehaviorSubject, Observable, combineLatest } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 import { CheckoutConfigService } from '../services';
@@ -79,6 +85,9 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     );
   }
 
+  @Optional() protected focusService = inject(SelectFocusUtility);
+  @Optional() protected windowRef = inject(WindowRef);
+
   constructor(
     protected userAddressService: UserAddressService,
     protected checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
@@ -155,6 +164,38 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     );
 
     this.setAddress(address);
+    if (this.featureConfigService?.isEnabled('a11yFocusOnCardAfterSelecting')) {
+      this.focusCardAfterSelecting();
+    }
+  }
+
+  /**
+   * Restores the focus to the Card component after it has been selected and the checkout has finished updating.
+   * The focus is lost due to DOM changes making it otherwise impossible to target elements that have been removed.
+   */
+  focusCardAfterSelecting(): void {
+    const cardNodes = Array.from(
+      this.windowRef?.document.querySelectorAll('cx-card')
+    );
+    const triggeredCard =
+      this.windowRef?.document.activeElement?.closest('cx-card');
+
+    if (triggeredCard) {
+      const selectedCardIndex = cardNodes.indexOf(triggeredCard);
+      this.isUpdating$
+        .pipe(
+          filter((isUpdating) => !isUpdating),
+          take(1)
+        )
+        .subscribe(() => {
+          requestAnimationFrame(() => {
+            const selectedCard = this.windowRef?.document.querySelectorAll(
+              'cx-card'
+            )[selectedCardIndex] as HTMLElement;
+            this.focusService.findFirstFocusable(selectedCard)?.focus();
+          });
+        });
+    }
   }
 
   addAddress(address: Address | undefined): void {
diff --git a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html
index 1cad8005f2a..83cb8889fdc 100644
--- a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html
+++ b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html
@@ -17,11 +17,14 @@
         placeholder="{{
           'checkoutLogin.emailAddress.placeholder' | cxTranslate
         }}"
+        [attr.aria-describedby]="'emailError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="emailError"
+        aria-live="off"
         [translationParams]="{
           label: 'checkoutLogin.emailAddress.label' | cxTranslate,
         }"
@@ -50,11 +53,14 @@
         placeholder="{{
           'checkoutLogin.confirmEmail.placeholder' | cxTranslate
         }}"
+        [attr.aria-describedby]="'emailConfirmationError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="emailConfirmationError"
+        aria-live="off"
         [translationParams]="{
           label: 'checkoutLogin.confirmEmail.label' | cxTranslate,
         }"
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html
index d16e3fcd095..7f4f7dcb58c 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html
@@ -70,11 +70,14 @@
                 'paymentForm.accountHolderName.placeholder' | cxTranslate
               }}"
               formControlName="accountHolderName"
+              [attr.aria-describedby]="'accountHolderNameError'"
             />
 
             <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
             <cx-form-errors
               *cxFeature="'formErrorsDescriptiveMessages'"
+              id="accountHolderNameError"
+              aria-live="off"
               [translationParams]="{
                 label: 'paymentForm.accountHolderName.label' | cxTranslate,
               }"
@@ -99,11 +102,14 @@
               type="text"
               class="form-control"
               formControlName="cardNumber"
+              [attr.aria-describedby]="'cardNumberError'"
             />
 
             <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
             <cx-form-errors
               *cxFeature="'formErrorsDescriptiveMessages'"
+              id="cardNumberError"
+              aria-live="off"
               [translationParams]="{
                 label: 'paymentForm.cardNumber' | cxTranslate,
               }"
@@ -217,11 +223,14 @@
                 class="form-control"
                 id="cVVNumber"
                 formControlName="cvn"
+                [attr.aria-describedby]="'cvnError'"
               />
 
               <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
               <cx-form-errors
                 *cxFeature="'formErrorsDescriptiveMessages'"
+                id="cvnError"
+                aria-live="off"
                 [translationParams]="{
                   label: 'paymentForm.securityCode' | cxTranslate,
                 }"
@@ -363,11 +372,14 @@
                       'addressForm.firstName.placeholder' | cxTranslate
                     }}"
                     formControlName="firstName"
+                    [attr.aria-describedby]="'firstNameError'"
                   />
 
                   <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                   <cx-form-errors
                     *cxFeature="'formErrorsDescriptiveMessages'"
+                    id="firstNameError"
+                    aria-live="off"
                     [translationParams]="{
                       label: 'addressForm.firstName.label' | cxTranslate,
                     }"
@@ -396,11 +408,14 @@
                       'addressForm.lastName.placeholder' | cxTranslate
                     }}"
                     formControlName="lastName"
+                    [attr.aria-describedby]="'lastNameError'"
                   />
 
                   <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                   <cx-form-errors
                     *cxFeature="'formErrorsDescriptiveMessages'"
+                    id="lastNameError"
+                    aria-live="off"
                     [translationParams]="{
                       label: 'addressForm.lastName.label' | cxTranslate,
                     }"
@@ -429,11 +444,14 @@
                       'addressForm.streetAddress' | cxTranslate
                     }}"
                     formControlName="line1"
+                    [attr.aria-describedby]="'line1Error'"
                   />
 
                   <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                   <cx-form-errors
                     *cxFeature="'formErrorsDescriptiveMessages'"
+                    id="line1Error"
+                    aria-live="off"
                     [translationParams]="{
                       label: 'addressForm.address1' | cxTranslate,
                     }"
@@ -476,11 +494,14 @@
                         'addressForm.city.placeholder' | cxTranslate
                       }}"
                       formControlName="town"
+                      [attr.aria-describedby]="'townError'"
                     />
 
                     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                     <cx-form-errors
                       *cxFeature="'formErrorsDescriptiveMessages'"
+                      id="townError"
+                      aria-live="off"
                       [translationParams]="{
                         label: 'addressForm.city.label' | cxTranslate,
                       }"
@@ -509,11 +530,14 @@
                         'addressForm.zipCode.placeholder' | cxTranslate
                       }}"
                       formControlName="postalCode"
+                      [attr.aria-describedby]="'postalCodeError'"
                     />
 
                     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                     <cx-form-errors
                       *cxFeature="'formErrorsDescriptiveMessages'"
+                      id="postalCodeError"
+                      aria-live="off"
                       [translationParams]="{
                         label: 'addressForm.zipCode.label' | cxTranslate,
                       }"
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
index 4065eef6967..1d0270d368c 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
@@ -1,5 +1,11 @@
 import { Component, Input, Type } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { ActiveCartFacade } from '@spartacus/cart/base/root';
@@ -19,7 +25,7 @@ import {
 } from '@spartacus/core';
 import { CardComponent, ICON_TYPE } from '@spartacus/storefront';
 import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
-import { BehaviorSubject, EMPTY, Observable, Subject, of } from 'rxjs';
+import { BehaviorSubject, EMPTY, Observable, of, Subject } from 'rxjs';
 import { CheckoutStepService } from '../services/checkout-step.service';
 import { CheckoutPaymentMethodComponent } from './checkout-payment-method.component';
 import createSpy = jasmine.createSpy;
@@ -667,5 +673,26 @@ describe('CheckoutPaymentMethodComponent', () => {
         ).toEqual('button');
       });
     });
+
+    describe('focusCardAfterSelecting', () => {
+      it('should refocus the selected card after updating', fakeAsync(() => {
+        const card = document.createElement('cx-card');
+        const selectButton = document.createElement('button');
+        card.appendChild(selectButton);
+        card.tabIndex = 0;
+        document.body.appendChild(card);
+        selectButton.focus();
+        component['isUpdating$'] = of(false);
+        spyOn(card, 'focus');
+        spyOn(component['focusService'], 'findFirstFocusable').and.returnValue(
+          card
+        );
+
+        component.focusCardAfterSelecting();
+        tick(16); // Wait for requestAnimationFrame
+
+        expect(card.focus).toHaveBeenCalled();
+      }));
+    });
   });
 });
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.ts
index 1753de43e99..958383bc586 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.ts
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.ts
@@ -7,10 +7,10 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  inject,
   OnDestroy,
   OnInit,
   Optional,
-  inject,
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ActiveCartFacade } from '@spartacus/cart/base/root';
@@ -27,8 +27,9 @@ import {
   PaymentDetails,
   TranslationService,
   UserPaymentService,
+  WindowRef,
 } from '@spartacus/core';
-import { Card, ICON_TYPE } from '@spartacus/storefront';
+import { Card, ICON_TYPE, SelectFocusUtility } from '@spartacus/storefront';
 import {
   BehaviorSubject,
   combineLatest,
@@ -58,6 +59,8 @@ export class CheckoutPaymentMethodComponent implements OnInit, OnDestroy {
   @Optional() protected featureConfigService = inject(FeatureConfigService, {
     optional: true,
   });
+  @Optional() protected focusService = inject(SelectFocusUtility);
+  @Optional() protected windowRef = inject(WindowRef);
 
   cards$: Observable<{ content: Card; paymentMethod: PaymentDetails }[]>;
   iconTypes = ICON_TYPE;
@@ -218,6 +221,38 @@ export class CheckoutPaymentMethodComponent implements OnInit, OnDestroy {
     );
 
     this.savePaymentMethod(paymentDetails);
+    if (this.featureConfigService?.isEnabled('a11yFocusOnCardAfterSelecting')) {
+      this.focusCardAfterSelecting();
+    }
+  }
+
+  /**
+   * Restores the focus to the Card component after it has been selected and the checkout has finished updating.
+   * The focus is lost due to DOM changes making it otherwise impossible to target elements that have been removed.
+   */
+  focusCardAfterSelecting(): void {
+    const cardNodes = Array.from(
+      this.windowRef?.document.querySelectorAll('cx-card')
+    );
+    const triggeredCard =
+      this.windowRef?.document.activeElement?.closest('cx-card');
+
+    if (triggeredCard) {
+      const selectedCardIndex = cardNodes.indexOf(triggeredCard);
+      this.isUpdating$
+        .pipe(
+          filter((isUpdating) => !isUpdating),
+          take(1)
+        )
+        .subscribe(() => {
+          requestAnimationFrame(() => {
+            const selectedCard = this.windowRef?.document.querySelectorAll(
+              'cx-card'
+            )[selectedCardIndex] as HTMLElement;
+            this.focusService.findFirstFocusable(selectedCard)?.focus();
+          });
+        });
+    }
   }
 
   showNewPaymentForm(): void {
diff --git a/feature-libs/checkout/base/components/checkout-review/checkout-review-payment/checkout-review-payment.component.ts b/feature-libs/checkout/base/components/checkout-review/checkout-review-payment/checkout-review-payment.component.ts
index d48fa5f51cd..5289b2ca582 100644
--- a/feature-libs/checkout/base/components/checkout-review/checkout-review-payment/checkout-review-payment.component.ts
+++ b/feature-libs/checkout/base/components/checkout-review/checkout-review-payment/checkout-review-payment.component.ts
@@ -9,10 +9,14 @@ import {
   CheckoutPaymentFacade,
   CheckoutStepType,
 } from '@spartacus/checkout/base/root';
-import { PaymentDetails, TranslationService } from '@spartacus/core';
+import {
+  PaymentDetails,
+  TranslationService,
+  useFeatureStyles,
+} from '@spartacus/core';
 import { billingAddressCard, paymentMethodCard } from '@spartacus/order/root';
 import { Card, ICON_TYPE } from '@spartacus/storefront';
-import { combineLatest, Observable } from 'rxjs';
+import { Observable, combineLatest } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { CheckoutStepService } from '../../services/checkout-step.service';
 
@@ -32,7 +36,9 @@ export class CheckoutReviewPaymentComponent {
     protected checkoutStepService: CheckoutStepService,
     protected checkoutPaymentFacade: CheckoutPaymentFacade,
     protected translationService: TranslationService
-  ) {}
+  ) {
+    useFeatureStyles('a11yHighContrastBorders');
+  }
 
   paymentDetails$: Observable<PaymentDetails | undefined> =
     this.checkoutPaymentFacade.getPaymentDetailsState().pipe(
diff --git a/feature-libs/checkout/base/styles/components/steps/review/_review.scss b/feature-libs/checkout/base/styles/components/steps/review/_review.scss
index f0ff3d5e6bf..c3b1fe39cdf 100644
--- a/feature-libs/checkout/base/styles/components/steps/review/_review.scss
+++ b/feature-libs/checkout/base/styles/components/steps/review/_review.scss
@@ -152,6 +152,9 @@
     background-color: var(--cx-color-background);
     .cx-review-summary-payment-card {
       background-color: var(--cx-color-background);
+      @include forFeature('a11yHighContrastBorders') {
+        border-color: var(--cx-color-dark);
+      }
     }
     .cx-review-summary {
       background-color: var(--cx-color-background);
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index bc2d645a0ee..198e2d2d713 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,13 +32,13 @@
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.html b/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.html
index ac54c190feb..bbd485b618d 100644
--- a/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.html
+++ b/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.html
@@ -1,8 +1,13 @@
-<div class="cx-order-type-card">
+<div
+  class="cx-order-type-card"
+  role="region"
+  [attr.aria-labelledby]="'checkout-schedule-replenishment-order-title'"
+>
   <div class="cx-label-container">
     <!-- TODO: (CXSPA-6306) - Remove feature flag next major release -->
     <h3
       *cxFeature="'a11yScheduleReplenishment'"
+      id="checkout-schedule-replenishment-order-title"
       class="cx-order-replenishment-header"
     >
       {{ 'checkoutScheduledReplenishment.autoReplenishOrder' | cxTranslate }}
diff --git a/feature-libs/customer-ticketing/components/details/customer-ticketing-close/customer-ticketing-close-dialog/customer-ticketing-close-dialog.component.html b/feature-libs/customer-ticketing/components/details/customer-ticketing-close/customer-ticketing-close-dialog/customer-ticketing-close-dialog.component.html
index 3f54ad75a94..2a7185f7f5e 100644
--- a/feature-libs/customer-ticketing/components/details/customer-ticketing-close/customer-ticketing-close-dialog/customer-ticketing-close-dialog.component.html
+++ b/feature-libs/customer-ticketing/components/details/customer-ticketing-close/customer-ticketing-close-dialog/customer-ticketing-close-dialog.component.html
@@ -34,10 +34,15 @@
             [maxLength]="inputCharactersLimit"
             class="form-control"
             formControlName="message"
+            [attr.aria-describedby]="'messageError'"
             rows="5"
           ></textarea>
 
-          <cx-form-errors [control]="form.get('message')"></cx-form-errors>
+          <cx-form-errors
+            id="messageError"
+            aria-live="off"
+            [control]="form.get('message')"
+          ></cx-form-errors>
 
           <p class="cx-customer-ticket-input-hint">
             {{
diff --git a/feature-libs/customer-ticketing/components/details/customer-ticketing-reopen/customer-ticketing-reopen-dialog/customer-ticketing-reopen-dialog.component.html b/feature-libs/customer-ticketing/components/details/customer-ticketing-reopen/customer-ticketing-reopen-dialog/customer-ticketing-reopen-dialog.component.html
index 9207b6db8e7..01c41cc2df4 100644
--- a/feature-libs/customer-ticketing/components/details/customer-ticketing-reopen/customer-ticketing-reopen-dialog/customer-ticketing-reopen-dialog.component.html
+++ b/feature-libs/customer-ticketing/components/details/customer-ticketing-reopen/customer-ticketing-reopen-dialog/customer-ticketing-reopen-dialog.component.html
@@ -34,9 +34,14 @@
             class="form-control"
             formControlName="message"
             rows="5"
+            [attr.aria-describedby]="'messageError'"
           ></textarea>
 
-          <cx-form-errors [control]="form.get('message')"></cx-form-errors>
+          <cx-form-errors
+            id="messageError"
+            aria-live="off"
+            [control]="form.get('message')"
+          ></cx-form-errors>
 
           <p class="cx-customer-ticket-input-hint">
             {{
diff --git a/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.html b/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.html
index 56179763eef..2bae1dd4e51 100644
--- a/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.html
+++ b/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.html
@@ -38,9 +38,14 @@
             class="form-control"
             formControlName="subject"
             rows="1"
+            [attr.aria-describedby]="'subjectError'"
           ></textarea>
 
-          <cx-form-errors [control]="form.get('subject')"></cx-form-errors>
+          <cx-form-errors
+            id="subjectError"
+            aria-live="off"
+            [control]="form.get('subject')"
+          ></cx-form-errors>
           <p class="cx-customer-ticket-input-hint">
             {{
               'customerTicketing.charactersLeft'
@@ -110,9 +115,14 @@
             class="form-control"
             formControlName="message"
             rows="5"
+            [attr.aria-describedby]="'messageError'"
           ></textarea>
 
-          <cx-form-errors [control]="form.get('message')"></cx-form-errors>
+          <cx-form-errors
+            id="messageError"
+            aria-live="off"
+            [control]="form.get('message')"
+          ></cx-form-errors>
 
           <p class="cx-customer-ticket-input-hint">
             {{
diff --git a/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.ts b/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.ts
index e29f203d752..10f4b1acb43 100644
--- a/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.ts
+++ b/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.ts
@@ -5,7 +5,11 @@
  */
 
 import { Component } from '@angular/core';
-import { RoutingService, TranslationService } from '@spartacus/core';
+import {
+  RoutingService,
+  TranslationService,
+  useFeatureStyles,
+} from '@spartacus/core';
 import {
   CustomerTicketingConfig,
   CustomerTicketingFacade,
@@ -14,7 +18,7 @@ import {
   TicketList,
 } from '@spartacus/customer-ticketing/root';
 import { ICON_TYPE } from '@spartacus/storefront';
-import { combineLatest, Observable } from 'rxjs';
+import { Observable, combineLatest } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
 @Component({
@@ -27,7 +31,9 @@ export class CustomerTicketingListComponent {
     protected routingService: RoutingService,
     protected translationService: TranslationService,
     protected customerTicketingConfig: CustomerTicketingConfig
-  ) {}
+  ) {
+    useFeatureStyles('a11yHighContrastBorders');
+  }
   PAGE_SIZE =
     this.customerTicketingConfig.customerTicketing?.listViewPageSize || 5;
   sortType: string;
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 2a48a9bf3fb..cd4cb566b6b 100644
--- a/feature-libs/customer-ticketing/package.json
+++ b/feature-libs/customer-ticketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/customer-ticketing",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Customer-Ticketing library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -30,11 +30,11 @@
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/customer-ticketing/styles/components/_customer-ticketing-list.scss b/feature-libs/customer-ticketing/styles/components/_customer-ticketing-list.scss
index 3464bf472ba..87c6e08c7ac 100644
--- a/feature-libs/customer-ticketing/styles/components/_customer-ticketing-list.scss
+++ b/feature-libs/customer-ticketing/styles/components/_customer-ticketing-list.scss
@@ -69,6 +69,15 @@
         }
       }
     }
+
+    @include cx-highContrastTheme {
+      @include forFeature('a11yHighContrastBorders') {
+        border-top-color: var(--cx-color-dark);
+        tr {
+          border-bottom-color: var(--cx-color-dark);
+        }
+      }
+    }
   }
 
   .cx-ticketing-list-thead-mobile {
diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
index 6b99d9dac16..846a3d4fe84 100644
--- a/feature-libs/estimated-delivery-date/package.json
+++ b/feature-libs/estimated-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/estimated-delivery-date",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Estimated Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,18 +22,18 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html
index 5fce3dc6482..098b33d3e2c 100644
--- a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html
+++ b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html
@@ -26,12 +26,15 @@ <h3>{{ 'checkoutOrderConfirmation.createAccount' | cxTranslate }}</h3>
             placeholder="{{ 'register.password.placeholder' | cxTranslate }}"
             formControlName="password"
             [attr.aria-label]="'register.password.placeholder' | cxTranslate"
+            [attr.aria-describedby]="'passwordError'"
             cxPasswordVisibilitySwitch
           />
 
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="passwordError"
+            aria-live="off"
             [translationParams]="{
               label: 'register.password.label' | cxTranslate,
             }"
@@ -63,12 +66,15 @@ <h3>{{ 'checkoutOrderConfirmation.createAccount' | cxTranslate }}</h3>
             [attr.aria-label]="
               'register.confirmPassword.placeholder' | cxTranslate
             "
+            [attr.aria-describedby]="'passwordconfError'"
             cxPasswordVisibilitySwitch
           />
 
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="passwordconfError"
+            aria-live="off"
             [translationParams]="{
               label: 'register.confirmPassword.label' | cxTranslate,
             }"
diff --git a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts
index d6890c11f8f..9b88f12f628 100644
--- a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts
+++ b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts
@@ -74,7 +74,7 @@ export class OrderGuestRegisterFormComponent implements OnDestroy {
     protected authService: AuthService,
     protected fb: UntypedFormBuilder
   ) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   submit() {
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index 58baca82ff4..1b974abe30c 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Order feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/pdf-invoices": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/pdf-invoices": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html
index 5a22499e841..30df147a8fe 100644
--- a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html
+++ b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html
@@ -20,11 +20,14 @@
           class="cx-account-summary-document-filter-form-input"
           [type]="type"
           formControlName="from"
+          [attr.aria-describedby]="'fromError'"
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="fromError"
+          aria-live="off"
           [translationParams]="{
             label: 'orgAccountSummary.filter.startRange' | cxTranslate,
           }"
@@ -58,11 +61,14 @@
           class="cx-account-summary-document-filter-form-input"
           [type]="type"
           formControlName="to"
+          [attr.aria-describedby]="'toError'"
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="toError"
+          aria-live="off"
           [translationParams]="{
             label: 'orgAccountSummary.filter.endRange' | cxTranslate,
           }"
@@ -187,11 +193,14 @@
       <input
         class="cx-account-summary-document-filter-form-input"
         formControlName="documentNumber"
+        [attr.aria-describedby]="'documentNumberError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="documentNumberError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgAccountSummary.filter.documentNumber' | cxTranslate,
         }"
diff --git a/feature-libs/organization/account-summary/styles/components/_cx-account-summary-document-filter.scss b/feature-libs/organization/account-summary/styles/components/_cx-account-summary-document-filter.scss
index 4eb3451f05b..9b2151b1705 100644
--- a/feature-libs/organization/account-summary/styles/components/_cx-account-summary-document-filter.scss
+++ b/feature-libs/organization/account-summary/styles/components/_cx-account-summary-document-filter.scss
@@ -29,6 +29,14 @@ cx-account-summary-document-filter {
     border-style: solid;
     border-color: var(--cx-color-light);
     border-radius: 4px;
+    @include forFeature('a11yImproveContrast') {
+      border-color: var(--cx-color-dark);
+    }
+
+    @include cx-highContrastTheme {
+      background-color: var(--cx-color-background);
+      color: var(--color-text);
+    }
   }
 
   .cx-account-summary-document-filter-form-button-block {
diff --git a/feature-libs/organization/administration/components/budget/form/budget-form.component.html b/feature-libs/organization/administration/components/budget/form/budget-form.component.html
index 4ac5e6a0097..7813707e62f 100644
--- a/feature-libs/organization/administration/components/budget/form/budget-form.component.html
+++ b/feature-libs/organization/administration/components/budget/form/budget-form.component.html
@@ -15,11 +15,14 @@
         placeholder="{{ 'orgBudget.name' | cxTranslate }}"
         formControlName="name"
         (blur)="createCodeWithName(form.get('name'), form.get('code'))"
+        [attr.aria-describedby]="'nameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="nameError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgBudget.name' | cxTranslate,
         }"
@@ -43,11 +46,14 @@
         required
         placeholder="{{ 'orgBudget.code' | cxTranslate }}"
         formControlName="code"
+        [attr.aria-describedby]="'codeError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="codeError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgBudget.code' | cxTranslate,
         }"
@@ -143,11 +149,14 @@
         placeholder="{{ 'orgBudget.amount' | cxTranslate }}"
         formControlName="budget"
         min="0"
+        [attr.aria-describedby]="'budgetError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="budgetError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgBudget.amount' | cxTranslate,
         }"
diff --git a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.html b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.html
index 630a01d552f..e29d6f2853f 100644
--- a/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.html
+++ b/feature-libs/organization/administration/components/cost-center/form/cost-center-form.component.html
@@ -15,11 +15,14 @@
         placeholder="{{ 'orgCostCenter.name' | cxTranslate }}"
         formControlName="name"
         (blur)="createCodeWithName(form.get('name'), form.get('code'))"
+        [attr.aria-describedby]="'nameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="nameError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgCostCenter.name' | cxTranslate,
         }"
@@ -43,11 +46,14 @@
         required
         placeholder="{{ 'orgCostCenter.code' | cxTranslate }}"
         formControlName="code"
+        [attr.aria-describedby]="'codeError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="codeError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgCostCenter.code' | cxTranslate,
         }"
diff --git a/feature-libs/organization/administration/components/permission/form/permission-form.component.html b/feature-libs/organization/administration/components/permission/form/permission-form.component.html
index 5107835c57d..8c1fa4a1fd5 100644
--- a/feature-libs/organization/administration/components/permission/form/permission-form.component.html
+++ b/feature-libs/organization/administration/components/permission/form/permission-form.component.html
@@ -14,11 +14,14 @@
         required
         placeholder="{{ 'orgPurchaseLimit.code' | cxTranslate }}"
         formControlName="code"
+        [attr.aria-describedby]="'codeError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="codeError"
+        aria-live="off"
         [translationParams]="{ label: 'orgPurchaseLimit.code' | cxTranslate }"
         [control]="form.get('code')"
       ></cx-form-errors>
@@ -146,11 +149,14 @@
         required
         placeholder="{{ 'orgPurchaseLimit.threshold' | cxTranslate }}"
         formControlName="threshold"
+        [attr.aria-describedby]="'thresholdError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="thresholdError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgPurchaseLimit.threshold' | cxTranslate,
         }"
diff --git a/feature-libs/organization/administration/components/unit/form/unit-form.component.html b/feature-libs/organization/administration/components/unit/form/unit-form.component.html
index 27226913a22..74707c78fec 100644
--- a/feature-libs/organization/administration/components/unit/form/unit-form.component.html
+++ b/feature-libs/organization/administration/components/unit/form/unit-form.component.html
@@ -15,10 +15,13 @@
         placeholder="{{ 'orgUnit.name' | cxTranslate }}"
         formControlName="name"
         (blur)="createUidWithName(form.get('name'), form.get('uid'))"
+        [attr.aria-describedby]="'nameError'"
       />
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="nameError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgUnit.name' | cxTranslate,
         }"
@@ -42,11 +45,14 @@
         required
         placeholder="{{ 'orgUnit.uid' | cxTranslate }}"
         formControlName="uid"
+        [attr.aria-describedby]="'uidError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="uidError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgUnit.uid' | cxTranslate,
         }"
diff --git a/feature-libs/organization/administration/components/unit/links/addresses/form/unit-address-form.component.html b/feature-libs/organization/administration/components/unit/links/addresses/form/unit-address-form.component.html
index 18edbd8ebbb..c2fd28d53e0 100644
--- a/feature-libs/organization/administration/components/unit/links/addresses/form/unit-address-form.component.html
+++ b/feature-libs/organization/administration/components/unit/links/addresses/form/unit-address-form.component.html
@@ -69,11 +69,14 @@
         type="text"
         placeholder="{{ 'orgUnitAddress.firstName' | cxTranslate }}"
         formControlName="firstName"
+        [attr.aria-describedby]="'firstNameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="firstNameError"
+        aria-live="off"
         [translationParams]="{
           label: 'orgUnitAddress.firstName' | cxTranslate,
         }"
@@ -96,11 +99,14 @@
         class="form-control"
         placeholder="{{ 'orgUnitAddress.lastName' | cxTranslate }}"
         formControlName="lastName"
+        [attr.aria-describedby]="'lastNameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="lastNameError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUnitAddress.lastName' | cxTranslate }"
         [control]="form.get('lastName')"
       ></cx-form-errors>
@@ -122,11 +128,14 @@
         class="form-control"
         placeholder="{{ 'orgUnitAddress.streetAddress' | cxTranslate }}"
         formControlName="line1"
+        [attr.aria-describedby]="'line1Error'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="line1Error"
+        aria-live="off"
         [translationParams]="{ label: 'orgUnitAddress.address1' | cxTranslate }"
         [control]="form.get('line1')"
       ></cx-form-errors>
@@ -172,11 +181,14 @@
         class="form-control"
         placeholder="{{ 'orgUnitAddress.city' | cxTranslate }}"
         formControlName="town"
+        [attr.aria-describedby]="'townError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="townError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUnitAddress.city' | cxTranslate }"
         [control]="form.get('town')"
       ></cx-form-errors>
@@ -198,11 +210,14 @@
         class="form-control"
         placeholder="{{ 'orgUnitAddress.zipCode' | cxTranslate }}"
         formControlName="postalCode"
+        [attr.aria-describedby]="'postalCodeError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="postalCodeError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUnitAddress.zipCode' | cxTranslate }"
         [control]="form.get('postalCode')"
       ></cx-form-errors>
diff --git a/feature-libs/organization/administration/components/user-group/form/user-group-form.component.html b/feature-libs/organization/administration/components/user-group/form/user-group-form.component.html
index bfee5c884e5..9519c223b37 100644
--- a/feature-libs/organization/administration/components/user-group/form/user-group-form.component.html
+++ b/feature-libs/organization/administration/components/user-group/form/user-group-form.component.html
@@ -15,11 +15,14 @@
         placeholder="{{ 'orgUserGroup.name' | cxTranslate }}"
         formControlName="name"
         (blur)="createUidWithName(form.get('name'), form.get('uid'))"
+        [attr.aria-describedby]="'nameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="nameError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUserGroup.name' | cxTranslate }"
         [control]="form.get('name')"
       ></cx-form-errors>
@@ -41,11 +44,14 @@
         required
         placeholder="{{ 'orgUserGroup.uid' | cxTranslate }}"
         formControlName="uid"
+        [attr.aria-describedby]="'uidError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="uidError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUserGroup.uid' | cxTranslate }"
         [control]="form.get('uid')"
       ></cx-form-errors>
diff --git a/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.html b/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.html
index a5083e394aa..911244d3d9d 100644
--- a/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.html
+++ b/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.html
@@ -29,11 +29,14 @@
           formControlName="password"
           [attr.aria-label]="'orgUser.password.newPassword' | cxTranslate"
           cxPasswordVisibilitySwitch
+          [attr.aria-describedby]="'passwordError'"
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="passwordError"
+          aria-live="off"
           [translationParams]="{
             label: 'orgUser.password.newPassword' | cxTranslate,
           }"
@@ -57,12 +60,15 @@
           placeholder="{{ 'orgUser.password.confirmPassword' | cxTranslate }}"
           formControlName="confirmPassword"
           [attr.aria-label]="'orgUser.password.confirmPassword' | cxTranslate"
+          [attr.aria-describedby]="'confirmPasswordError'"
           cxPasswordVisibilitySwitch
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="confirmPasswordError"
+          aria-live="off"
           [translationParams]="{
             label: 'orgUser.password.confirmPassword' | cxTranslate,
           }"
diff --git a/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.ts b/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.ts
index 158c873139c..af235ce430e 100644
--- a/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.ts
+++ b/feature-libs/organization/administration/components/user/change-password-form/user-change-password-form.component.ts
@@ -30,7 +30,7 @@ export class UserChangePasswordFormComponent {
     protected formService: UserChangePasswordFormService,
     protected messageService: MessageService
   ) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   save(form: UntypedFormGroup): void {
diff --git a/feature-libs/organization/administration/components/user/form/user-form.component.html b/feature-libs/organization/administration/components/user/form/user-form.component.html
index 7e670ca5362..2f8a28c3e4c 100644
--- a/feature-libs/organization/administration/components/user/form/user-form.component.html
+++ b/feature-libs/organization/administration/components/user/form/user-form.component.html
@@ -42,11 +42,14 @@
         required
         placeholder="{{ 'orgUser.firstName' | cxTranslate }}"
         formControlName="firstName"
+        [attr.aria-describedby]="'firstNameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="firstNameError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUser.firstName' | cxTranslate }"
         [control]="form.get('firstName')"
       ></cx-form-errors>
@@ -68,11 +71,14 @@
         required
         placeholder="{{ 'orgUser.lastName' | cxTranslate }}"
         formControlName="lastName"
+        [attr.aria-describedby]="'lastNameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="lastNameError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUser.lastName' | cxTranslate }"
         [control]="form.get('lastName')"
       ></cx-form-errors>
@@ -94,11 +100,14 @@
         required
         placeholder="{{ 'orgUser.email' | cxTranslate }}"
         formControlName="email"
+        [attr.aria-describedby]="'emailError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="emailError"
+        aria-live="off"
         [translationParams]="{ label: 'orgUser.email' | cxTranslate }"
         [control]="form.get('email')"
       ></cx-form-errors>
diff --git a/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html b/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html
index 42d9e17fb27..d92ecb71ef3 100644
--- a/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html
+++ b/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html
@@ -41,11 +41,14 @@
             rows="3"
             formControlName="comment"
             maxlength="255"
+            [attr.aria-describedby]="'commentError'"
           ></textarea>
 
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="commentError"
+            aria-live="off"
             [translationParams]="{
               label:
                 'orderApprovalDetails.form.comment_' +
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index f268deec846..9007c621052 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Organization library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html b/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html
index e59ed3f9a8b..70aa5287313 100644
--- a/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html
+++ b/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html
@@ -168,10 +168,19 @@
                     class="cx-unit-level-order-history-value"
                   >
                     {{ order?.orgCustomer?.name }}
-                    <span class="text-ellipsis">{{
-                      order?.orgCustomer?.email
-                    }}</span></a
-                  >
+                    <ng-container
+                      *cxFeature="'a11yTruncatedTextUnitLevelOrderHistory'"
+                    >
+                      <span>{{ order?.orgCustomer?.email }}</span>
+                    </ng-container>
+                    <ng-container
+                      *cxFeature="'!a11yTruncatedTextUnitLevelOrderHistory'"
+                    >
+                      <span class="text-ellipsis">{{
+                        order?.orgCustomer?.email
+                      }}</span>
+                    </ng-container>
+                  </a>
                 </td>
                 <td class="cx-unit-level-order-history-unit">
                   <div class="cx-unit-level-order-history-label">
diff --git a/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.ts b/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.ts
index 31e4e7ecb18..9020ccfef5f 100644
--- a/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.ts
+++ b/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.ts
@@ -38,6 +38,7 @@ export class UnitLevelOrderHistoryComponent implements OnDestroy {
     protected translation: TranslationService
   ) {
     useFeatureStyles('a11yTruncatedTextForResponsiveView');
+    useFeatureStyles('a11yTruncatedTextUnitLevelOrderHistory');
   }
 
   orders$: Observable<OrderHistoryList | undefined> = this.unitOrdersFacade
diff --git a/feature-libs/organization/unit-order/styles/components/unit-level-order-history/_unit-level-order-history.scss b/feature-libs/organization/unit-order/styles/components/unit-level-order-history/_unit-level-order-history.scss
index ba68d4329d0..82cfb8df943 100644
--- a/feature-libs/organization/unit-order/styles/components/unit-level-order-history/_unit-level-order-history.scss
+++ b/feature-libs/organization/unit-order/styles/components/unit-level-order-history/_unit-level-order-history.scss
@@ -23,6 +23,9 @@
 
   .cx-unit-level-order-history-filter-label-wrapper {
     width: 200px;
+    @include forFeature('a11yTruncatedTextUnitLevelOrderHistory') {
+      width: unset;
+    }
     border: 1px solid var(--cx-color-secondary);
     border-radius: 3px;
   }
@@ -106,7 +109,7 @@
           padding-bottom: 1.25rem;
         }
       }
-
+      // TODO: Remove following .text-ellipsis block once 'a11yTruncatedTextUnitLevelOrderHistory' feature flag is removed
       .text-ellipsis {
         @include media-breakpoint-up(md) {
           overflow: hidden;
diff --git a/feature-libs/organization/user-registration/components/form/user-registration-form.component.html b/feature-libs/organization/user-registration/components/form/user-registration-form.component.html
index 1da2edd7079..204ea8afa6a 100644
--- a/feature-libs/organization/user-registration/components/form/user-registration-form.component.html
+++ b/feature-libs/organization/user-registration/components/form/user-registration-form.component.html
@@ -46,11 +46,14 @@
           'userRegistrationForm.fields.firstName.placeholder' | cxTranslate
         }}"
         formControlName="firstName"
+        [attr.aria-describedby]="'firstNameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="firstNameError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.firstName.label' | cxTranslate,
         }"
@@ -77,11 +80,14 @@
           'userRegistrationForm.fields.lastName.placeholder' | cxTranslate
         }}"
         formControlName="lastName"
+        [attr.aria-describedby]="'lastNameError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="lastNameError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.lastName.label' | cxTranslate,
         }"
@@ -108,9 +114,12 @@
           'userRegistrationForm.fields.companyName.placeholder' | cxTranslate
         }}"
         formControlName="companyName"
+        [attr.aria-describedby]="'companyNameError'"
       />
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="companyNameError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.companyName.label' | cxTranslate,
         }"
@@ -136,11 +145,14 @@
           'userRegistrationForm.fields.email.placeholder' | cxTranslate
         }}"
         formControlName="email"
+        [attr.aria-describedby]="'emailError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="emailError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.email.label' | cxTranslate,
         }"
@@ -207,11 +219,14 @@
           'userRegistrationForm.fields.addressLine.placeholder' | cxTranslate
         }}"
         formControlName="line1"
+        [attr.aria-describedby]="'line1Error'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="line1Error"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.addressLine.label' | cxTranslate,
         }"
@@ -236,8 +251,13 @@
             | cxTranslate
         }}"
         formControlName="line2"
+        [attr.aria-describedby]="'line2Error'"
       />
-      <cx-form-errors [control]="registerForm.get('line2')"></cx-form-errors>
+      <cx-form-errors
+        id="line2Error"
+        aria-live="off"
+        [control]="registerForm.get('line2')"
+      ></cx-form-errors>
     </label>
 
     <label>
@@ -251,8 +271,13 @@
           'userRegistrationForm.fields.city.label' | cxTranslate
         }}"
         formControlName="town"
+        [attr.aria-describedby]="'townError'"
       />
-      <cx-form-errors [control]="registerForm.get('town')"></cx-form-errors>
+      <cx-form-errors
+        id="townError"
+        aria-live="off"
+        [control]="registerForm.get('town')"
+      ></cx-form-errors>
     </label>
 
     <label>
@@ -266,11 +291,14 @@
           'userRegistrationForm.fields.postalCode.placeholder' | cxTranslate
         }}"
         formControlName="postalCode"
+        [attr.aria-describedby]="'postalCodeError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="postalCodeError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.postalCode.label' | cxTranslate,
         }"
@@ -333,11 +361,14 @@
           'userRegistrationForm.fields.phoneNumber.placeholder' | cxTranslate
         }}"
         formControlName="phoneNumber"
+        [attr.aria-describedby]="'phoneNumberError'"
       />
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="phoneNumberError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.phoneNumber.label' | cxTranslate,
         }"
@@ -361,11 +392,14 @@
           'userRegistrationForm.fields.message.placeholder' | cxTranslate
         }}"
         rows="5"
+        [attr.aria-describedby]="'messageError'"
       ></textarea>
 
       <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="messageError"
+        aria-live="off"
         [translationParams]="{
           label: 'userRegistrationForm.fields.message.label' | cxTranslate,
         }"
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index a4a9adf36e4..b745240ae4b 100644
--- a/feature-libs/pdf-invoices/package.json
+++ b/feature-libs/pdf-invoices/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pdf-invoices",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Invoices library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,17 +22,17 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts
index 682bcba5ebc..4acea335894 100644
--- a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts
@@ -20,7 +20,7 @@ import {
   LAUNCH_CALLER,
   LaunchDialogService,
 } from '@spartacus/storefront';
-import { Observable, of, Subscription } from 'rxjs';
+import { firstValueFrom, Observable, of, Subscription } from 'rxjs';
 import { PdpPickupOptionsContainerComponent } from './pdp-pickup-options-container.component';
 
 import { MockIntendedPickupLocationService } from '../../../core/facade/intended-pickup-location.service.spec';
@@ -53,7 +53,7 @@ class MockPickupLocationsSearchFacade implements PickupLocationsSearchFacade {
   getStockLevelAtStore = createSpy().and.returnValue(
     of({ stockLevel: { displayName: 'London School' } })
   );
-  getStoreDetails = createSpy();
+  getStoreDetails = createSpy().and.returnValue(of({ name: 'London School' }));
   loadStoreDetails = createSpy();
 }
 
@@ -220,6 +220,34 @@ describe('PdpPickupOptionsComponent', () => {
       expect(component.openDialog).not.toHaveBeenCalled();
     });
 
+    it('should return undefined if intendedLocation.displayName is not defined', async () => {
+      spyOn(
+        intendedPickupLocationService,
+        'getIntendedLocation'
+      ).and.returnValue(of({ pickupOption: 'pickup', displayName: undefined }));
+      spyOn(component, 'setIntendedPickupLocation');
+      const displayLocation = await firstValueFrom(
+        component.displayPickupLocation$
+      );
+      expect(displayLocation).toEqual(undefined);
+    });
+
+    it('setIntendedPickupLocation should set pickupOption as delivery', async () => {
+      spyOn(
+        preferredStoreFacade,
+        'getPreferredStoreWithProductInStock'
+      ).and.returnValue(
+        of({ name: 'London School', displayName: 'London School' })
+      );
+      component.setIntendedPickupLocation('productCode');
+      expect(
+        intendedPickupLocationService.setIntendedLocation
+      ).toHaveBeenCalledWith('productCode', {
+        name: 'London School',
+        pickupOption: 'delivery',
+      });
+    });
+
     it('should open dialog if displayName is not set and a11yPickupOptionsTabs disabled', () => {
       spyOn(featureConfigService, 'isEnabled').and.returnValue(false);
       spyOn(component, 'openDialog');
diff --git a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts
index 930a66c4458..b416ba30bf1 100644
--- a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts
+++ b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts
@@ -32,7 +32,7 @@ import {
   LAUNCH_CALLER,
   LaunchDialogService,
 } from '@spartacus/storefront';
-import { combineLatest, iif, Observable, of, Subscription } from 'rxjs';
+import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import {
   concatMap,
   filter,
@@ -114,34 +114,15 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
           .getIntendedLocation(productCode)
           .pipe(map((intendedLocation) => ({ intendedLocation, productCode })))
       ),
-      switchMap(({ intendedLocation, productCode }) =>
-        iif(
-          () => !!intendedLocation && !!intendedLocation.displayName,
-          of(getProperty(intendedLocation, 'displayName')),
-          this.preferredStoreFacade
-            .getPreferredStoreWithProductInStock(productCode)
-            .pipe(
-              map(({ name }) => name),
-              tap((storeName) =>
-                this.pickupLocationsSearchService.loadStoreDetails(storeName)
-              ),
-              concatMap((storeName: string) =>
-                this.pickupLocationsSearchService.getStoreDetails(storeName)
-              ),
-              filter((storeDetails) => !!storeDetails),
-              tap((storeDetails) => {
-                this.intendedPickupLocationService.setIntendedLocation(
-                  productCode,
-                  {
-                    ...storeDetails,
-                    pickupOption: 'delivery',
-                  }
-                );
-              })
-            )
-        )
-      ),
-      tap(() => (this.displayNameIsSet = true))
+      switchMap(({ intendedLocation, productCode }) => {
+        if (intendedLocation?.displayName) {
+          this.displayNameIsSet = true;
+          return of(getProperty(intendedLocation, 'displayName'));
+        }
+
+        this.setIntendedPickupLocation(productCode);
+        return of(undefined);
+      })
     );
 
     this.intendedPickupLocation$ = this.currentProductService.getProduct().pipe(
@@ -177,6 +158,29 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
     this.subscription.unsubscribe();
   }
 
+  setIntendedPickupLocation(productCode: string) {
+    this.subscription.add(
+      this.preferredStoreFacade
+        .getPreferredStoreWithProductInStock(productCode)
+        .pipe(
+          map(({ name }) => name),
+          tap((storeName) =>
+            this.pickupLocationsSearchService.loadStoreDetails(storeName)
+          ),
+          concatMap((storeName: string) =>
+            this.pickupLocationsSearchService.getStoreDetails(storeName)
+          ),
+          filter((storeDetails) => !!storeDetails)
+        )
+        .subscribe((storeDetails) => {
+          this.intendedPickupLocationService.setIntendedLocation(productCode, {
+            ...storeDetails,
+            pickupOption: 'delivery',
+          });
+        })
+    );
+  }
+
   // TODO: Make argument required once 'a11yDialogTriggerRefocus' feature flag is removed.
   /**
    * @deprecated since 2211.28.0 - The use of TriggerElement param will become mandatory.
diff --git a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.html b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.html
index ddfce31a06a..b24cc4ef021 100644
--- a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.html
+++ b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.html
@@ -1,30 +1,69 @@
-<div
-  [attr.data-preferred-store]="pointOfServiceName.name"
-  [attr.data-store-is-selected]="
-    pointOfServiceName.name === (storeSelected$ | async)?.name
-  "
-  class="setpreferredstore-container"
-  (click)="setAsPreferred()"
->
+<ng-container *cxFeature="'a11yRepeatingButtonsUniqueLabels'">
+  <ng-container *ngIf="{ storeSelected: storeSelected$ | async } as data">
+    <div
+      [attr.data-preferred-store]="pointOfServiceName.name"
+      [attr.data-store-is-selected]="
+        pointOfServiceName.name === data.storeSelected?.name
+      "
+      class="setpreferredstore-container"
+      (click)="setAsPreferred()"
+    >
+      <div
+        [ngClass]="
+          pointOfServiceName.name === data.storeSelected?.name
+            ? 'icon-selected'
+            : 'icon-not-selected'
+        "
+      >
+        <cx-icon aria-hidden="true" [type]="ICON_TYPE.HEART"></cx-icon>
+      </div>
+      <button
+        data-text="setPreferredStore.myStore"
+        [attr.data-preferred-store]="pointOfServiceName.name"
+        class="set-preferred-heading"
+        [attr.aria-label]="
+          (getSetStoreButtonLabel(data.storeSelected?.name || '')
+            | cxTranslate) +
+          ', ' +
+          pointOfServiceName.displayName
+        "
+      >
+        {{
+          getSetStoreButtonLabel(data.storeSelected?.name || '') | cxTranslate
+        }}
+      </button>
+    </div>
+  </ng-container>
+</ng-container>
+<ng-container *cxFeature="'!a11yRepeatingButtonsUniqueLabels'">
   <div
-    [ngClass]="{
-      'icon-selected':
-        pointOfServiceName.name === (storeSelected$ | async)?.name,
-      'icon-not-selected':
-        pointOfServiceName.name !== (storeSelected$ | async)?.name,
-    }"
-  >
-    <cx-icon aria-hidden="true" [type]="ICON_TYPE.HEART"></cx-icon>
-  </div>
-  <button
-    data-text="setPreferredStore.myStore"
     [attr.data-preferred-store]="pointOfServiceName.name"
-    class="set-preferred-heading"
-  >
-    {{
+    [attr.data-store-is-selected]="
       pointOfServiceName.name === (storeSelected$ | async)?.name
-        ? ('setPreferredStore.myStore' | cxTranslate)
-        : ('setPreferredStore.makeThisMyStore' | cxTranslate)
-    }}
-  </button>
-</div>
+    "
+    class="setpreferredstore-container"
+    (click)="setAsPreferred()"
+  >
+    <div
+      [ngClass]="{
+        'icon-selected':
+          pointOfServiceName.name === (storeSelected$ | async)?.name,
+        'icon-not-selected':
+          pointOfServiceName.name !== (storeSelected$ | async)?.name,
+      }"
+    >
+      <cx-icon aria-hidden="true" [type]="ICON_TYPE.HEART"></cx-icon>
+    </div>
+    <button
+      data-text="setPreferredStore.myStore"
+      [attr.data-preferred-store]="pointOfServiceName.name"
+      class="set-preferred-heading"
+    >
+      {{
+        pointOfServiceName.name === (storeSelected$ | async)?.name
+          ? ('setPreferredStore.myStore' | cxTranslate)
+          : ('setPreferredStore.makeThisMyStore' | cxTranslate)
+      }}
+    </button>
+  </div>
+</ng-container>
diff --git a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.spec.ts b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.spec.ts
index 1313c8424c7..2fe0be79102 100644
--- a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.spec.ts
@@ -7,6 +7,7 @@ import {
   PreferredStoreFacade,
 } from '@spartacus/pickup-in-store/root';
 import { IconTestingModule, OutletContextData } from '@spartacus/storefront';
+import { MockFeatureDirectivesModule } from 'projects/storefrontlib/shared/test/mock-feature-directives.module';
 import { of } from 'rxjs';
 import { MockPreferredStoreService } from '../../../core/services/preferred-store.service.spec';
 import { SetPreferredStoreComponent } from './set-preferred-store.component';
@@ -24,7 +25,12 @@ describe('SetPreferredStoreComponent without outlet.context$', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [SetPreferredStoreComponent],
-      imports: [I18nTestingModule, IconTestingModule, CommonModule],
+      imports: [
+        I18nTestingModule,
+        IconTestingModule,
+        CommonModule,
+        MockFeatureDirectivesModule,
+      ],
       providers: [
         { provide: PreferredStoreFacade, useClass: MockPreferredStoreService },
       ],
diff --git a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts
index 1f20d9be9c0..77a03fdf887 100644
--- a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts
+++ b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts
@@ -44,8 +44,15 @@ export class SetPreferredStoreComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     this.subscription.unsubscribe();
   }
+
   setAsPreferred(): boolean {
     this.preferredStoreFacade.setPreferredStore(this.pointOfServiceName);
     return false;
   }
+
+  getSetStoreButtonLabel(storeName: string): string {
+    return this.pointOfServiceName.name === storeName
+      ? 'setPreferredStore.myStore'
+      : 'setPreferredStore.makeThisMyStore';
+  }
 }
diff --git a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.module.ts b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.module.ts
index c82d29e635a..7b31699bc10 100644
--- a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.module.ts
+++ b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.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 { StoreFinderOutlets } from '@spartacus/storefinder/root';
 import {
   IconModule,
@@ -16,7 +16,7 @@ import {
 import { SetPreferredStoreComponent } from './set-preferred-store.component';
 
 @NgModule({
-  imports: [CommonModule, IconModule, I18nModule],
+  imports: [CommonModule, IconModule, I18nModule, FeaturesConfigModule],
   exports: [SetPreferredStoreComponent],
   declarations: [SetPreferredStoreComponent],
   providers: [
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts
index 4a9a126017c..9ca1ec5fb60 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts
@@ -18,6 +18,7 @@ import {
   ViewChild,
   TemplateRef,
   Optional,
+  ChangeDetectionStrategy,
 } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { FeatureConfigService, useFeatureStyles } from '@spartacus/core';
@@ -32,6 +33,7 @@ import { PickupOptionsTabs } from './pickup-options.model';
 @Component({
   selector: 'cx-pickup-options',
   templateUrl: './pickup-options.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PickupOptionsComponent
   implements OnChanges, AfterViewInit, OnDestroy
diff --git a/feature-libs/pickup-in-store/components/presentational/store/store.component.html b/feature-libs/pickup-in-store/components/presentational/store/store.component.html
index 83285034766..4090dc6d34a 100644
--- a/feature-libs/pickup-in-store/components/presentational/store/store.component.html
+++ b/feature-libs/pickup-in-store/components/presentational/store/store.component.html
@@ -8,6 +8,11 @@
           <button
             (click)="toggleOpenHours()"
             [attr.aria-expanded]="openHoursOpen"
+            [attr.aria-label]="
+              ('store.viewHours' | cxTranslate) +
+              ', ' +
+              storeDetails.displayName
+            "
             class="cx-store-opening-hours-toggle"
           >
             {{ 'store.viewHours' | cxTranslate }}
@@ -65,6 +70,9 @@
     class="btn btn-secondary btn-block"
     [disabled]="!isInStock"
     [attr.data-pickup-in-store-button]="storeDetails.name"
+    [attr.aria-label]="
+      ('store.pickupFromHere' | cxTranslate) + ', ' + storeDetails.displayName
+    "
   >
     {{ 'store.pickupFromHere' | cxTranslate }}
   </button>
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index dd74c094ed2..1add9dc8a9c 100644
--- a/feature-libs/pickup-in-store/package.json
+++ b/feature-libs/pickup-in-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pickup-in-store",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,14 +32,14 @@
     "@angular/router": "^18.2.9",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefinder": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefinder": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/pickup-in-store/styles/_pickup-options.scss b/feature-libs/pickup-in-store/styles/_pickup-options.scss
index 09e8298d47b..180229e8641 100644
--- a/feature-libs/pickup-in-store/styles/_pickup-options.scss
+++ b/feature-libs/pickup-in-store/styles/_pickup-options.scss
@@ -107,15 +107,6 @@
           color: var(--cx-color-text);
         }
       }
-
-      // native high contrast themes fix
-      @media (forced-colors: active) {
-        button.tab-btn.active {
-          &:after {
-            background-color: LinkText;
-          }
-        }
-      }
     }
   }
 }
diff --git a/feature-libs/pickup-in-store/styles/_set-preferred-store.scss b/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
index a016eccd775..94294d63e3b 100644
--- a/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
+++ b/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
@@ -16,6 +16,7 @@
       text-decoration: underline;
       border: none;
       background: none;
+      color: inherit;
 
       @include forFeature('a11yVisibleFocusOverflows') {
         padding-inline-start: 0;
diff --git a/feature-libs/product-configurator/common/assets/translations/en/configurator.json b/feature-libs/product-configurator/common/assets/translations/en/configurator.json
index 5cf31a3fe2f..94f3018f201 100644
--- a/feature-libs/product-configurator/common/assets/translations/en/configurator.json
+++ b/feature-libs/product-configurator/common/assets/translations/en/configurator.json
@@ -196,8 +196,8 @@
       "iconIncomplete": "Group has required attributes without selected values.",
       "iconComplete": "Group is complete.",
       "iconSubGroup": "Group has a sub-group.",
-      "next": "Navigate to next group.",
-      "previous": "Navigate to previous group.",
+      "next": "Navigate to next group: {{ group }}",
+      "previous": "Navigate to previous group: {{ group }}",
       "showMoreProductInfo": "Show more information for product {{ product }} or continue to configuration.",
       "showLessProductInfo": "Show less information for product {{ product }} or continue to configuration.",
       "productName": "Product Name",
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index 464a9f355e8..e22b08a04a6 100644
--- a/feature-libs/product-configurator/package.json
+++ b/feature-libs/product-configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product-configurator",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Product configurator feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts
index 8fe40f18375..ecac363e22c 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts
@@ -53,6 +53,7 @@ export class ConfiguratorAttributeMultiSelectionImageComponent
     );
 
     useFeatureStyles('productConfiguratorAttributeTypesV2');
+    useFeatureStyles('a11yDifferentiateFocusedAndSelected');
   }
 
   attributeCheckBoxForms = new Array<UntypedFormControl>();
diff --git a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html
index fc43361b3e8..6dd627c3884 100644
--- a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html
+++ b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html
@@ -4,7 +4,13 @@
       class="btn btn-block btn-secondary cx-previous"
       [disabled]="isFirstGroup(configuration.owner) | async"
       (click)="onPrevious(configuration)"
-      [attr.aria-label]="'configurator.a11y.previous' | cxTranslate"
+      [attr.aria-label]="
+        'configurator.a11y.previous'
+          | cxTranslate
+            : {
+                group: getPreviousGroupDescription(configuration) | async,
+              }
+      "
     >
       {{ 'configurator.button.previous' | cxTranslate }}
     </button>
@@ -12,7 +18,13 @@
       class="btn btn-block btn-secondary cx-next"
       [disabled]="isLastGroup(configuration.owner) | async"
       (click)="onNext(configuration)"
-      [attr.aria-label]="'configurator.a11y.next' | cxTranslate"
+      [attr.aria-label]="
+        'configurator.a11y.next'
+          | cxTranslate
+            : {
+                group: getNextGroupDescription(configuration) | async,
+              }
+      "
     >
       {{ 'configurator.button.next' | cxTranslate }}
     </button>
diff --git a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts
index 13e5028491a..1e1d95e56dc 100644
--- a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts
@@ -45,6 +45,14 @@ class MockConfiguratorGroupsService {
   }
 
   navigateToGroup() {}
+
+  getPreviousGroupDescription() {
+    return of('previousGroupDescription');
+  }
+
+  getNextGroupDescription() {
+    return of('nextGroupDescription');
+  }
 }
 
 const groups: Configurator.Group = {
@@ -336,7 +344,7 @@ describe('ConfigPreviousNextButtonsComponent', () => {
         'cx-previous',
         0,
         'aria-label',
-        'configurator.a11y.previous',
+        'configurator.a11y.previous group:previousGroupDescription',
         'configurator.button.previous'
       );
     });
@@ -349,7 +357,7 @@ describe('ConfigPreviousNextButtonsComponent', () => {
         'cx-next',
         0,
         'aria-label',
-        'configurator.a11y.next',
+        'configurator.a11y.next group:nextGroupDescription',
         'configurator.button.next'
       );
     });
diff --git a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.ts b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.ts
index 2d190fce600..bc22b0ef9de 100644
--- a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.ts
@@ -76,6 +76,22 @@ export class ConfiguratorPreviousNextButtonsComponent {
     );
   }
 
+  getPreviousGroupDescription(
+    configuration: Configurator.Configuration
+  ): Observable<string> {
+    return this.configuratorGroupsService.getPreviousGroupDescription(
+      configuration
+    );
+  }
+
+  getNextGroupDescription(
+    configuration: Configurator.Configuration
+  ): Observable<string> {
+    return this.configuratorGroupsService.getNextGroupDescription(
+      configuration
+    );
+  }
+
   isFirstGroup(owner: CommonConfigurator.Owner): Observable<boolean> {
     return this.configuratorGroupsService
       .getPreviousGroupId(owner)
diff --git a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html
index bff0a0866c9..893d7a3ec00 100644
--- a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html
+++ b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.html
@@ -46,7 +46,7 @@
         <div class="cx-detail-title">
           <span
             *ngIf="product.name"
-            [attr.aria-label]="'configurator.a11y.productName' | cxTranslate"
+            [attr.title]="'configurator.a11y.productName' | cxTranslate"
           >
             {{ product.name }}
           </span>
@@ -54,7 +54,7 @@
         <div class="cx-code">
           <span
             *ngIf="product.code"
-            [attr.aria-label]="'configurator.a11y.productCode' | cxTranslate"
+            [attr.title]="'configurator.a11y.productCode' | cxTranslate"
           >
             {{ product.code }}
           </span>
@@ -62,9 +62,7 @@
         <div class="cx-description">
           <span
             *ngIf="product.description"
-            [attr.aria-label]="
-              'configurator.a11y.productDescription' | cxTranslate
-            "
+            [attr.title]="'configurator.a11y.productDescription' | cxTranslate"
           >
             {{ product.description }}
           </span>
diff --git a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts
index b348034f632..a7fcd42d0fe 100644
--- a/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/product-title/configurator-product-title.component.spec.ts
@@ -704,40 +704,40 @@ describe('ConfigProductTitleComponent', () => {
       );
     });
 
-    it("should contain span element with 'aria-label' attribute  for product name that defines an accessible name to label the current element", () => {
+    it("should contain span element with 'title' attribute for product name that defines an accessible name to label the current element", () => {
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
         htmlElem,
         'span',
         undefined,
         2,
-        'aria-label',
+        'title',
         'configurator.a11y.productName',
         mockProduct.name
       );
     });
 
-    it("should contain span element with 'aria-label' attribute for product code that defines an accessible name to label the current element", () => {
+    it("should contain span element with 'title' attribute for product code that defines an accessible name to label the current element", () => {
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
         htmlElem,
         'span',
         undefined,
         3,
-        'aria-label',
+        'title',
         'configurator.a11y.productCode',
         mockProduct.code
       );
     });
 
-    it("should contain span element with 'aria-label' attribute for product description that defines an accessible name to label the current element", () => {
+    it("should contain span element with 'title' attribute for product description that defines an accessible name to label the current element", () => {
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
         htmlElem,
         'span',
         undefined,
         4,
-        'aria-label',
+        'title',
         'configurator.a11y.productDescription',
         mockProduct.description
       );
diff --git a/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.html b/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.html
index fa7f9bbd62d..633fe94eb67 100644
--- a/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.html
+++ b/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.html
@@ -1,16 +1,7 @@
 <ng-container
   *ngIf="text && config.features?.productConfiguratorAttributeTypesV2"
 >
-  <span
-    [attr.aria-label]="
-      'configurator.a11y.itemDescription'
-        | cxTranslate
-          : {
-              item: productName,
-            }
-    "
-    [innerHTML]="textToShow"
-  ></span>
+  <span [innerHTML]="textToShow"></span>
 
   <button (click)="toggleShowMore()" *ngIf="showMore" tabindex="{{ tabIndex }}">
     <ng-container *ngIf="showHiddenText; else less"
diff --git a/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.spec.ts b/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.spec.ts
index 78e1b11fca4..953d522dd18 100644
--- a/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/show-more/configurator-show-more.component.spec.ts
@@ -143,18 +143,6 @@ describe('ConfiguratorShowMoreComponent', () => {
       fixture.detectChanges();
     });
 
-    it("should contain span element with 'aria-label' attribute that defines an accessible name to label the current element", () => {
-      CommonConfiguratorTestUtilsService.expectElementContainsA11y(
-        expect,
-        htmlElem,
-        'span',
-        undefined,
-        0,
-        'aria-label',
-        'configurator.a11y.itemDescription item:Camera bundle'
-      );
-    });
-
     it("should contain button element with a content 'configurator.button.less'", () => {
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.spec.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.spec.ts
index 45e2cd9ee23..2f88c0f86da 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.spec.ts
@@ -10,7 +10,9 @@ import {
   GROUP_ID_2,
   GROUP_ID_3,
   GROUP_ID_4,
+  GROUP_ID_10,
   GROUP_ID_CONFLICT_3,
+  DESCRIPTION_FOR,
   productConfiguration,
   productConfigurationWithConflicts,
 } from '../../testing/configurator-test-data';
@@ -231,6 +233,58 @@ describe('ConfiguratorGroupsService', () => {
     });
   });
 
+  describe('getDescriptionForGroupId', () => {
+    it('should return description for group', () => {
+      expect(
+        classUnderTest['getDescriptionForGroupId'](
+          GROUP_ID_4,
+          productConfiguration
+        )
+      ).toBe(DESCRIPTION_FOR + GROUP_ID_4);
+    });
+
+    it('should return description of first gropu if group id cannot be found', () => {
+      expect(
+        classUnderTest['getDescriptionForGroupId'](
+          'unknownGroupId',
+          productConfiguration
+        )
+      ).toBe(DESCRIPTION_FOR + GROUP_ID_1);
+    });
+  });
+
+  describe('getNextGroupDescription', () => {
+    it('should return description of next group', (done) => {
+      spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
+        of(productConfiguration)
+      );
+      const nextGroupDescription =
+        classUnderTest.getNextGroupDescription(productConfiguration);
+
+      expect(nextGroupDescription).toBeDefined();
+      nextGroupDescription.subscribe((description) => {
+        expect(description).toBe(DESCRIPTION_FOR + GROUP_ID_4);
+        done();
+      });
+    });
+
+    it('should return empty string if no next group exists', (done) => {
+      spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
+        of(productConfiguration)
+      );
+      productConfiguration.interactionState.currentGroup = GROUP_ID_10;
+      const nextGroupDescription =
+        classUnderTest.getNextGroupDescription(productConfiguration);
+
+      expect(nextGroupDescription).toBeDefined();
+      nextGroupDescription.subscribe((description) => {
+        expect(description).toBe('');
+        done();
+      });
+      productConfiguration.interactionState.currentGroup = GROUP_ID_2;
+    });
+  });
+
   describe('getPreviousGroupId', () => {
     it('should return a previous group ID', (done) => {
       spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
@@ -290,6 +344,38 @@ describe('ConfiguratorGroupsService', () => {
     });
   });
 
+  describe('getPreviousGroupDescription', () => {
+    it('should return description of previous group', (done) => {
+      spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
+        of(productConfiguration)
+      );
+      const previousGroupDescription =
+        classUnderTest.getPreviousGroupDescription(productConfiguration);
+
+      expect(previousGroupDescription).toBeDefined();
+      previousGroupDescription.subscribe((description) => {
+        expect(description).toBe(DESCRIPTION_FOR + GROUP_ID_1);
+        done();
+      });
+    });
+
+    it('should return empty string if no previous group exists', (done) => {
+      spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
+        of(productConfiguration)
+      );
+      productConfiguration.interactionState.currentGroup = GROUP_ID_1;
+      const previousGroupDescription =
+        classUnderTest.getPreviousGroupDescription(productConfiguration);
+
+      expect(previousGroupDescription).toBeDefined();
+      previousGroupDescription.subscribe((description) => {
+        expect(description).toBe('');
+        done();
+      });
+      productConfiguration.interactionState.currentGroup = GROUP_ID_2;
+    });
+  });
+
   describe('setGroupStatusVisited', () => {
     it('should call setGroupStatusVisited of groupStatusService', () => {
       spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.ts
index ba3050dd57f..e331f9dd183 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-groups.service.ts
@@ -269,6 +269,36 @@ export class ConfiguratorGroupsService {
     return this.getNeighboringGroupId(owner, 1);
   }
 
+  /**
+   * Returns the description of the next group.
+   *
+   * @param {Configurator.Configuration} configuration - configuration
+   * @returns {Observable<string>}  The description of the next group
+   */
+  getNextGroupDescription(
+    configuration: Configurator.Configuration
+  ): Observable<string> {
+    return this.getNextGroupId(configuration.owner).pipe(
+      map((groupId) =>
+        groupId ? this.getDescriptionForGroupId(groupId, configuration) : ''
+      )
+    );
+  }
+
+  protected getDescriptionForGroupId(
+    groupId: string,
+    configuration: Configurator.Configuration
+  ): string {
+    if (groupId) {
+      const group = this.configuratorUtilsService.getGroupById(
+        configuration.groups,
+        groupId
+      );
+      return group.description || '';
+    }
+    return '';
+  }
+
   /**
    * Returns the group ID of the group that is preceding the current one in a sequential order.
    *
@@ -281,6 +311,22 @@ export class ConfiguratorGroupsService {
     return this.getNeighboringGroupId(owner, -1);
   }
 
+  /**
+   * Returns the description of the previous group.
+   *
+   * @param {Configurator.Configuration} configuration - configuration
+   * @returns {Observable<string>}  The description of the previous group
+   */
+  getPreviousGroupDescription(
+    configuration: Configurator.Configuration
+  ): Observable<string> {
+    return this.getPreviousGroupId(configuration.owner).pipe(
+      map((groupId) =>
+        groupId ? this.getDescriptionForGroupId(groupId, configuration) : ''
+      )
+    );
+  }
+
   /**
    * Verifies whether the group has been visited
    *
diff --git a/feature-libs/product-multi-dimensional/package.json b/feature-libs/product-multi-dimensional/package.json
index e3c3c071def..b83838664f0 100644
--- a/feature-libs/product-multi-dimensional/package.json
+++ b/feature-libs/product-multi-dimensional/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product-multi-dimensional",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Product Multi-Dimensional library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -31,10 +31,10 @@
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.ts b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.ts
index 3c920fb128c..3b43067bbc2 100644
--- a/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.ts
+++ b/feature-libs/product/image-zoom/components/product-image-zoom/product-image-zoom-view/product-image-zoom-view.component.ts
@@ -170,6 +170,7 @@ export class ProductImageZoomViewComponent implements OnInit, OnDestroy {
     protected breakpointService: BreakpointService
   ) {
     useFeatureStyles('a11yKeyboardAccessibleZoom');
+    useFeatureStyles('a11yCroppedFocusRing');
   }
 
   ngOnInit() {
diff --git a/feature-libs/product/image-zoom/styles/_product-image-zoom-view.scss b/feature-libs/product/image-zoom/styles/_product-image-zoom-view.scss
index d7de0ab75d4..6015adb4c45 100644
--- a/feature-libs/product/image-zoom/styles/_product-image-zoom-view.scss
+++ b/feature-libs/product/image-zoom/styles/_product-image-zoom-view.scss
@@ -30,6 +30,9 @@ cx-product-image-zoom-view {
       .btn:focus,
       .btn:active {
         box-shadow: none;
+        @include forFeature('a11yCroppedFocusRing') {
+          outline-offset: -2px;
+        }
       }
     }
     // TODO: (CXSPA-7492) - Remove feature flag next major release.
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index 4b8ad65eaab..fcb41ec1914 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Product library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,17 +22,17 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index f614f2cbf4b..876ef816e1b 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/qualtrics",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Qualtrics library for Spartacus",
   "keywords": [
     "spartacus",
@@ -24,15 +24,15 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/quote/package.json b/feature-libs/quote/package.json
index 3fa0131d14b..ebb32b74a74 100644
--- a/feature-libs/quote/package.json
+++ b/feature-libs/quote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/quote",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -24,7 +24,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,11 +32,11 @@
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index 86642b66f05..4dd3e21b20f 100644
--- a/feature-libs/requested-delivery-date/package.json
+++ b/feature-libs/requested-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/requested-delivery-date",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Requested Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,20 +22,20 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index f259b1dff6c..a911ee2e3d0 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/smartedit",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Smart Edit feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -17,14 +17,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index a2df9508d53..034b3475e7a 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefinder",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Store finder feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,10 +32,10 @@
     "@angular/router": "^18.2.9",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index d2cc412787a..61dc4892712 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/tracking",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Spartacus tracking and personalization library",
   "keywords": [
     "spartacus",
@@ -21,14 +21,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/account/components/login-form/login-form.component.html b/feature-libs/user/account/components/login-form/login-form.component.html
index 0a3c7f0efc5..92dec8de479 100644
--- a/feature-libs/user/account/components/login-form/login-form.component.html
+++ b/feature-libs/user/account/components/login-form/login-form.component.html
@@ -15,12 +15,15 @@
       type="email"
       class="form-control"
       formControlName="userId"
+      [attr.aria-describedby]="'userIdError'"
       placeholder="{{ 'loginForm.emailAddress.placeholder' | cxTranslate }}"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="userIdError"
+      aria-live="off"
       [translationParams]="{
         label: 'loginForm.emailAddress.label' | cxTranslate,
       }"
@@ -45,12 +48,15 @@
       placeholder="{{ 'loginForm.password.placeholder' | cxTranslate }}"
       formControlName="password"
       [attr.aria-label]="'loginForm.password.placeholder' | cxTranslate"
+      [attr.aria-describedby]="'passwordError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="passwordError"
+      aria-live="off"
       [translationParams]="{
         label: 'loginForm.password.label' | cxTranslate,
       }"
diff --git a/feature-libs/user/account/components/login-form/login-form.component.ts b/feature-libs/user/account/components/login-form/login-form.component.ts
index f8d787b2f51..b67adc197b0 100644
--- a/feature-libs/user/account/components/login-form/login-form.component.ts
+++ b/feature-libs/user/account/components/login-form/login-form.component.ts
@@ -17,7 +17,7 @@ import { LoginFormComponentService } from './login-form-component.service';
 })
 export class LoginFormComponent {
   constructor(protected service: LoginFormComponentService) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   form: UntypedFormGroup = this.service.form;
diff --git a/feature-libs/user/account/components/login/login.component.html b/feature-libs/user/account/components/login/login.component.html
index 4a56e93ac62..938d9dcb436 100644
--- a/feature-libs/user/account/components/login/login.component.html
+++ b/feature-libs/user/account/components/login/login.component.html
@@ -1,8 +1,15 @@
 <ng-container *ngIf="user$ | async as user; else login">
-  <div class="cx-login-greet" id="greeting">
-    {{ 'miniLogin.userGreeting' | cxTranslate: { name: user.name } }}
-  </div>
-  <cx-page-slot id="account-nav" position="HeaderLinks"></cx-page-slot>
+  <ng-container *ngIf="greeting$ | async as greeting">
+    <div class="cx-login-greet">
+      {{ greeting$ | async }}
+    </div>
+    <cx-page-slot
+      (cxDomChange)="onRootNavBtnAdded($event, greeting)"
+      cxDomChangeTargetSelector="nav ul li:first-child button"
+      id="account-nav"
+      position="HeaderLinks"
+    ></cx-page-slot>
+  </ng-container>
 </ng-container>
 
 <ng-template #login>
diff --git a/feature-libs/user/account/components/login/login.component.spec.ts b/feature-libs/user/account/components/login/login.component.spec.ts
index 676a1a3b58f..81aff86ace9 100644
--- a/feature-libs/user/account/components/login/login.component.spec.ts
+++ b/feature-libs/user/account/components/login/login.component.spec.ts
@@ -39,7 +39,17 @@ class MockUserAccountFacade {
 
 @Component({
   selector: 'cx-page-slot',
-  template: '',
+  template: `
+    <cx-navigation-ui>
+      <nav>
+        <ul>
+          <li>
+            <button>Navigation Trigger</button>
+          </li>
+        </ul>
+      </nav>
+    </cx-navigation-ui>
+  `,
 })
 class MockDynamicSlotComponent {
   @Input()
@@ -53,6 +63,8 @@ class MockUrlPipe implements PipeTransform {
   transform(): void {}
 }
 
+let expectedGreeting = `miniLogin.userGreeting name:${mockUserDetails.name}`;
+
 describe('LoginComponent', () => {
   let component: LoginComponent;
   let fixture: ComponentFixture<LoginComponent>;
@@ -102,6 +114,12 @@ describe('LoginComponent', () => {
     expect(user).toEqual(mockUserDetails);
   });
 
+  it('should have greeting details when token exists', () => {
+    let greeting;
+    component.greeting$.subscribe((result) => (greeting = result));
+    expect(greeting).toEqual(expectedGreeting);
+  });
+
   it('should not get user details when token is lacking', () => {
     spyOn(authService, 'isUserLoggedIn').and.returnValue(of(false));
 
@@ -125,7 +143,7 @@ describe('LoginComponent', () => {
 
     it('should display greeting message when the user is logged in', () => {
       expect(fixture.debugElement.nativeElement.innerText).toContain(
-        'miniLogin.userGreeting name:First Last'
+        expectedGreeting
       );
     });
 
@@ -138,5 +156,22 @@ describe('LoginComponent', () => {
         'miniLogin.signInRegister'
       );
     });
+
+    it('should contain the dynamic slot: HeaderLinks', () => {
+      spyOn(component, 'onRootNavBtnAdded').and.callThrough();
+      component.ngOnInit();
+      fixture.detectChanges();
+      expectedGreeting = 'Testing;';
+      const expectedRootNavBtn = fixture.debugElement.query(
+        By.css('cx-navigation-ui nav ul li:first-child button')
+      );
+      const mockedMutation = {
+        target: expectedRootNavBtn.nativeNode,
+      } as MutationRecord;
+      expect(expectedRootNavBtn.nativeElement.ariaLabel).toBe(null);
+      component.onRootNavBtnAdded(mockedMutation, expectedGreeting);
+      expect(expectedRootNavBtn).not.toBeNull();
+      expect(expectedRootNavBtn.nativeElement.ariaLabel).toBe(expectedGreeting);
+    });
   });
 });
diff --git a/feature-libs/user/account/components/login/login.component.ts b/feature-libs/user/account/components/login/login.component.ts
index f41b530eb97..441b1e93d91 100644
--- a/feature-libs/user/account/components/login/login.component.ts
+++ b/feature-libs/user/account/components/login/login.component.ts
@@ -5,7 +5,11 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { AuthService, useFeatureStyles } from '@spartacus/core';
+import {
+  AuthService,
+  TranslationService,
+  useFeatureStyles,
+} from '@spartacus/core';
 import { User, UserAccountFacade } from '@spartacus/user/account/root';
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
@@ -16,10 +20,12 @@ import { switchMap } from 'rxjs/operators';
 })
 export class LoginComponent implements OnInit {
   user$: Observable<User | undefined>;
+  greeting$: Observable<string | undefined>;
 
   constructor(
     private auth: AuthService,
-    private userAccount: UserAccountFacade
+    private userAccount: UserAccountFacade,
+    private translation: TranslationService
   ) {
     useFeatureStyles('a11yMyAccountLinkOutline');
   }
@@ -34,5 +40,16 @@ export class LoginComponent implements OnInit {
         }
       })
     );
+    this.greeting$ = this.user$.pipe(
+      switchMap((user) =>
+        this.translation.translate(`miniLogin.userGreeting`, {
+          name: user?.name,
+        })
+      )
+    );
+  }
+
+  onRootNavBtnAdded($event: MutationRecord, greeting: string) {
+    ($event.target as HTMLElement).setAttribute('aria-label', greeting);
   }
 }
diff --git a/feature-libs/user/account/components/login/login.module.ts b/feature-libs/user/account/components/login/login.module.ts
index 1627c52ec99..aa6549aeb85 100644
--- a/feature-libs/user/account/components/login/login.module.ts
+++ b/feature-libs/user/account/components/login/login.module.ts
@@ -13,11 +13,18 @@ import {
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
-import { PageSlotModule } from '@spartacus/storefront';
+import { DomChangeModule, PageSlotModule } from '@spartacus/storefront';
 import { LoginComponent } from './login.component';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, UrlModule, PageSlotModule, I18nModule],
+  imports: [
+    CommonModule,
+    RouterModule,
+    UrlModule,
+    PageSlotModule,
+    I18nModule,
+    DomChangeModule,
+  ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
diff --git a/feature-libs/user/account/components/otp-login-form/otp-login-form.component.html b/feature-libs/user/account/components/otp-login-form/otp-login-form.component.html
index 16f326deb86..f55f615ae07 100644
--- a/feature-libs/user/account/components/otp-login-form/otp-login-form.component.html
+++ b/feature-libs/user/account/components/otp-login-form/otp-login-form.component.html
@@ -16,8 +16,13 @@
       class="form-control"
       formControlName="userId"
       placeholder="{{ 'loginForm.emailAddress.placeholder' | cxTranslate }}"
+      [attr.aria-describedby]="'userIdError'"
     />
-    <cx-form-errors [control]="form.get('userId')"></cx-form-errors>
+    <cx-form-errors
+      id="userIdError"
+      aria-live="off"
+      [control]="form.get('userId')"
+    ></cx-form-errors>
   </label>
 
   <label>
@@ -32,9 +37,14 @@
       placeholder="{{ 'loginForm.password.placeholder' | cxTranslate }}"
       formControlName="password"
       [attr.aria-label]="'loginForm.password.placeholder' | cxTranslate"
+      [attr.aria-describedby]="'passwordError'"
       cxPasswordVisibilitySwitch
     />
-    <cx-form-errors [control]="form.get('password')"></cx-form-errors>
+    <cx-form-errors
+      id="passwordError"
+      aria-live="off"
+      [control]="form.get('password')"
+    ></cx-form-errors>
   </label>
 
   <a [routerLink]="{ cxRoute: 'forgotPassword' } | cxUrl" class="btn-link">
diff --git a/feature-libs/user/account/components/otp-login-form/otp-login-form.component.ts b/feature-libs/user/account/components/otp-login-form/otp-login-form.component.ts
index 88848cd59e2..4ac25fa05bf 100644
--- a/feature-libs/user/account/components/otp-login-form/otp-login-form.component.ts
+++ b/feature-libs/user/account/components/otp-login-form/otp-login-form.component.ts
@@ -59,7 +59,7 @@ export class OneTimePasswordLoginFormComponent {
   @HostBinding('class.user-form') style = true;
 
   constructor() {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   onSubmit(): void {
diff --git a/feature-libs/user/karma.conf.js b/feature-libs/user/karma.conf.js
index f5475ce7ced..8d375c20da3 100644
--- a/feature-libs/user/karma.conf.js
+++ b/feature-libs/user/karma.conf.js
@@ -32,8 +32,7 @@ module.exports = function (config) {
         global: {
           statements: 90,
           lines: 90,
-          //TODO CXSPA-8984 change branches to 75 after fix
-          branches: 70,
+          branches: 75,
           functions: 80,
         },
       },
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index 9fe2fcda3d8..9702f60812b 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/user",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "User feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,10 +32,10 @@
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/profile/components/address-book/address-form/address-form.component.html b/feature-libs/user/profile/components/address-book/address-form/address-form.component.html
index 39b63cc2f42..24a28a33e96 100644
--- a/feature-libs/user/profile/components/address-book/address-form/address-form.component.html
+++ b/feature-libs/user/profile/components/address-book/address-form/address-form.component.html
@@ -23,9 +23,7 @@
             bindValue="isocode"
             placeholder="{{ 'addressForm.selectOne' | cxTranslate }}"
             (change)="countrySelected($event)"
-            [cxNgSelectA11y]="{
-              ariaLabel: 'addressForm.country' | cxTranslate,
-            }"
+            [cxNgSelectA11y]="{}"
           >
           </ng-select>
           <cx-form-errors
@@ -80,9 +78,12 @@
         type="text"
         placeholder="{{ 'addressForm.firstName.placeholder' | cxTranslate }}"
         formControlName="firstName"
+        [attr.aria-describedby]="'firstNameError'"
       />
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="firstNameError"
+        aria-live="off"
         [translationParams]="{
           label: 'addressForm.firstName.label' | cxTranslate,
         }"
@@ -106,9 +107,12 @@
         class="form-control"
         placeholder="{{ 'addressForm.lastName.placeholder' | cxTranslate }}"
         formControlName="lastName"
+        [attr.aria-describedby]="'lastNameError'"
       />
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="lastNameError"
+        aria-live="off"
         [translationParams]="{
           label: 'addressForm.lastName.label' | cxTranslate,
         }"
@@ -132,9 +136,12 @@
         class="form-control"
         placeholder="{{ 'addressForm.streetAddress' | cxTranslate }}"
         formControlName="line1"
+        [attr.aria-describedby]="'line1Error'"
       />
       <cx-form-errors
         *cxFeature="'formErrorsDescriptiveMessages'"
+        id="line1Error"
+        aria-live="off"
         [translationParams]="{
           label: 'addressForm.address1' | cxTranslate,
         }"
@@ -172,9 +179,12 @@
           class="form-control"
           placeholder="{{ 'addressForm.city.placeholder' | cxTranslate }}"
           formControlName="town"
+          [attr.aria-describedby]="'townError'"
         />
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="townError"
+          aria-live="off"
           [translationParams]="{
             label: 'addressForm.city.label' | cxTranslate,
           }"
@@ -198,9 +208,12 @@
           class="form-control"
           placeholder="{{ 'addressForm.zipCode.placeholder' | cxTranslate }}"
           formControlName="postalCode"
+          [attr.aria-describedby]="'postalCodeError'"
         />
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="postalCodeError"
+          aria-live="off"
           [translationParams]="{
             label: 'addressForm.zipCode.label' | cxTranslate,
           }"
diff --git a/feature-libs/user/profile/components/forgot-password/forgot-password.component.html b/feature-libs/user/profile/components/forgot-password/forgot-password.component.html
index 397f5774949..7da903f168a 100644
--- a/feature-libs/user/profile/components/forgot-password/forgot-password.component.html
+++ b/feature-libs/user/profile/components/forgot-password/forgot-password.component.html
@@ -23,11 +23,14 @@
         'forgottenPassword.emailAddress.placeholder' | cxTranslate
       }}"
       formControlName="userEmail"
+      [attr.aria-describedby]="'userEmailError'"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="userEmailError"
+      aria-live="off"
       [translationParams]="{
         label: 'forgottenPassword.emailAddress.label' | cxTranslate,
       }"
diff --git a/feature-libs/user/profile/components/register/register.component.html b/feature-libs/user/profile/components/register/register.component.html
index e931a943f37..5a5fb60fa1b 100644
--- a/feature-libs/user/profile/components/register/register.component.html
+++ b/feature-libs/user/profile/components/register/register.component.html
@@ -50,11 +50,14 @@
                   'register.firstName.placeholder' | cxTranslate
                 }}"
                 formControlName="firstName"
+                [attr.aria-describedby]="'firstNameError'"
               />
 
               <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
               <cx-form-errors
                 *cxFeature="'formErrorsDescriptiveMessages'"
+                id="firstNameError"
+                aria-live="off"
                 [translationParams]="{
                   label: 'register.firstName.label' | cxTranslate,
                 }"
@@ -83,11 +86,14 @@
                   'register.lastName.placeholder' | cxTranslate
                 }}"
                 formControlName="lastName"
+                [attr.aria-describedby]="'lastNameError'"
               />
 
               <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
               <cx-form-errors
                 *cxFeature="'formErrorsDescriptiveMessages'"
+                id="lastNameError"
+                aria-live="off"
                 [translationParams]="{
                   label: 'register.lastName.label' | cxTranslate,
                 }"
@@ -116,11 +122,14 @@
                   'register.emailAddress.placeholder' | cxTranslate
                 }}"
                 formControlName="email"
+                [attr.aria-describedby]="'emailError'"
               />
 
               <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
               <cx-form-errors
                 *cxFeature="'formErrorsDescriptiveMessages'"
+                id="emailError"
+                aria-live="off"
                 [translationParams]="{
                   label: 'register.emailAddress.label' | cxTranslate,
                 }"
@@ -193,12 +202,15 @@
                 [attr.aria-label]="
                   'register.confirmPassword.placeholder' | cxTranslate
                 "
+                [attr.aria-describedby]="'passwordconfError'"
                 cxPasswordVisibilitySwitch
               />
 
               <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
               <cx-form-errors
                 *cxFeature="'formErrorsDescriptiveMessages'"
+                id="passwordconfError"
+                aria-live="off"
                 [translationParams]="{
                   label: 'register.confirmPassword.label' | cxTranslate,
                 }"
@@ -264,6 +276,7 @@
                   type="checkbox"
                   name="termsandconditions"
                   formControlName="termsandconditions"
+                  [attr.aria-describedby]="'termsandconditionsError'"
                 />
                 <span class="form-check-label">
                   {{ 'register.confirmThatRead' | cxTranslate }}
@@ -282,6 +295,8 @@
                 <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
                 <cx-form-errors
                   *cxFeature="'formErrorsDescriptiveMessages'"
+                  id="termsandconditionsError"
+                  aria-live="off"
                   [translationParams]="{
                     label: 'register.termsAndConditions' | cxTranslate,
                   }"
diff --git a/feature-libs/user/profile/components/register/register.component.ts b/feature-libs/user/profile/components/register/register.component.ts
index dcf000559c5..47af5f3ea34 100644
--- a/feature-libs/user/profile/components/register/register.component.ts
+++ b/feature-libs/user/profile/components/register/register.component.ts
@@ -124,7 +124,7 @@ export class RegisterComponent implements OnInit, OnDestroy {
     protected authConfigService: AuthConfigService,
     protected registerComponentService: RegisterComponentService
   ) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   ngOnInit() {
diff --git a/feature-libs/user/profile/components/reset-password/reset-password-component.service.spec.ts b/feature-libs/user/profile/components/reset-password/reset-password-component.service.spec.ts
index e6b4edac033..501354a2b96 100644
--- a/feature-libs/user/profile/components/reset-password/reset-password-component.service.spec.ts
+++ b/feature-libs/user/profile/components/reset-password/reset-password-component.service.spec.ts
@@ -14,6 +14,7 @@ import {
   RoutingService,
 } from '@spartacus/core';
 import {
+  CustomFormValidators,
   FormErrorsModule,
   PasswordVisibilityToggleModule,
 } from '@spartacus/storefront';
@@ -39,10 +40,12 @@ class MockUserPasswordFacade implements Partial<UserPasswordFacade> {
 
 class MockRoutingService {
   go = createSpy().and.stub();
+
   getRouterState() {
     return routerState$;
   }
 }
+
 class MockGlobalMessageService {
   add = createSpy().and.stub();
 }
@@ -82,166 +85,251 @@ describe('ResetPasswordComponentService', () => {
       ],
     }).compileComponents();
   });
+  describe(' - ', () => {
+    beforeEach(() => {
+      featureConfigService = TestBed.inject(FeatureConfigService);
+      spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
 
-  beforeEach(() => {
-    featureConfigService = TestBed.inject(FeatureConfigService);
-    spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
-
-    service = TestBed.inject(ResetPasswordComponentService);
-
-    userPasswordService = TestBed.inject(UserPasswordFacade);
-    routingService = TestBed.inject(RoutingService);
-    globalMessageService = TestBed.inject(GlobalMessageService);
+      service = TestBed.inject(ResetPasswordComponentService);
 
-    password = service.form.controls.password;
-    passwordConfirm = service.form.controls.passwordConfirm;
-  });
-
-  it('should create', () => {
-    expect(service).toBeTruthy();
-  });
+      userPasswordService = TestBed.inject(UserPasswordFacade);
+      routingService = TestBed.inject(RoutingService);
+      globalMessageService = TestBed.inject(GlobalMessageService);
 
-  describe('isUpdating$', () => {
-    it('should return true', () => {
-      service['busy$'].next(true);
-      let result;
-      service.isUpdating$.subscribe((value) => (result = value)).unsubscribe();
-      expect(result).toBeTruthy();
-      expect(service.form.disabled).toBeTruthy();
+      password = service.form.controls.password;
+      passwordConfirm = service.form.controls.passwordConfirm;
     });
 
-    it('should return false', () => {
-      service['busy$'].next(false);
-      let result;
-      service.isUpdating$.subscribe((value) => (result = value)).unsubscribe();
-      expect(result).toBeFalsy();
-      expect(service.form.disabled).toBeFalsy();
+    it('should create', () => {
+      expect(service).toBeTruthy();
     });
-  });
-
-  describe('resetToken$', () => {
-    it('should return token', () => {
-      let result;
-      service.resetToken$.subscribe((value) => (result = value)).unsubscribe();
-      expect(result).toEqual(resetToken);
-    });
-
-    it('should not return token', () => {
-      routerState$.next({
-        state: {
-          queryParams: {},
-        },
-      });
-      let result;
-      service.resetToken$.subscribe((value) => (result = value)).unsubscribe();
-      expect(result).toBeFalsy();
-    });
-  });
-
-  describe('reset', () => {
-    describe('success', () => {
-      beforeEach(() => {
-        password.setValue('QwePas123!');
-        passwordConfirm.setValue('QwePas123!');
-      });
 
-      it('should reset password', () => {
-        spyOn(userPasswordService, 'reset').and.callThrough();
-        service.resetPassword(resetToken);
-        expect(userPasswordService.reset).toHaveBeenCalledWith(
-          resetToken,
-          'QwePas123!'
-        );
+    describe('isUpdating$', () => {
+      it('should return true', () => {
+        service['busy$'].next(true);
+        let result;
+        service.isUpdating$
+          .subscribe((value) => (result = value))
+          .unsubscribe();
+        expect(result).toBeTruthy();
+        expect(service.form.disabled).toBeTruthy();
       });
 
-      it('should show message', () => {
-        service.resetPassword(resetToken);
-        expect(globalMessageService.add).toHaveBeenCalledWith(
-          { key: 'forgottenPassword.passwordResetSuccess' },
-          GlobalMessageType.MSG_TYPE_CONFIRMATION
-        );
+      it('should return false', () => {
+        service['busy$'].next(false);
+        let result;
+        service.isUpdating$
+          .subscribe((value) => (result = value))
+          .unsubscribe();
+        expect(result).toBeFalsy();
+        expect(service.form.disabled).toBeFalsy();
       });
+    });
 
-      it('should reroute to the login page', () => {
-        service.resetPassword(resetToken);
-        expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'login' });
+    describe('resetToken$', () => {
+      it('should return token', () => {
+        let result;
+        service.resetToken$
+          .subscribe((value) => (result = value))
+          .unsubscribe();
+        expect(result).toEqual(resetToken);
       });
 
-      it('should reset form', () => {
-        spyOn(service.form, 'reset').and.callThrough();
-        service.resetPassword(resetToken);
-        expect(service.form.reset).toHaveBeenCalled();
+      it('should not return token', () => {
+        routerState$.next({
+          state: {
+            queryParams: {},
+          },
+        });
+        let result;
+        service.resetToken$
+          .subscribe((value) => (result = value))
+          .unsubscribe();
+        expect(result).toBeFalsy();
       });
     });
 
-    describe('error', () => {
-      describe('valid form', () => {
+    describe('reset', () => {
+      describe('success', () => {
         beforeEach(() => {
           password.setValue('QwePas123!');
           passwordConfirm.setValue('QwePas123!');
         });
 
-        it('should show error message', () => {
-          const error = new HttpErrorModel();
-          error.details = [{ message: 'error message' }];
-          spyOn(userPasswordService, 'reset').and.returnValue(
-            throwError(() => error)
+        it('should reset password', () => {
+          spyOn(userPasswordService, 'reset').and.callThrough();
+          service.resetPassword(resetToken);
+          expect(userPasswordService.reset).toHaveBeenCalledWith(
+            resetToken,
+            'QwePas123!'
           );
+        });
+
+        it('should show message', () => {
           service.resetPassword(resetToken);
           expect(globalMessageService.add).toHaveBeenCalledWith(
-            { raw: 'error message' },
-            GlobalMessageType.MSG_TYPE_ERROR
+            { key: 'forgottenPassword.passwordResetSuccess' },
+            GlobalMessageType.MSG_TYPE_CONFIRMATION
           );
         });
 
-        it('should not show error message', () => {
-          spyOn(userPasswordService, 'reset').and.returnValue(
-            throwError(() => null)
-          );
+        it('should reroute to the login page', () => {
           service.resetPassword(resetToken);
-          expect(globalMessageService.add).not.toHaveBeenCalled();
+          expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'login' });
         });
 
-        it('should not show error message', () => {
-          spyOn(userPasswordService, 'reset').and.returnValue(
-            throwError(() => ({}))
-          );
+        it('should reset form', () => {
+          spyOn(service.form, 'reset').and.callThrough();
           service.resetPassword(resetToken);
-          expect(globalMessageService.add).not.toHaveBeenCalled();
+          expect(service.form.reset).toHaveBeenCalled();
         });
       });
-    });
 
-    it('should not reset invalid form', () => {
-      spyOn(userPasswordService, 'reset').and.returnValue(
-        throwError(() => ({}))
-      );
-      passwordConfirm.setValue('Diff123!');
-      service.resetPassword(resetToken);
-      expect(userPasswordService.reset).not.toHaveBeenCalled();
-      expect(globalMessageService.add).not.toHaveBeenCalled();
-      expect(routingService.go).not.toHaveBeenCalled();
+      describe('error', () => {
+        describe('valid form', () => {
+          beforeEach(() => {
+            password.setValue('QwePas123!');
+            passwordConfirm.setValue('QwePas123!');
+          });
+
+          it('should show error message', () => {
+            const error = new HttpErrorModel();
+            error.details = [{ message: 'error message' }];
+            spyOn(userPasswordService, 'reset').and.returnValue(
+              throwError(() => error)
+            );
+            service.resetPassword(resetToken);
+            expect(globalMessageService.add).toHaveBeenCalledWith(
+              { raw: 'error message' },
+              GlobalMessageType.MSG_TYPE_ERROR
+            );
+          });
+
+          it('should not show error message when error is null', () => {
+            spyOn(userPasswordService, 'reset').and.returnValue(
+              throwError(() => null)
+            );
+            service.resetPassword(resetToken);
+            expect(globalMessageService.add).not.toHaveBeenCalled();
+          });
+
+          it('should not display an error message when HttpErrorModel has no details', () => {
+            spyOn(userPasswordService, 'reset').and.returnValue(
+              throwError(() => new HttpErrorModel())
+            );
+            service.resetPassword(resetToken);
+            expect(globalMessageService.add).not.toHaveBeenCalled();
+          });
+        });
+      });
+
+      it('should not reset invalid form', () => {
+        spyOn(userPasswordService, 'reset').and.returnValue(
+          throwError(() => ({}))
+        );
+        passwordConfirm.setValue('Diff123!');
+        service.resetPassword(resetToken);
+        expect(userPasswordService.reset).not.toHaveBeenCalled();
+        expect(globalMessageService.add).not.toHaveBeenCalled();
+        expect(routingService.go).not.toHaveBeenCalled();
+      });
     });
   });
-
   describe('password validators', () => {
-    it('should have new validators when feature flag isEnabled', () => {
-      const passwordControl = service.form.get(
-        'password'
-      ) as UntypedFormControl;
-      const validators = passwordControl.validator
-        ? passwordControl.validator({} as any)
-        : [];
-
-      expect(passwordControl).toBeTruthy();
-      expect(validators).toEqual({
-        required: true,
-        cxMinOneDigit: true,
-        cxMinOneUpperCaseCharacter: true,
-        cxMinOneSpecialCharacter: true,
-        cxMinEightCharactersLength: true,
-        cxMaxCharactersLength: true,
+    let passwordControl: UntypedFormControl;
+
+    describe('when formErrorsDescriptiveMessages are enabled', () => {
+      beforePasswordValidatorCase([
+        'formErrorsDescriptiveMessages',
+        'enableSecurePasswordValidation',
+      ]);
+
+      it('should use securePasswordValidators', () => {
+        expect(passwordControl).toBeTruthy();
+        expect((service as any).passwordValidators).toEqual(
+          CustomFormValidators.securePasswordValidators
+        );
       });
     });
+
+    describe('when formErrorsDescriptiveMessages and enableConsecutiveCharactersPasswordRequirement are enabled', () => {
+      beforePasswordValidatorCase([
+        'formErrorsDescriptiveMessages',
+        'enableConsecutiveCharactersPasswordRequirement',
+      ]);
+
+      it('should use passwordValidators with noConsecutiveCharacters', () => {
+        expect((service as any).passwordValidators).toEqual([
+          ...CustomFormValidators.passwordValidators,
+          CustomFormValidators.noConsecutiveCharacters,
+        ]);
+      });
+    });
+
+    describe('when only formErrorsDescriptiveMessages is enabled', () => {
+      beforePasswordValidatorCase(['formErrorsDescriptiveMessages']);
+
+      it('should use passwordValidators', () => {
+        expect(passwordControl).toBeTruthy();
+        expect((service as any).passwordValidators).toEqual(
+          CustomFormValidators.passwordValidators
+        );
+      });
+    });
+
+    describe('when only enableSecurePasswordValidation is enabled', () => {
+      beforePasswordValidatorCase(['enableSecurePasswordValidation']);
+
+      it('should use securePasswordValidator', () => {
+        expect(passwordControl).toBeTruthy();
+
+        expect((service as any).passwordValidators).toEqual([
+          CustomFormValidators.securePasswordValidator,
+        ]);
+      });
+    });
+
+    describe('when only enableConsecutiveCharactersPasswordRequirement is enabled', () => {
+      beforePasswordValidatorCase([
+        'enableConsecutiveCharactersPasswordRequirement',
+      ]);
+
+      it('should use strongPasswordValidator', () => {
+        expect(passwordControl).toBeTruthy();
+
+        expect((service as any).passwordValidators).toEqual([
+          CustomFormValidators.strongPasswordValidator,
+        ]);
+      });
+    });
+
+    describe('when no feature flags are enabled', () => {
+      beforePasswordValidatorCase([]);
+
+      it('should use passwordValidator', () => {
+        expect(passwordControl).toBeTruthy();
+        expect((service as any).passwordValidators).toEqual([
+          CustomFormValidators.passwordValidator,
+        ]);
+      });
+    });
+
+    function beforePasswordValidatorCase(featuresEnabled: string[]) {
+      beforeEach(() => {
+        featureConfigService = TestBed.inject(FeatureConfigService);
+        spyOn(featureConfigService, 'isEnabled').and.callFake(
+          (flag: string) => {
+            return featuresEnabled.includes(flag);
+          }
+        );
+
+        service = TestBed.inject(ResetPasswordComponentService);
+        passwordControl = service.form.get('password') as UntypedFormControl;
+
+        userPasswordService = TestBed.inject(UserPasswordFacade);
+        routingService = TestBed.inject(RoutingService);
+        globalMessageService = TestBed.inject(GlobalMessageService);
+      });
+    }
   });
 });
diff --git a/feature-libs/user/profile/components/reset-password/reset-password.component.html b/feature-libs/user/profile/components/reset-password/reset-password.component.html
index cffd8d1ed7b..591951901cd 100644
--- a/feature-libs/user/profile/components/reset-password/reset-password.component.html
+++ b/feature-libs/user/profile/components/reset-password/reset-password.component.html
@@ -20,12 +20,15 @@
       placeholder="{{ 'register.password.placeholder' | cxTranslate }}"
       formControlName="password"
       [attr.aria-label]="'register.password.placeholder' | cxTranslate"
+      [attr.aria-describedby]="'passwordError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="passwordError"
+      aria-live="off"
       [translationParams]="{
         label: 'register.newPassword' | cxTranslate,
       }"
@@ -50,12 +53,15 @@
       placeholder="{{ 'register.confirmPassword.placeholder' | cxTranslate }}"
       formControlName="passwordConfirm"
       [attr.aria-label]="'register.confirmPassword.placeholder' | cxTranslate"
+      [attr.aria-describedby]="'passwordConfirmError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="passwordConfirmError"
+      aria-live="off"
       [translationParams]="{
         label: 'register.passwordMinRequirements' | cxTranslate,
       }"
diff --git a/feature-libs/user/profile/components/reset-password/reset-password.component.ts b/feature-libs/user/profile/components/reset-password/reset-password.component.ts
index 9da2a6548c6..98e6bd93b45 100644
--- a/feature-libs/user/profile/components/reset-password/reset-password.component.ts
+++ b/feature-libs/user/profile/components/reset-password/reset-password.component.ts
@@ -23,7 +23,7 @@ export class ResetPasswordComponent {
   token$: Observable<string> = this.service.resetToken$;
 
   constructor(protected service: ResetPasswordComponentService) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   onSubmit(token: string) {
diff --git a/feature-libs/user/profile/components/update-email/my-account-v2-email.component.html b/feature-libs/user/profile/components/update-email/my-account-v2-email.component.html
index 0a0c6f3ee3b..a90a9ca4f28 100644
--- a/feature-libs/user/profile/components/update-email/my-account-v2-email.component.html
+++ b/feature-libs/user/profile/components/update-email/my-account-v2-email.component.html
@@ -55,11 +55,14 @@
           formControlName="email"
           placeholder="{{ 'myAccountV2Email.emailPlaceHolder' | cxTranslate }}"
           class="form-control"
+          [attr.aria-describedby]="'emailError'"
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="emailError"
+          aria-live="off"
           [translationParams]="{
             label: 'updateEmailForm.newEmailAddress.label' | cxTranslate,
           }"
@@ -83,11 +86,14 @@
           formControlName="confirmEmail"
           placeholder="{{ 'myAccountV2Email.emailPlaceHolder' | cxTranslate }}"
           class="form-control"
+          [attr.aria-describedby]="'confirmEmailError'"
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="confirmEmailError"
+          aria-live="off"
           [translationParams]="{
             label: 'updateEmailForm.confirmNewEmailAddress.label' | cxTranslate,
           }"
@@ -117,12 +123,15 @@
           [attr.aria-label]="
             'myAccountV2Email.passwordPlaceHolder' | cxTranslate
           "
+          [attr.aria-describedby]="'passwordError'"
           cxPasswordVisibilitySwitch
         />
 
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="passwordError"
+          aria-live="off"
           [translationParams]="{
             label: 'updateEmailForm.password.label' | cxTranslate,
           }"
diff --git a/feature-libs/user/profile/components/update-email/update-email.component.html b/feature-libs/user/profile/components/update-email/update-email.component.html
index 8c4ce199424..c05b3e47b11 100644
--- a/feature-libs/user/profile/components/update-email/update-email.component.html
+++ b/feature-libs/user/profile/components/update-email/update-email.component.html
@@ -17,12 +17,15 @@
       placeholder="{{
         'updateEmailForm.newEmailAddress.placeholder' | cxTranslate
       }}"
+      [attr.aria-describedby]="'emailError'"
       class="form-control"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="emailError"
+      aria-live="off"
       [translationParams]="{
         label: 'updateEmailForm.newEmailAddress.label' | cxTranslate,
       }"
@@ -48,12 +51,15 @@
       placeholder="{{
         'updateEmailForm.confirmNewEmailAddress.placeholder' | cxTranslate
       }}"
+      [attr.aria-describedby]="'confirmEmailError'"
       class="form-control"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="confirmEmailError"
+      aria-live="off"
       [translationParams]="{
         label: 'updateEmailForm.confirmNewEmailAddress.label' | cxTranslate,
       }"
@@ -80,12 +86,15 @@
       class="form-control"
       autocomplete="new-password"
       [attr.aria-label]="'updateEmailForm.password.placeholder' | cxTranslate"
+      [attr.aria-describedby]="'passwordError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="passwordError"
+      aria-live="off"
       [translationParams]="{
         label: 'updateEmailForm.password.label' | cxTranslate,
       }"
diff --git a/feature-libs/user/profile/components/update-email/update-email.component.ts b/feature-libs/user/profile/components/update-email/update-email.component.ts
index 3c36f40256e..f31c40f7c66 100644
--- a/feature-libs/user/profile/components/update-email/update-email.component.ts
+++ b/feature-libs/user/profile/components/update-email/update-email.component.ts
@@ -18,7 +18,7 @@ import { UpdateEmailComponentService } from './update-email-component.service';
 })
 export class UpdateEmailComponent {
   constructor(protected service: UpdateEmailComponentService) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   form: UntypedFormGroup = this.service.form;
diff --git a/feature-libs/user/profile/components/update-password/my-account-v2-password.component.html b/feature-libs/user/profile/components/update-password/my-account-v2-password.component.html
index cb456940bb5..039fc6cfeda 100644
--- a/feature-libs/user/profile/components/update-password/my-account-v2-password.component.html
+++ b/feature-libs/user/profile/components/update-password/my-account-v2-password.component.html
@@ -30,11 +30,14 @@
       [attr.aria-label]="
         'myAccountV2PasswordForm.oldPassword.placeholder' | cxTranslate
       "
+      [attr.aria-describedby]="'oldPasswordError'"
       cxPasswordVisibilitySwitch
     />
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="oldPasswordError"
+      aria-live="off"
       [translationParams]="{
         label: 'updatePasswordForm.oldPassword.label' | cxTranslate,
       }"
@@ -64,12 +67,15 @@
       [attr.aria-label]="
         'myAccountV2PasswordForm.newPassword.placeholder' | cxTranslate
       "
+      [attr.aria-describedby]="'newPasswordError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="newPasswordError"
+      aria-live="off"
       [translationParams]="{
         label: 'updatePasswordForm.newPassword.label' | cxTranslate,
       }"
diff --git a/feature-libs/user/profile/components/update-password/my-account-v2-password.component.ts b/feature-libs/user/profile/components/update-password/my-account-v2-password.component.ts
index dab93b19991..34abb9d512d 100644
--- a/feature-libs/user/profile/components/update-password/my-account-v2-password.component.ts
+++ b/feature-libs/user/profile/components/update-password/my-account-v2-password.component.ts
@@ -27,7 +27,7 @@ export class MyAccountV2PasswordComponent {
   isUpdating$: Observable<boolean> = this.service.isUpdating$;
 
   constructor() {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   onSubmit(): void {
diff --git a/feature-libs/user/profile/components/update-password/update-password.component.html b/feature-libs/user/profile/components/update-password/update-password.component.html
index 6feebaea536..66d57b80510 100644
--- a/feature-libs/user/profile/components/update-password/update-password.component.html
+++ b/feature-libs/user/profile/components/update-password/update-password.component.html
@@ -21,12 +21,15 @@
       [attr.aria-label]="
         'updatePasswordForm.oldPassword.placeholder' | cxTranslate
       "
+      [attr.aria-describedby]="'oldPasswordError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="oldPasswordError"
+      aria-live="off"
       [translationParams]="{
         label: 'updatePasswordForm.oldPassword.label' | cxTranslate,
       }"
@@ -56,6 +59,7 @@
       [attr.aria-label]="
         'updatePasswordForm.newPassword.placeholder' | cxTranslate
       "
+      [attr.aria-describedby]="'newPasswordError'"
       aria-describedby="password-input-hint"
       cxPasswordVisibilitySwitch
     />
@@ -63,6 +67,8 @@
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="newPasswordError"
+      aria-live="off"
       [translationParams]="{
         label: 'updatePasswordForm.newPassword.label' | cxTranslate,
       }"
@@ -92,12 +98,15 @@
       [attr.aria-label]="
         'updatePasswordForm.confirmPassword.placeholder' | cxTranslate
       "
+      [attr.aria-describedby]="'newPasswordConfirmError'"
       cxPasswordVisibilitySwitch
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="newPasswordConfirmError"
+      aria-live="off"
       [translationParams]="{
         label: 'updatePasswordForm.confirmPassword.label' | cxTranslate,
       }"
diff --git a/feature-libs/user/profile/components/update-password/update-password.component.ts b/feature-libs/user/profile/components/update-password/update-password.component.ts
index b5a636bcd5e..f40f4668cab 100644
--- a/feature-libs/user/profile/components/update-password/update-password.component.ts
+++ b/feature-libs/user/profile/components/update-password/update-password.component.ts
@@ -27,7 +27,7 @@ export class UpdatePasswordComponent {
   });
 
   constructor(protected service: UpdatePasswordComponentService) {
-    useFeatureStyles('a11yPasswordVisibilityBtnValueOverflow');
+    useFeatureStyles('a11yPasswordVisibliltyBtnValueOverflow');
   }
 
   form: UntypedFormGroup = this.service.form;
diff --git a/feature-libs/user/profile/components/update-profile/my-account-v2-profile.component.html b/feature-libs/user/profile/components/update-profile/my-account-v2-profile.component.html
index 3a4adc5eb58..35c6183ba55 100644
--- a/feature-libs/user/profile/components/update-profile/my-account-v2-profile.component.html
+++ b/feature-libs/user/profile/components/update-profile/my-account-v2-profile.component.html
@@ -69,10 +69,13 @@
           class="form-control"
           name="firstName"
           formControlName="firstName"
+          [attr.aria-describedby]="'firstNameError'"
         />
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="firstNameError"
+          aria-live="off"
           [translationParams]="{
             label: 'updateProfileForm.firstName.label' | cxTranslate,
           }"
@@ -95,10 +98,13 @@
           class="form-control"
           name="lastName"
           formControlName="lastName"
+          [attr.aria-describedby]="'lastNameError'"
         />
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="lastNameError"
+          aria-live="off"
           [translationParams]="{
             label: 'updateProfileForm.lastName.label' | cxTranslate,
           }"
@@ -121,11 +127,14 @@
           class="form-control"
           name="customerId"
           formControlName="customerId"
+          [attr.aria-describedby]="'customerIdError'"
           readonly
         />
         <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
         <cx-form-errors
           *cxFeature="'formErrorsDescriptiveMessages'"
+          id="customerIdError"
+          aria-live="off"
           [translationParams]="{
             label: 'updateProfileForm.customerId' | cxTranslate,
           }"
diff --git a/feature-libs/user/profile/components/update-profile/update-profile.component.html b/feature-libs/user/profile/components/update-profile/update-profile.component.html
index 0e10f5b9b87..e5a2fc3a20f 100644
--- a/feature-libs/user/profile/components/update-profile/update-profile.component.html
+++ b/feature-libs/user/profile/components/update-profile/update-profile.component.html
@@ -36,11 +36,14 @@
         'updateProfileForm.firstName.placeholder' | cxTranslate
       }}"
       formControlName="firstName"
+      [attr.aria-describedby]="'firstNameError'"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="firstNameError"
+      aria-live="off"
       [translationParams]="{
         label: 'updateProfileForm.firstName.label' | cxTranslate,
       }"
@@ -65,11 +68,14 @@
       name="lastName"
       placeholder="{{ 'updateProfileForm.lastName.placeholder' | cxTranslate }}"
       formControlName="lastName"
+      [attr.aria-describedby]="'lastNameError'"
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="lastNameError"
+      aria-live="off"
       [translationParams]="{
         label: 'updateProfileForm.lastName.label' | cxTranslate,
       }"
@@ -92,12 +98,15 @@
       class="form-control"
       name="customerId"
       formControlName="customerId"
+      [attr.aria-describedby]="'customerIdError'"
       readonly
     />
 
     <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
     <cx-form-errors
       *cxFeature="'formErrorsDescriptiveMessages'"
+      id="customerIdError"
+      aria-live="off"
       [translationParams]="{
         label: 'updateProfileForm.customerId' | cxTranslate,
       }"
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index 03224d0b185..0d25c6ab095 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdc",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Customer Data Cloud Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -19,7 +19,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -30,12 +30,12 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/asm": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/organization": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/asm": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/organization": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdp/package.json b/integration-libs/cdp/package.json
index 47eb8a92461..d8adb961846 100644
--- a/integration-libs/cdp/package.json
+++ b/integration-libs/cdp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdp",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Customer Data Platform Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -19,13 +19,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/customer-ticketing": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/customer-ticketing": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index b447e122c82..512de8bf555 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cds",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Context Driven Service library for Spartacus",
   "keywords": [
     "spartacus",
@@ -20,7 +20,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -28,12 +28,12 @@
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/tracking": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/tracking": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cpq-quote/package.json b/integration-libs/cpq-quote/package.json
index 35e7d216887..45821b57fec 100644
--- a/integration-libs/cpq-quote/package.json
+++ b/integration-libs/cpq-quote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cpq-quote",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "cpq-quote library for Spartacus",
   "keywords": [
     "spartacus",
@@ -17,16 +17,16 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index 6405aa24b1d..efce39f7154 100644
--- a/integration-libs/digital-payments/package.json
+++ b/integration-libs/digital-payments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/digital-payments",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Digital Payments Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -18,7 +18,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -27,11 +27,11 @@
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 99eff0f7aea..24aeea6c17e 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/epd-visualization",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "SAP Enterprise Product Development Visualization integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,7 +29,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -38,11 +38,11 @@
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@sapui5/ts-types-esm": "1.120.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/integration-libs/omf/package.json b/integration-libs/omf/package.json
index f13e4909acd..8c0cc450490 100644
--- a/integration-libs/omf/package.json
+++ b/integration-libs/omf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/omf",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "SAP Order Management Foundation Integration",
   "keywords": [
     "spartacus",
@@ -17,7 +17,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -25,9 +25,9 @@
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/opf/base/root/services/opf-resource-loader.service.spec.ts b/integration-libs/opf/base/root/services/opf-resource-loader.service.spec.ts
index 76b77c4b9d4..b4d0c8bcda0 100644
--- a/integration-libs/opf/base/root/services/opf-resource-loader.service.spec.ts
+++ b/integration-libs/opf/base/root/services/opf-resource-loader.service.spec.ts
@@ -50,11 +50,13 @@ describe('OpfResourceLoaderService', () => {
       const mockScriptResource = {
         url: 'script-url',
         type: OpfDynamicScriptResourceType.SCRIPT,
+        attributes: [{ key: 'opf-load-once', value: 'true' }],
       };
 
       const mockStyleResource = {
         url: 'style-url',
         type: OpfDynamicScriptResourceType.STYLES,
+        attributes: [{ key: 'opf-load-once', value: 'true' }],
       };
 
       spyOn<any>(opfResourceLoaderService, 'loadScript').and.callThrough();
diff --git a/integration-libs/opf/base/root/services/opf-resource-loader.service.ts b/integration-libs/opf/base/root/services/opf-resource-loader.service.ts
index c9020a9d3e3..ca2d35f8f4d 100644
--- a/integration-libs/opf/base/root/services/opf-resource-loader.service.ts
+++ b/integration-libs/opf/base/root/services/opf-resource-loader.service.ts
@@ -22,11 +22,12 @@ export class OpfResourceLoaderService {
   protected document = inject(DOCUMENT);
   protected platformId = inject(PLATFORM_ID);
 
-  protected readonly OPF_RESOURCE_ATTRIBUTE_KEY = 'data-opf-resource';
   protected readonly CORS_DEFAULT_VALUE = 'anonymous';
+  protected readonly OPF_RESOURCE_LOAD_ONCE_ATTRIBUTE_KEY = 'opf-load-once';
+  protected readonly OPF_RESOURCE_ATTRIBUTE_KEY = 'data-opf-resource';
 
   protected embedStyles(embedOptions: {
-    attributes?: OpfKeyValueMap[];
+    attributes?: { [key: string]: string };
     src: string;
     sri?: string;
     callback?: EventListener;
@@ -38,22 +39,18 @@ export class OpfResourceLoaderService {
     link.href = src;
     link.rel = 'stylesheet';
     link.type = 'text/css';
-    link.setAttribute(this.OPF_RESOURCE_ATTRIBUTE_KEY, 'true');
     if (sri) {
       link.integrity = sri;
-      const corsKeyvalue = attributes?.find(
-        (attr) => attr.key === 'crossorigin' && !!attr.value?.length
-      );
-      link.crossOrigin = corsKeyvalue?.value ?? this.CORS_DEFAULT_VALUE;
+      link.crossOrigin = attributes?.['crossorigin'] ?? this.CORS_DEFAULT_VALUE;
+      delete attributes?.['crossorigin'];
     }
-    if (attributes?.length) {
-      attributes.forEach((attribute) => {
-        const { key, value } = attribute;
+
+    attributes &&
+      Object.keys(attributes)?.forEach((key) => {
         if (!(key in link)) {
-          link.setAttribute(key, value);
+          link.setAttribute(key, attributes[key as keyof object]);
         }
       });
-    }
 
     if (callback) {
       link.addEventListener('load', callback);
@@ -74,39 +71,56 @@ export class OpfResourceLoaderService {
     return this.scriptLoader.hasScript(src);
   }
 
+  /**
+   * Create attributes intended to script and link elements.
+   *
+   * Return attributes list including keyValueList and OPF specific attribute with below logic:
+   *
+   * 1. Resource loads only once: 'opf-load-once' key detected, no additional attribute added.
+   * 2. Resource deleted at page/payment change: 'data-opf-resource' attribute is added.
+   */
+
+  protected createAttributesList(keyValueList?: OpfKeyValueMap[] | undefined): {
+    [key: string]: string;
+  } {
+    const attributes: { [key: string]: string } = {};
+    keyValueList?.forEach((keyValue: OpfKeyValueMap) => {
+      attributes[keyValue.key] = keyValue.value;
+    });
+    if (
+      !attributes?.[this.OPF_RESOURCE_LOAD_ONCE_ATTRIBUTE_KEY] ||
+      attributes[this.OPF_RESOURCE_LOAD_ONCE_ATTRIBUTE_KEY] !== 'true'
+    ) {
+      attributes[this.OPF_RESOURCE_ATTRIBUTE_KEY] = 'true';
+    }
+    delete attributes?.[this.OPF_RESOURCE_LOAD_ONCE_ATTRIBUTE_KEY];
+    return attributes;
+  }
+
   /**
    * Loads a script specified in the resource object.
    *
    * The returned Promise is resolved when the script is loaded or already present.
    * The returned Promise is rejected when a loading error occurs.
    */
+
   protected loadScript(resource: OpfDynamicScriptResource): Promise<void> {
     return new Promise((resolve, reject) => {
-      const attributes: any = {
+      const attributes: { [key: string]: string } = {
         type: 'text/javascript',
-        [this.OPF_RESOURCE_ATTRIBUTE_KEY]: true,
+        ...this.createAttributesList(resource.attributes),
       };
 
       if (resource?.sri) {
         attributes['integrity'] = resource.sri;
-        const corsKeyvalue: OpfKeyValueMap | undefined =
-          resource?.attributes?.find(
-            (attr) => attr.key === 'crossorigin' && !!attr.value?.length
-          );
         attributes['crossOrigin'] =
-          corsKeyvalue?.value ?? this.CORS_DEFAULT_VALUE;
-      }
-
-      if (resource.attributes) {
-        resource.attributes.forEach((attribute) => {
-          attributes[attribute.key] = attribute.value;
-        });
+          attributes?.['crossorigin'] ?? this.CORS_DEFAULT_VALUE;
+        delete attributes?.['crossorigin'];
       }
-
-      if (resource.url && !this.hasScript(resource.url)) {
+      if (resource?.url && !this.hasScript(resource.url)) {
         this.scriptLoader.embedScript({
+          attributes,
           src: resource.url,
-          attributes: attributes,
           callback: () => resolve(),
           errorCallback: () => reject(),
           disableKeyRestriction: true,
@@ -123,11 +137,12 @@ export class OpfResourceLoaderService {
    * The returned Promise is resolved when the stylesheet is loaded or already present.
    * The returned Promise is rejected when a loading error occurs.
    */
+
   protected loadStyles(resource: OpfDynamicScriptResource): Promise<void> {
     return new Promise((resolve, reject) => {
       if (resource.url && !this.hasStyles(resource.url)) {
         this.embedStyles({
-          attributes: resource?.attributes,
+          attributes: this.createAttributesList(resource?.attributes),
           src: resource.url,
           sri: resource?.sri,
           callback: () => resolve(),
@@ -167,6 +182,7 @@ export class OpfResourceLoaderService {
    * The returned Promise is resolved when all resources are loaded.
    * The returned Promise is also resolved (not rejected!) immediately when any loading error occurs.
    */
+
   loadResources(
     scripts: OpfDynamicScriptResource[] = [],
     styles: OpfDynamicScriptResource[] = []
diff --git a/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.spec.ts b/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.spec.ts
index 53fb1195bd6..398bc988714 100644
--- a/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.spec.ts
+++ b/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.spec.ts
@@ -8,21 +8,22 @@ import {
   RouterState,
   RoutingService,
   UserIdService,
+  WindowRef,
 } from '@spartacus/core';
 import {
   OpfDynamicScriptResourceType,
   OpfMetadataStoreService,
   OpfResourceLoaderService,
 } from '@spartacus/opf/base/root';
-import { OrderFacade } from '@spartacus/order/root';
-import { of, throwError } from 'rxjs';
-
 import { OPF_PAYMENT_AND_REVIEW_SEMANTIC_ROUTE } from '@spartacus/opf/checkout/root';
+import { getBrowserInfo } from '@spartacus/opf/payment/core';
 import {
   OpfPaymentFacade,
   OpfPaymentRenderPattern,
   OpfPaymentSessionData,
 } from '@spartacus/opf/payment/root';
+import { OrderFacade } from '@spartacus/order/root';
+import { of, throwError } from 'rxjs';
 import { OpfCheckoutPaymentWrapperService } from './opf-checkout-payment-wrapper.service';
 
 const mockUrl = 'https://sap.com';
@@ -38,6 +39,7 @@ describe('OpfCheckoutPaymentWrapperService', () => {
   let globalMessageServiceMock: jasmine.SpyObj<GlobalMessageService>;
   let orderFacadeMock: jasmine.SpyObj<OrderFacade>;
   let opfMetadataStoreServiceMock: jasmine.SpyObj<OpfMetadataStoreService>;
+  let windowRefMock: jasmine.SpyObj<WindowRef>;
 
   beforeEach(() => {
     opfPaymentFacadeMock = jasmine.createSpyObj('OpfPaymentFacade', [
@@ -69,6 +71,7 @@ describe('OpfCheckoutPaymentWrapperService', () => {
       'OpfMetadataStoreService',
       ['updateOpfMetadata']
     );
+    windowRefMock = jasmine.createSpyObj('WindowRef', ['nativeWindow']);
 
     routingServiceMock.getRouterState.and.returnValue(
       of({
@@ -96,6 +99,10 @@ describe('OpfCheckoutPaymentWrapperService', () => {
           provide: OpfMetadataStoreService,
           useValue: opfMetadataStoreServiceMock,
         },
+        {
+          provide: WindowRef,
+          useValue: windowRefMock,
+        },
       ],
     });
 
@@ -163,6 +170,7 @@ describe('OpfCheckoutPaymentWrapperService', () => {
           cartId: mockCartId,
           resultURL: mockUrl,
           cancelURL: mockUrl,
+          browserInfo: getBrowserInfo(windowRefMock.nativeWindow),
         },
       });
 
@@ -422,7 +430,8 @@ describe('OpfCheckoutPaymentWrapperService', () => {
     const config = service['getPaymentInitiationConfig'](
       mockActiveCartId,
       mockOtpKey,
-      mockPaymentOptionId
+      mockPaymentOptionId,
+      getBrowserInfo(windowRefMock.nativeWindow)
     );
 
     expect(config).toEqual({
@@ -432,6 +441,7 @@ describe('OpfCheckoutPaymentWrapperService', () => {
         cartId: mockActiveCartId,
         resultURL: mockUrl,
         cancelURL: mockUrl,
+        browserInfo: getBrowserInfo(windowRefMock.nativeWindow),
       },
     });
   });
diff --git a/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.ts b/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.ts
index 5526f1890df..ae0523bb780 100644
--- a/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.ts
+++ b/integration-libs/opf/checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.ts
@@ -17,6 +17,7 @@ import {
   HttpResponseStatus,
   RoutingService,
   UserIdService,
+  WindowRef,
   backOff,
   isAuthorizationError,
 } from '@spartacus/core';
@@ -26,7 +27,9 @@ import {
   OpfResourceLoaderService,
 } from '@spartacus/opf/base/root';
 import { OPF_PAYMENT_AND_REVIEW_SEMANTIC_ROUTE } from '@spartacus/opf/checkout/root';
+import { getBrowserInfo } from '@spartacus/opf/payment/core';
 import {
+  OpfPaymentBrowserInfo,
   OpfPaymentFacade,
   OpfPaymentRenderMethodEvent,
   OpfPaymentRenderPattern,
@@ -53,6 +56,7 @@ export class OpfCheckoutPaymentWrapperService {
   protected orderFacade = inject(OrderFacade);
   protected opfMetadataStoreService = inject(OpfMetadataStoreService);
   protected cartAccessCodeFacade = inject(CartAccessCodeFacade);
+  protected winRef = inject(WindowRef);
 
   protected lastPaymentOptionId?: number;
 
@@ -110,7 +114,12 @@ export class OpfCheckoutPaymentWrapperService {
         this.cartAccessCodeFacade.getCartAccessCode(userId, cartId).pipe(
           filter((response) => Boolean(response?.accessCode)),
           map(({ accessCode: otpKey }) =>
-            this.getPaymentInitiationConfig(cartId, otpKey, paymentOptionId)
+            this.getPaymentInitiationConfig(
+              cartId,
+              otpKey,
+              paymentOptionId,
+              getBrowserInfo(this.winRef?.nativeWindow)
+            )
           )
         )
       ),
@@ -263,12 +272,14 @@ export class OpfCheckoutPaymentWrapperService {
   protected getPaymentInitiationConfig(
     cartId: string,
     otpKey: string,
-    paymentOptionId: number
+    paymentOptionId: number,
+    browserInfo?: OpfPaymentBrowserInfo
   ) {
     return {
       otpKey,
       config: {
         cartId,
+        browserInfo,
         configurationId: String(paymentOptionId),
         resultURL: this.routingService.getFullUrl({
           cxRoute: 'paymentVerificationResult',
diff --git a/integration-libs/opf/checkout/components/opf-checkout-payments/opf-checkout-payments.component.spec.ts b/integration-libs/opf/checkout/components/opf-checkout-payments/opf-checkout-payments.component.spec.ts
index 5c8babc04d8..15de2cd192f 100644
--- a/integration-libs/opf/checkout/components/opf-checkout-payments/opf-checkout-payments.component.spec.ts
+++ b/integration-libs/opf/checkout/components/opf-checkout-payments/opf-checkout-payments.component.spec.ts
@@ -38,6 +38,12 @@ class MockPaginationComponent {
   @Output() viewPageEvent = new EventEmitter<string>();
 }
 
+@Component({
+  template: '',
+  selector: 'cx-opf-checkout-payment-wrapper',
+})
+class MockOpfCheckoutPaymentWrapperComponent {}
+
 const mockActiveConfigurations: OpfActiveConfiguration[] = [
   {
     id: 1,
@@ -109,7 +115,11 @@ describe('OpfCheckoutPaymentsComponent', () => {
     );
     await TestBed.configureTestingModule({
       imports: [I18nTestingModule, OpfCheckoutTermsAndConditionsAlertModule],
-      declarations: [OpfCheckoutPaymentsComponent, MockPaginationComponent],
+      declarations: [
+        OpfCheckoutPaymentsComponent,
+        MockOpfCheckoutPaymentWrapperComponent,
+        MockPaginationComponent,
+      ],
       providers: [
         {
           provide: OpfBaseFacade,
diff --git a/integration-libs/opf/package.json b/integration-libs/opf/package.json
index 35c1db3f334..d854c0250bf 100644
--- a/integration-libs/opf/package.json
+++ b/integration-libs/opf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/opf",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "SAP Open Payment Framework integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -32,14 +32,14 @@
     "@angular/platform-browser": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.spec.ts b/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.spec.ts
index 9323a4e4211..1c567313dfe 100644
--- a/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.spec.ts
+++ b/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.spec.ts
@@ -78,6 +78,7 @@ describe('OpfGooglePayService', () => {
         'getTransactionDeliveryInfo',
         'getTransactionLocationContext',
         'getMerchantName',
+        'updateCartGuestUserEmail',
       ]
     );
     mockPaymentFacade = jasmine.createSpyObj('OpfPaymentFacade', [
@@ -630,6 +631,7 @@ describe('OpfGooglePayService', () => {
 
     describe('onPaymentAuthorized', () => {
       it('should handle payment authorization', (done) => {
+        const mockEmail = 'test@mail.com';
         const callbacks = service['handlePaymentCallbacks']();
         const mockToken = 'mockToken';
         const paymentDataResponse = {
@@ -638,6 +640,7 @@ describe('OpfGooglePayService', () => {
               token: mockToken,
             },
           },
+          email: mockEmail,
         } as google.payments.api.PaymentData;
 
         mockPaymentFacade.submitPayment.and.returnValue(of(true));
@@ -647,6 +650,9 @@ describe('OpfGooglePayService', () => {
         mockQuickBuyTransactionService.setDeliveryAddress.and.returnValue(
           of('addressId')
         );
+        mockQuickBuyTransactionService.updateCartGuestUserEmail.and.returnValue(
+          of(true)
+        );
 
         if (callbacks.onPaymentAuthorized) {
           (
@@ -657,6 +663,10 @@ describe('OpfGooglePayService', () => {
 
             expect(result).toBeDefined();
             expect(mockPaymentFacade.submitPayment).toHaveBeenCalled();
+            expect(
+              mockQuickBuyTransactionService.updateCartGuestUserEmail
+            ).toHaveBeenCalledWith(mockEmail);
+
             expect(Object.values(submitPaymentArgs.callbacks).length).toBe(3);
             Object.values(submitPaymentArgs.callbacks).forEach((callback) => {
               expect(typeof callback).toBe('function');
diff --git a/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.ts b/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.ts
index a0cc7a69a70..ac2c206aed2 100644
--- a/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.ts
+++ b/integration-libs/opf/quick-buy/components/opf-quick-buy-buttons/google-pay/google-pay.service.ts
@@ -74,6 +74,7 @@ export class OpfGooglePayService {
       shippingAddressParameters: {
         phoneNumberRequired: false,
       },
+      emailRequired: true,
     };
 
   protected readonly defaultGooglePayCardParameters: any = {
@@ -378,6 +379,13 @@ export class OpfGooglePayService {
                 paymentDataResponse.paymentMethodData.info?.billingAddress
               )
             ),
+            switchMap(() => {
+              return paymentDataResponse?.email
+                ? this.opfQuickBuyTransactionService.updateCartGuestUserEmail(
+                    paymentDataResponse.email
+                  )
+                : of(true);
+            }),
             switchMap(() => {
               const encryptedToken = btoa(
                 paymentDataResponse.paymentMethodData.tokenizationData.token
diff --git a/integration-libs/opps/package.json b/integration-libs/opps/package.json
index 39818e54ea0..dbbba4e344b 100644
--- a/integration-libs/opps/package.json
+++ b/integration-libs/opps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/opps",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "OPPS (Omni-Channel Personalization and Promotions Services) library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,16 +22,16 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4-service/package.json b/integration-libs/s4-service/package.json
index 78a85325b42..7ecc242f161 100644
--- a/integration-libs/s4-service/package.json
+++ b/integration-libs/s4-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4-service",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "S/4HANA Service Integration Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -30,12 +30,12 @@
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index e33536cd14f..b3c01b1e8b0 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4om",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "S/4HANA Order Management (b2b feature)",
   "keywords": [
     "spartacus",
@@ -17,19 +17,19 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/pdf-invoices": "2211.32.0-1",
-    "@spartacus/requested-delivery-date": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/pdf-invoices": "2211.32.0",
+    "@spartacus/requested-delivery-date": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index 623620f69e5..a229037291d 100644
--- a/integration-libs/segment-refs/package.json
+++ b/integration-libs/segment-refs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/segment-refs",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "segment-refs",
   "keywords": [
     "spartacus",
@@ -17,14 +17,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/package-lock.json b/package-lock.json
index 7d0a1fbc18b..dcf4965a6ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "i18next-resources-to-backend": "^1.2.0",
         "ngx-infinite-scroll": "^18.0.0",
         "rxjs": "^7.8.0",
-        "tslib": "^2.6.2",
+        "tslib": "^2.8.1",
         "zone.js": "0.14.10"
       },
       "devDependencies": {
@@ -100,13 +100,13 @@
         "http-proxy": "^1.18.1",
         "http-server": "^14.1.1",
         "i18n-lint": "^1.1.0",
-        "jasmine-core": "~5.4.0",
+        "jasmine-core": "~5.5.0",
         "jasmine-marbles": "^0.9.2",
         "jest": "^29.7.0",
         "jest-circus": "^29.0.0",
         "jest-environment-node": "^29.0.0",
         "jest-preset-angular": "14.1.1",
-        "jsonc-parser": "~3.2.1",
+        "jsonc-parser": "^3.3.1",
         "karma": "~6.4.1",
         "karma-chrome-launcher": "~3.2.0",
         "karma-cli": "^2.0.0",
@@ -131,7 +131,7 @@
         "ts-morph": "^23.0.0",
         "ts-node": "^10.6.0",
         "typescript": "^5.2.2",
-        "webpack": "~5.96.0",
+        "webpack": "~5.97.0",
         "webpack-cli": "^5.0.0"
       },
       "engines": {
@@ -239,13 +239,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/architect/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "18.2.9",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.9.tgz",
@@ -799,13 +792,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
       "version": "8.4.41",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
@@ -1022,12 +1008,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "license": "MIT"
-    },
     "node_modules/@angular-devkit/schematics": {
       "version": "18.2.9",
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.9.tgz",
@@ -1046,12 +1026,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "license": "MIT"
-    },
     "node_modules/@angular-eslint/builder": {
       "version": "18.4.2",
       "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.2.tgz",
@@ -1241,13 +1215,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "devOptional": true,
-      "license": "MIT"
-    },
     "node_modules/@angular/common": {
       "version": "18.2.9",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.9.tgz",
@@ -7780,12 +7747,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/angular/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "license": "MIT"
-    },
     "node_modules/@sigstore/bundle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
@@ -17637,9 +17598,9 @@
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.4.0.tgz",
-      "integrity": "sha512-T4fio3W++llLd7LGSGsioriDHgWyhoL6YTu4k37uwJLF7DzOzspz7mNxRoM3cQdLWtL/ebazQpIf/yZGJx/gzg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.5.0.tgz",
+      "integrity": "sha512-NHOvoPO6o9gVR6pwqEACTEpbgcH+JJ6QDypyymGbSUIFIFsMMbBJ/xsFNud8MSClfnWclXd7RQlAZBz7yVo5TQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -18644,10 +18605,9 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "dev": true,
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
       "license": "MIT"
     },
     "node_modules/jsonfile": {
@@ -20474,9 +20434,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -27474,17 +27434,17 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.96.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
-      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
         "acorn": "^8.14.0",
         "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
diff --git a/package.json b/package.json
index 2756d1baa71..8ad322c668a 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "@angular/router": "^18.2.9",
     "@angular/service-worker": "^18.2.9",
     "@angular/ssr": "^18.2.9",
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.7.2",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
@@ -157,7 +157,7 @@
     "i18next-resources-to-backend": "^1.2.0",
     "ngx-infinite-scroll": "^18.0.0",
     "rxjs": "^7.8.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.8.1",
     "zone.js": "0.14.10"
   },
   "devDependencies": {
@@ -216,13 +216,13 @@
     "http-proxy": "^1.18.1",
     "http-server": "^14.1.1",
     "i18n-lint": "^1.1.0",
-    "jasmine-core": "~5.4.0",
+    "jasmine-core": "~5.5.0",
     "jasmine-marbles": "^0.9.2",
     "jest": "^29.7.0",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0",
     "jest-preset-angular": "14.1.1",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "karma": "~6.4.1",
     "karma-chrome-launcher": "~3.2.0",
     "karma-cli": "^2.0.0",
@@ -247,7 +247,7 @@
     "ts-morph": "^23.0.0",
     "ts-node": "^10.6.0",
     "typescript": "^5.2.2",
-    "webpack": "~5.96.0",
+    "webpack": "~5.97.0",
     "webpack-cli": "^5.0.0"
   }
 }
diff --git a/projects/assets/package.json b/projects/assets/package.json
index ec687b0c10e..9a17317c65d 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/assets",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "homepage": "https://github.com/SAP/spartacus",
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/assets",
   "scripts": {
@@ -10,7 +10,7 @@
     "generate:translations:ts-2-properties": "ts-node ./generate-translations-ts-2-properties"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/projects/assets/src/translations/en/common.json b/projects/assets/src/translations/en/common.json
index dabea7c8f7c..2af166452f4 100644
--- a/projects/assets/src/translations/en/common.json
+++ b/projects/assets/src/translations/en/common.json
@@ -21,6 +21,7 @@
     "search": "Search",
     "add": "Add",
     "breadcrumbs": "breadcrumbs",
+    "breadcrumbsCurrentPage": "Current Page",
     "selectFile": "Select file",
     "clear": "Clear",
     "loaded": "Loaded",
@@ -63,7 +64,8 @@
     "goTo": "Go to {{location}}",
     "navigateTo": "Navigate to {{nav}}",
     "scrollToTop": "Scroll back to the top of the page",
-    "linkItemInList": "{{title}}. {{position}} of {{listLength}}"
+    "linkItemInList": "{{title}}. {{position}} of {{listLength}}",
+    "menuButonTitle": "{{title}} Menu"
   },
   "searchBox": {
     "placeholder": "Enter product name or SKU",
diff --git a/projects/assets/src/translations/en/myAccount.json b/projects/assets/src/translations/en/myAccount.json
index 7e55fccbbae..f370006eed1 100644
--- a/projects/assets/src/translations/en/myAccount.json
+++ b/projects/assets/src/translations/en/myAccount.json
@@ -63,6 +63,13 @@
     "findProducts": "Find Products",
     "status": "Status:",
     "dialogTitle": "Coupon",
+    "claimCoupondialogTitle": "Add To Your Coupon List",
+    "claimCouponCode": {
+      "label": "Coupon Code",
+      "placeholder": "Enter the coupon code to claim a coupon"
+    },
+    "reset": "RESET",
+    "claim": "CLAIM",
     "claimCustomerCoupon": "You have successfully claimed this coupon.",
     "myCoupons": "My coupons",
     "startDateAsc": "Start Date (ascending)",
diff --git a/projects/assets/src/translations/en/user.json b/projects/assets/src/translations/en/user.json
index 019afc6c907..df01c493616 100644
--- a/projects/assets/src/translations/en/user.json
+++ b/projects/assets/src/translations/en/user.json
@@ -10,7 +10,8 @@
       "title": "This website uses cookies",
       "description": "We use cookies/browser's storage to personalize the content and improve user experience.",
       "allowAll": "Allow All",
-      "viewDetails": "View Details"
+      "viewDetails": "View Details",
+      "consentManagement": "Consent Management"
     }
   },
   "checkoutLogin": {
diff --git a/projects/core/package.json b/projects/core/package.json
index b00bb4ee19b..ad980d054a0 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/core",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Spartacus - the core framework",
   "keywords": [
     "spartacus",
@@ -12,7 +12,7 @@
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/core",
   "license": "Apache-2.0",
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular/common": "^18.2.9",
diff --git a/projects/core/src/error-handling/http-error-handler/http-error-handler.interceptor.ts b/projects/core/src/error-handling/http-error-handler/http-error-handler.interceptor.ts
index 0c0093e85bb..3c331ddddec 100644
--- a/projects/core/src/error-handling/http-error-handler/http-error-handler.interceptor.ts
+++ b/projects/core/src/error-handling/http-error-handler/http-error-handler.interceptor.ts
@@ -36,7 +36,7 @@ import {
  * CAUTION: It MUST be provided as the first one in the application to be able to
  *          catch errors from all subsequent interceptors.
  */
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class HttpErrorHandlerInterceptor implements HttpInterceptor {
   protected errorHandler = inject(ErrorHandler);
   protected occEndpointsService = inject(OccEndpointsService);
diff --git a/projects/core/src/error-handling/http-error-handler/http-error-handler.module.ts b/projects/core/src/error-handling/http-error-handler/http-error-handler.module.ts
index 45e89f0be5f..085bcec47b7 100644
--- a/projects/core/src/error-handling/http-error-handler/http-error-handler.module.ts
+++ b/projects/core/src/error-handling/http-error-handler/http-error-handler.module.ts
@@ -16,7 +16,7 @@ export class HttpErrorHandlerModule {
       providers: [
         {
           provide: HTTP_INTERCEPTORS,
-          useClass: HttpErrorHandlerInterceptor,
+          useExisting: HttpErrorHandlerInterceptor,
           multi: true,
         },
       ],
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 1a9d8e87b55..1f7b721e8b1 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
@@ -211,6 +211,11 @@ export interface FeatureTogglesInterface {
    */
   a11yPopoverFocus?: boolean;
 
+  /**
+   * Fix popover appearance when a High Contrast Theme is applied.
+   */
+  a11yPopoverHighContrast?: boolean;
+
   /**
    * Adds Datepicker and Combobox label and corrects heading order for 'CheckoutScheduleReplenishmentOrderComponent'.
    */
@@ -265,6 +270,11 @@ export interface FeatureTogglesInterface {
    */
   a11yCartImportConfirmationMessage?: boolean;
 
+  /**
+   * In `AnonymousConsentDialogComponent` display notifications inside the modal without closing it
+   */
+  a11yAnonymousConsentMessageInDialog?: boolean;
+
   /**
    * Changes 'order days' check list into a fieldset inside of 'CheckoutScheduleReplenishmentOrderComponent'.
    */
@@ -286,6 +296,11 @@ export interface FeatureTogglesInterface {
    */
   a11yMobileFocusOnFirstNavigationItem?: boolean;
 
+  /**
+   * `QuickOrderFormComponent` - disable navigation with Tab/Shift+Tab for search results list
+   */
+  a11yQuickOrderSearchListKeyboardNavigation?: boolean;
+
   /**
    * Corrects heading order inside 'OrderSummaryComponent' template.
    */
@@ -405,6 +420,12 @@ export interface FeatureTogglesInterface {
    */
   a11yTruncatedTextStoreFinder?: boolean;
 
+  /**
+   * `UnitLevelOrderHistoryComponent` filter input label and table email address
+   * are not truncated
+   */
+  a11yTruncatedTextUnitLevelOrderHistory?: boolean;
+
   /**
    * When enabled focus outline on the close button inside `ProductImageZoomDialogComponent`
    * will be fully visible
@@ -520,6 +541,11 @@ export interface FeatureTogglesInterface {
    */
   a11yFacetsDialogFocusHandling?: boolean;
 
+  /**
+   * Resets the focus after navigating to a new page.
+   */
+  a11yResetFocusAfterNavigating?: boolean;
+
   /**
    * `StorefrontComponent`: Prevents header links from wrapping on smaller screen sizes.
    * Enables support for increased letter-spacing up to 0.12em for header layout
@@ -567,6 +593,8 @@ export interface FeatureTogglesInterface {
   /**
    * 'NgSelectA11yDirective' will now provide a count of items for each availble option.
    * Including this count in aria-label will help screen readers to provide more context to the user.
+   * Update (since 2211.33): This feature toggle and the logic behind it should be removed
+   * in next major relase since ng-select now correctly handles aria-label values of select options.
    */
   a11yNgSelectOptionsCount?: boolean;
 
@@ -642,7 +670,7 @@ export interface FeatureTogglesInterface {
   /**
    * Stops the inputs value from obstructing the 'PasswordVisibilityToggleComponent'.
    */
-  a11yPasswordVisibilityBtnValueOverflow?: boolean;
+  a11yPasswordVisibliltyBtnValueOverflow?: boolean;
 
   /**
    * In `ItemCounterComponenet`, Remove button no longer lose focus after activating when count is 2.
@@ -684,6 +712,11 @@ export interface FeatureTogglesInterface {
    */
   a11yImproveButtonsInCardComponent?: boolean;
 
+  /**
+   * In `MiniCart component`, improve visible focus contrast on mobile.
+   */
+  a11yMiniCartFocusOnMobile?: boolean;
+
   /**
    * In `UnitFormComponent`, set 'clearable' as false for select of `ApprovalProcess`.
    */
@@ -712,7 +745,8 @@ export interface FeatureTogglesInterface {
   /**
    * Fixes various instances of the focus ring being cropped in the UI.
    * The focus ring on interactive elements should have all its sides visible and not include any extra padding.
-   * Affects styles of: 'CartItemListComponent, CartItemComponent, ListComponent, FutureStockAccordionComponent, QuoteConfirmDialogComponent, MessagingComponent, TabComponent
+   * Affects styles of: 'CartItemListComponent, CartItemComponent, ListComponent, FutureStockAccordionComponent,
+   * QuoteConfirmDialogComponent, MessagingComponent, TabComponent, ProductImageZoomViewComponent
    */
   a11yCroppedFocusRing?: boolean;
 
@@ -735,18 +769,72 @@ export interface FeatureTogglesInterface {
    */
   a11ySearchboxAssistiveMessage?: boolean;
 
+  /**
+   * Updates the derivative `consentGiven` state when `consent` is updated.
+   *
+   * Components affected:
+   * - `ConsentManagementFormComponent`
+   * - `MyAccountV2ConsentManagementFormComponent`
+   */
+  updateConsentGivenInOnChanges?: boolean;
+
   /**
    * Adds additional styling to help differentiate between focused and selected items in the list.
    * Affects: ConfiguratorAttributeSingleSelectionImageComponent, ProductImagesComponent
    */
   a11yDifferentiateFocusedAndSelected?: boolean;
 
+  /**
+   * When enabled the input element in `QuickOrderFormComponent' will regain its focus after the dropdown is closed.
+   */
+  a11yQuickOrderSearchBoxRefocusOnClose?: boolean;
+
+  /**
+   * Adds a visible focus indicator for keyboard navigation in the `SearchBoxComponent` without affecting the visual state for mouse interactions.
+   * Affects: SearchBoxComponent
+   */
+  a11yKeyboardFocusInSearchBox?: boolean;
+
   /**
    * Adds horizontal padding to the 'carousel-panel' to fix the issue where the focus only covers three sides of the 'Previous slide' and 'Next slide' buttons within the carousel section.
    * Affects: CarouselComponent
    */
   a11yAddPaddingToCarouselPanel?: boolean;
 
+  /**
+   * Restores the focus to the card once a option has been selected and the checkout has updated.
+   * Affects: CheckoutPaymentMethodComponent, CheckoutDeliveryAddressComponent
+   */
+  a11yFocusOnCardAfterSelecting?: boolean;
+
+  /**
+   * Search dropdowns will display the focus ring correctly when navigating to the options using the down arrow key.
+   * Affects: SearchBoxComponent, QuickOrderFormComponent
+   */
+  a11ySearchableDropdownFirstElementFocus?: boolean;
+
+  /**
+   * Hides the 'Consent Management' button from the tab order when the cookies banner is visible.
+   * Ensures the button is re-enabled and part of the tab order once consent is given and the banner disappears.
+   * Renames the button from "View Details" to "Consent Management" after consent is given.
+   * Ensures the button is centered in the `AnonymousConsentOpenDialogComponent` and has clear, four-sided visible focus when navigated via keyboard.
+   * Affects: AnonymousConsentOpenDialogComponent, AnonymousConsentManagementBannerComponent
+   */
+  a11yHideConsentButtonWhenBannerVisible?: boolean;
+
+  /**
+   * Adds a unique `aria-label` to repeating buttons that contain the same text.
+   * Affects: SetPreferredStoreComponent
+   */
+  a11yRepeatingButtonsUniqueLabels?: boolean;
+
+  /**
+   * Ensures that borders across all UI elements are visible and meet accessibility standards in high-contrast dark and light themes.
+   * This change is applied globally to enhance usability for users relying on high-contrast modes.
+   * Affects: CustomerTickingListComponent, CheckoutReviewPaymentComponent, SavedCartListComponent
+   */
+  a11yHighContrastBorders?: boolean;
+
   /**
    * In OCC cart requests, it puts parameters of a cart name and cart description
    * into a request body, instead of query params.
@@ -778,6 +866,14 @@ export interface FeatureTogglesInterface {
    */
   enableConsecutiveCharactersPasswordRequirement?: boolean;
 
+  /**
+   * In CustomerCouponConnector, Enables claiming customer coupon with coupon code in httpRequest body with POST method.
+   *
+   * When set to `false`, claiming customer coupon works with coupon code as parameter in URL, which exposes sensitive data and has security risk.
+   * When set to `true`, claiming customer coupon works with coupon code in httpRequest body with POST method(the new Occ endpoint is available since Commerce 2211.28), which avoids security risk.
+   */
+  enableClaimCustomerCouponWithCodeInRequestBody?: boolean;
+
   /**
    * Enables a validation that prevents new passwords from matching the current password
    * in the password update form.
@@ -805,6 +901,13 @@ export interface FeatureTogglesInterface {
    */
   a11yPdpGridArrangement?: boolean;
 
+  /**
+   * Header. Fixes trapping focus on menu items on mobile when the menu is expanded.
+   * Sets `tabindex` attribute  to `-1` for all visible focusable elements in the header section to exclude them from
+   * keyboard navigation
+   */
+  a11yHamburgerMenuTrapFocus?: boolean;
+
   /**
    * When enabled, allows to provide extended formats and media queries for <picture> element if used in MediaComponent.
    *
@@ -816,20 +919,13 @@ export interface FeatureTogglesInterface {
    *  ```ts
    * provideConfig({
    *   pictureElementFormats: {
-   *    mediaQueries: {
-   *     'max-width': '767px',
-   *      ...
-   *    },
-   *    width: 50,
-   *    height: 50,
+   *    mediaQueries: '(max-width: 480px)',
    *   },
    * })
    * ```
    *
-   * After activating this toggle, new inputs in `MediaComponent` — specifically
-   * `width`, `height`, and `sizes` — will be passed to the template as HTML attributes.
-   *
-   * Toggle activates `@Input() elementType: 'img' | 'picture' = 'img'` in `MediaComponent`
+   * Toggle activates `@Input() elementType: 'img' | 'picture' = 'img'`
+   * and `@Input() sizesForImgElement: string` in `MediaComponent`
    *
    */
   useExtendedMediaComponentConfiguration?: boolean;
@@ -852,17 +948,33 @@ export interface FeatureTogglesInterface {
    */
   a11yWrapReviewOrderInSection?: boolean;
 
+  /**
+   * Enables the product carousel to include products based on specified category codes.
+   *
+   * - When this feature is enabled, the carousel will fetch and display products
+   *   associated with the `categoryCodes` provided.
+   * - The `categoryCodes` are configured and managed through SmartEdit
+   *
+   */
+  enableCarouselCategoryProducts?: boolean;
+
+  /**
+   * When enabled, enforces stronger password validation rules,
+   * including requirements for a mix of uppercase letters, lowercase letters,
+   * special characters, digits, and no consecutive characters,
+   * as well as enforcing both a minimum and maximum password length.
+   */
   enableSecurePasswordValidation?: boolean;
 }
 
 export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   showDeliveryOptionsTranslation: false,
-  formErrorsDescriptiveMessages: false,
+  formErrorsDescriptiveMessages: true,
   showSearchingCustomerByOrderInASM: false,
   showStyleChangesInASM: false,
-  shouldHideAddToCartForUnpurchasableProducts: false,
-  useExtractedBillingAddressComponent: false,
-  showBillingAddressInDigitalPayments: false,
+  shouldHideAddToCartForUnpurchasableProducts: true,
+  useExtractedBillingAddressComponent: true,
+  showBillingAddressInDigitalPayments: true,
   showDownloadProposalButton: true,
   showPromotionsInPDP: true,
   searchBoxV2: false,
@@ -885,6 +997,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yPreventHorizontalScroll: false,
   a11yReorderDialog: true,
   a11yPopoverFocus: true,
+  a11yPopoverHighContrast: false,
   a11yScheduleReplenishment: true,
   a11yScrollToTop: true,
   a11ySavedCartsZoom: true,
@@ -895,10 +1008,12 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yOrganizationsBanner: true,
   a11yOrganizationListHeadingOrder: true,
   a11yCartImportConfirmationMessage: false,
+  a11yAnonymousConsentMessageInDialog: false,
   a11yReplenishmentOrderFieldset: true,
   a11yListOversizedFocus: true,
   a11yStoreFinderOverflow: true,
   a11yMobileFocusOnFirstNavigationItem: false,
+  a11yQuickOrderSearchListKeyboardNavigation: false,
   a11yCartSummaryHeadingOrder: true,
   a11ySearchBoxMobileFocus: true,
   a11yFacetKeyboardNavigation: true,
@@ -913,26 +1028,28 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   cmsGuardsServiceUseGuardsComposer: true,
   cartQuickOrderRemoveListeningToFailEvent: true,
   a11yKeyboardAccessibleZoom: false,
-  a11yOrganizationLinkableCells: false,
+  a11yOrganizationLinkableCells: true,
   a11yVisibleFocusOverflows: true,
   a11yTruncatedTextForResponsiveView: true,
   a11yTruncatedTextStoreFinder: false,
-  a11ySemanticPaginationLabel: false,
+  a11yTruncatedTextUnitLevelOrderHistory: false,
+  a11ySemanticPaginationLabel: true,
   a11yPreventCartItemsFormRedundantRecreation: false,
-  a11yPreventSRFocusOnHiddenElements: false,
+  a11yPreventSRFocusOnHiddenElements: true,
   a11yMyAccountLinkOutline: true,
   a11yCloseProductImageBtnFocus: true,
-  a11yNotificationPreferenceFieldset: false,
-  a11yImproveContrast: false,
+  a11yNotificationPreferenceFieldset: true,
+  a11yImproveContrast: true,
   a11yEmptyWishlistHeading: true,
-  a11yScreenReaderBloatFix: false,
+  a11yScreenReaderBloatFix: true,
   a11yUseButtonsForBtnLinks: true,
   a11yTabComponent: false,
   a11yCarouselArrowKeysNavigation: false,
   a11yPickupOptionsTabs: false,
   a11yNotificationsOnConsentChange: false,
-  a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields: false,
+  a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields: true,
   a11yFacetsDialogFocusHandling: true,
+  a11yResetFocusAfterNavigating: false,
   headerLayoutForSmallerViewports: false,
   a11yStoreFinderAlerts: false,
   a11yStoreFinderLabel: false,
@@ -955,7 +1072,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yAddToWishlistFocus: false,
   a11ySearchBoxFocusOnEscape: false,
   a11yUpdatingCartNoNarration: false,
-  a11yPasswordVisibilityBtnValueOverflow: false,
+  a11yPasswordVisibliltyBtnValueOverflow: false,
   a11yItemCounterFocus: false,
   a11yScrollToReviewByShowReview: false,
   a11yViewHoursButtonIconContrast: false,
@@ -963,6 +1080,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yCheckoutStepsLandmarks: false,
   a11yQTY2Quantity: false,
   a11yImproveButtonsInCardComponent: false,
+  a11yMiniCartFocusOnMobile: false,
   a11yWrapReviewOrderInSection: false,
   a11yApprovalProcessWithNoClearable: false,
   a11yPostRegisterSuccessMessage: false,
@@ -973,8 +1091,16 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yTextSpacingAdjustments: false,
   a11yTableHeaderReadout: false,
   a11ySearchboxAssistiveMessage: false,
+  updateConsentGivenInOnChanges: false,
   a11yDifferentiateFocusedAndSelected: false,
+  a11yQuickOrderSearchBoxRefocusOnClose: false,
+  a11yKeyboardFocusInSearchBox: false,
   a11yAddPaddingToCarouselPanel: false,
+  a11yFocusOnCardAfterSelecting: false,
+  a11ySearchableDropdownFirstElementFocus: false,
+  a11yHideConsentButtonWhenBannerVisible: false,
+  a11yRepeatingButtonsUniqueLabels: false,
+  a11yHighContrastBorders: false,
   occCartNameAndDescriptionInHttpRequestBody: false,
   cmsBottomHeaderSlotUsingFlexStyles: false,
   useSiteThemeService: false,
@@ -982,8 +1108,11 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   enablePasswordsCannotMatchInPasswordUpdateForm: false,
   allPageMetaResolversEnabledInCsr: false,
   a11yPdpGridArrangement: false,
+  a11yHamburgerMenuTrapFocus: false,
   useExtendedMediaComponentConfiguration: false,
-  a11yScrollToTopPositioning: false,
   showRealTimeStockInPDP: false,
+  a11yScrollToTopPositioning: false,
   enableSecurePasswordValidation: false,
+  enableCarouselCategoryProducts: false,
+  enableClaimCustomerCouponWithCodeInRequestBody: false,
 };
diff --git a/projects/core/src/model/cms.model.ts b/projects/core/src/model/cms.model.ts
index fdeba537f5b..8d71c1dbf8d 100644
--- a/projects/core/src/model/cms.model.ts
+++ b/projects/core/src/model/cms.model.ts
@@ -135,6 +135,7 @@ export interface CmsBannerCarouselComponent extends CmsComponent {
 }
 
 export interface CmsProductCarouselComponent extends CmsComponent {
+  categoryCodes?: string;
   title?: string;
   productCodes?: string;
   container?: string;
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 89bbe5bf9f6..9e066dafc5c 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
@@ -43,6 +43,10 @@ export const defaultOccProductConfig: OccConfig = {
           carouselMinimal:
             'products/search?fields=products(code,name,price(formattedValue),images(DEFAULT),baseProduct)',
         },
+        productSearchByCategory: {
+          default: 'categories/${categoryCode}/products?fields=DEFAULT',
+          code: 'categories/${categoryCode}/products?fields=products(code)',
+        },
         /* eslint-enable */
         productSuggestions: 'products/suggestions',
       },
diff --git a/projects/core/src/occ/adapters/product/occ-product-search.adapter.ts b/projects/core/src/occ/adapters/product/occ-product-search.adapter.ts
index cf26166a6b4..53ae8117727 100644
--- a/projects/core/src/occ/adapters/product/occ-product-search.adapter.ts
+++ b/projects/core/src/occ/adapters/product/occ-product-search.adapter.ts
@@ -24,6 +24,7 @@ import { Occ } from '../../occ-models/occ.models';
 import { OccEndpointsService } from '../../services/occ-endpoints.service';
 import { OCC_HTTP_TOKEN } from '../../utils';
 import { Router } from '@angular/router';
+
 @Injectable()
 export class OccProductSearchAdapter implements ProductSearchAdapter {
   protected router = inject(Router, {
@@ -97,6 +98,20 @@ export class OccProductSearchAdapter implements ProductSearchAdapter {
     );
   }
 
+  searchByCategory(
+    category: string,
+    scope?: string
+  ): Observable<{ products: Product[] }> {
+    return this.http
+      .get<Product[]>(this.getSearchByCategoryEndpoint(category, scope))
+      .pipe(
+        this.converter.pipeable(PRODUCT_SEARCH_PAGE_NORMALIZER),
+        map((productSearchPage) => ({
+          products: productSearchPage.products ?? [],
+        }))
+      );
+  }
+
   loadSuggestions(
     term: string,
     pageSize: number = 3
@@ -111,6 +126,16 @@ export class OccProductSearchAdapter implements ProductSearchAdapter {
       );
   }
 
+  protected getSearchByCategoryEndpoint(
+    categoryCode: string,
+    scope?: string
+  ): string {
+    return this.occEndpoints.buildUrl('productSearchByCategory', {
+      urlParams: { categoryCode },
+      scope,
+    });
+  }
+
   protected getSearchEndpoint(
     query: string,
     searchConfig: SearchConfig,
diff --git a/projects/core/src/occ/adapters/user/default-occ-user-config.ts b/projects/core/src/occ/adapters/user/default-occ-user-config.ts
index 813e7a2ae59..2a9fabf34eb 100644
--- a/projects/core/src/occ/adapters/user/default-occ-user-config.ts
+++ b/projects/core/src/occ/adapters/user/default-occ-user-config.ts
@@ -22,6 +22,7 @@ export const defaultOccUserConfig: OccConfig = {
         addressVerification: 'users/${userId}/addresses/verification',
         customerCoupons: 'users/${userId}/customercoupons',
         claimCoupon: 'users/${userId}/customercoupons/${couponCode}/claim',
+        claimCustomerCoupon: 'users/${userId}/customercoupons/claim',
         couponNotification:
           'users/${userId}/customercoupons/${couponCode}/notification',
         notificationPreference: 'users/${userId}/notificationpreferences',
diff --git a/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.spec.ts b/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.spec.ts
index 8d016457782..d480b056661 100644
--- a/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.spec.ts
+++ b/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.spec.ts
@@ -241,4 +241,45 @@ describe('OccCustomerCouponAdapter', () => {
       mockReq.flush(customerCoupon2Customer);
     });
   });
+  describe('claim customer coupon with code in body', () => {
+    it('should claim a customer coupon with code in request body for a given user id', () => {
+      const customerCoupon: CustomerCoupon = {
+        couponId: couponCode,
+        name: 'coupon 1',
+        startDate: '',
+        endDate: '',
+        status: 'Effective',
+        description: '',
+        notificationOn: true,
+      };
+      const customerCoupon2Customer: CustomerCoupon2Customer = {
+        coupon: customerCoupon,
+        customer: {},
+      };
+
+      occCustomerCouponAdapter
+        .claimCustomerCouponWithCodeInBody(userId, couponCode)
+        .subscribe((result) => {
+          expect(result).toEqual(customerCoupon2Customer);
+        });
+
+      const mockReq = httpMock.expectOne((req) => {
+        return req.method === 'POST';
+      });
+
+      expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+        'claimCustomerCoupon',
+        {
+          urlParams: {
+            userId: userId,
+          },
+        }
+      );
+
+      expect(mockReq.cancelled).toBeFalsy();
+      expect(mockReq.request.body).toEqual({ couponCode: couponCode });
+      expect(mockReq.request.responseType).toEqual('json');
+      mockReq.flush(customerCoupon2Customer);
+    });
+  });
 });
diff --git a/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.ts b/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.ts
index 870e6142d60..d06ec706bf1 100644
--- a/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.ts
+++ b/projects/core/src/occ/adapters/user/occ-customer-coupon.adapter.ts
@@ -79,6 +79,21 @@ export class OccCustomerCouponAdapter implements CustomerCouponAdapter {
     return this.http.post(url, { headers });
   }
 
+  claimCustomerCouponWithCodeInBody(
+    userId: string,
+    codeVal: string
+  ): Observable<CustomerCoupon2Customer> {
+    const url = this.occEndpoints.buildUrl('claimCustomerCoupon', {
+      urlParams: { userId },
+    });
+    const toClaim = {
+      couponCode: codeVal,
+    };
+    const headers = this.newHttpHeader();
+
+    return this.http.post(url, toClaim, { headers });
+  }
+
   claimCustomerCoupon(
     userId: string,
     couponCode: string
diff --git a/projects/core/src/occ/occ-models/occ-endpoints.model.ts b/projects/core/src/occ/occ-models/occ-endpoints.model.ts
index 72c6f7a29c2..80df7bcd2f2 100644
--- a/projects/core/src/occ/occ-models/occ-endpoints.model.ts
+++ b/projects/core/src/occ/occ-models/occ-endpoints.model.ts
@@ -237,6 +237,12 @@ export interface OccEndpoints {
    * @member {string}
    */
   claimCoupon?: string | OccEndpoint;
+  /**
+   * Endpoint for claiming coupon with code in request body
+   *
+   * @member {string}
+   */
+  claimCustomerCoupon?: string | OccEndpoint;
   /**
    * Endpoint for coupons
    *
@@ -272,6 +278,11 @@ export interface OccEndpoints {
    * @member {string}
    */
   getActiveCostCenters?: string | OccEndpoint;
+  /** Endpoint to returns categories
+   *
+   * @member {string}
+   */
+  productSearchByCategory?: string | OccEndpoint;
   /** Endpoint to returns Product Availabilities
    *
    * @member {string}
diff --git a/projects/core/src/product/connectors/search/product-search.adapter.ts b/projects/core/src/product/connectors/search/product-search.adapter.ts
index 314102b4300..f360df4977c 100644
--- a/projects/core/src/product/connectors/search/product-search.adapter.ts
+++ b/projects/core/src/product/connectors/search/product-search.adapter.ts
@@ -25,6 +25,11 @@ export abstract class ProductSearchAdapter {
     scope?: string
   ): Observable<{ products: Product[] }>;
 
+  abstract searchByCategory(
+    category: string,
+    scope?: string
+  ): Observable<{ products: Product[] }>;
+
   abstract loadSuggestions(
     term: string,
     pageSize?: number
diff --git a/projects/core/src/product/connectors/search/product-search.connector.spec.ts b/projects/core/src/product/connectors/search/product-search.connector.spec.ts
index ac13eb37271..40b405fec32 100644
--- a/projects/core/src/product/connectors/search/product-search.connector.spec.ts
+++ b/projects/core/src/product/connectors/search/product-search.connector.spec.ts
@@ -16,6 +16,12 @@ class MockProductSearchAdapter implements ProductSearchAdapter {
   searchByCodes = createSpy('ProductSearchAdapter.searchByCodes').and.callFake(
     (codes, scope) => of({ products: codes.map((code) => ({ code, scope })) })
   );
+
+  searchByCategory = createSpy(
+    'ProductSearchAdapter.searchByCategory'
+  ).and.callFake((_category, scope) =>
+    of({ products: [{ code: 'product1', scope }] })
+  );
 }
 
 describe('ProductSearchConnector', () => {
@@ -73,4 +79,18 @@ describe('ProductSearchConnector', () => {
       undefined
     );
   });
+
+  it('searchByCategory should call adapter', () => {
+    let result;
+    service.searchByCategory('testCategory', 'testScope').subscribe((res) => {
+      result = res;
+    });
+    expect(result).toEqual({
+      products: [{ code: 'product1', scope: 'testScope' }],
+    });
+    expect(adapter.searchByCategory).toHaveBeenCalledWith(
+      'testCategory',
+      'testScope'
+    );
+  });
 });
diff --git a/projects/core/src/product/connectors/search/product-search.connector.ts b/projects/core/src/product/connectors/search/product-search.connector.ts
index ce8b34f2129..40479743f6a 100644
--- a/projects/core/src/product/connectors/search/product-search.connector.ts
+++ b/projects/core/src/product/connectors/search/product-search.connector.ts
@@ -9,8 +9,8 @@ import { ProductSearchAdapter } from './product-search.adapter';
 import { SearchConfig } from '../../model/search-config';
 import { Observable } from 'rxjs';
 import {
-  Suggestion,
   ProductSearchPage,
+  Suggestion,
 } from '../../../model/product-search.model';
 import { Product } from '../../../model';
 
@@ -35,6 +35,13 @@ export class ProductSearchConnector {
     return this.adapter.searchByCodes(codes, scope);
   }
 
+  searchByCategory(
+    category: string,
+    scope?: string
+  ): Observable<{ products: Product[] }> {
+    return this.adapter.searchByCategory(category, scope);
+  }
+
   getSuggestions(term: string, pageSize?: number): Observable<Suggestion[]> {
     return this.adapter.loadSuggestions(term, pageSize);
   }
diff --git a/projects/core/src/product/facade/index.ts b/projects/core/src/product/facade/index.ts
index bee0a7310d1..3c73b7e079f 100644
--- a/projects/core/src/product/facade/index.ts
+++ b/projects/core/src/product/facade/index.ts
@@ -8,6 +8,7 @@ export * from './product-reference.service';
 export * from './product-review.service';
 export * from './product-search.service';
 export * from './product-search-by-code.service';
+export * from './product-search-by-category.service';
 export * from './product.service';
 export * from './searchbox.service';
 export * from './product-availability.service';
diff --git a/projects/core/src/product/facade/product-search-by-category.service.spec.ts b/projects/core/src/product/facade/product-search-by-category.service.spec.ts
new file mode 100644
index 00000000000..0644445ca66
--- /dev/null
+++ b/projects/core/src/product/facade/product-search-by-category.service.spec.ts
@@ -0,0 +1,91 @@
+import { TestBed } from '@angular/core/testing';
+import { provideMockStore, MockStore } from '@ngrx/store/testing';
+import { ProductSearchByCategoryService } from './product-search-by-category.service';
+import { ProductActions } from '../store';
+import { of } from 'rxjs';
+import { Product, StateUtils } from '@spartacus/core';
+
+describe('ProductSearchByCategoryService', () => {
+  let service: ProductSearchByCategoryService;
+  let store: MockStore;
+  const initialState = {
+    products: {
+      searchByCategory: {},
+    },
+  };
+
+  const categoryCode = 'testCategory';
+  const scope = 'testScope';
+  const products: Product[] = [
+    { code: 'product1', name: 'Test Product 1' },
+    { code: 'product2', name: 'Test Product 2' },
+  ];
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ProductSearchByCategoryService,
+        provideMockStore({ initialState }),
+      ],
+    });
+
+    service = TestBed.inject(ProductSearchByCategoryService);
+    store = TestBed.inject(MockStore);
+
+    spyOn(store, 'dispatch').and.callThrough();
+  });
+
+  describe('load', () => {
+    it('should dispatch ProductSearchLoadByCategory action', () => {
+      service.load({ categoryCode, scope });
+      expect(store.dispatch).toHaveBeenCalledWith(
+        new ProductActions.ProductSearchLoadByCategory({
+          categoryCode,
+          scope,
+        })
+      );
+    });
+
+    it('should use an empty scope when not provided', () => {
+      service.load({ categoryCode });
+      expect(store.dispatch).toHaveBeenCalledWith(
+        new ProductActions.ProductSearchLoadByCategory({
+          categoryCode,
+          scope: '',
+        })
+      );
+    });
+  });
+
+  describe('get', () => {
+    it('should return products when the state contains them', (done) => {
+      const mockState = {
+        loading: false,
+        success: true,
+        value: products,
+      } as StateUtils.LoaderState<Product[]>;
+
+      spyOn(store, 'pipe').and.returnValue(of(mockState));
+
+      service.get({ categoryCode, scope }).subscribe((result) => {
+        expect(result).toEqual(products);
+        done();
+      });
+    });
+
+    it('should not trigger load if state is already loading', (done) => {
+      const mockState = {
+        loading: true,
+        success: false,
+        error: false,
+      } as StateUtils.LoaderState<Product[]>;
+
+      spyOn(store, 'pipe').and.returnValue(of(mockState));
+
+      service.get({ categoryCode, scope }).subscribe(() => {
+        expect(store.dispatch).not.toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+});
diff --git a/projects/core/src/product/facade/product-search-by-category.service.ts b/projects/core/src/product/facade/product-search-by-category.service.ts
new file mode 100644
index 00000000000..605f318b139
--- /dev/null
+++ b/projects/core/src/product/facade/product-search-by-category.service.ts
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { inject, Injectable } from '@angular/core';
+import { select, Store } from '@ngrx/store';
+import { Observable, using } from 'rxjs';
+import { auditTime, map, tap } from 'rxjs/operators';
+import { Product } from '../../model';
+import { StateWithProduct } from '../store/product-state';
+import { ProductActions, ProductSelectors } from '../store';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ProductSearchByCategoryService {
+  protected store = inject(Store<StateWithProduct>);
+
+  load({
+    categoryCode,
+    scope,
+  }: {
+    categoryCode: string;
+    scope?: string;
+  }): void {
+    this.store.dispatch(
+      new ProductActions.ProductSearchLoadByCategory({
+        categoryCode,
+        scope: scope ?? '',
+      })
+    );
+  }
+
+  get({
+    categoryCode,
+    scope,
+  }: {
+    categoryCode: string;
+    scope?: string;
+  }): Observable<Product[] | undefined> {
+    const state$ = this.store.pipe(
+      select(
+        ProductSelectors.getSelectedProductSearchByCategoryStateFactory({
+          categoryCode,
+          scope: scope ?? '',
+        })
+      )
+    );
+
+    const loading$ = state$.pipe(
+      auditTime(0),
+      tap((state) => {
+        if (!(state.loading || state.success || state.error)) {
+          this.load({ categoryCode, scope });
+        }
+      })
+    );
+
+    const value$ = state$.pipe(map((state) => state.value));
+
+    return using(
+      () => loading$.subscribe(),
+      () => value$
+    );
+  }
+}
diff --git a/projects/core/src/product/facade/product-search.service.ts b/projects/core/src/product/facade/product-search.service.ts
index 85473ffa9c9..87185e59c80 100644
--- a/projects/core/src/product/facade/product-search.service.ts
+++ b/projects/core/src/product/facade/product-search.service.ts
@@ -18,7 +18,6 @@ import { ProductSelectors } from '../store/selectors/index';
 })
 export class ProductSearchService {
   constructor(protected store: Store<StateWithProduct>) {}
-
   search(query: string | undefined, searchConfig?: SearchConfig): void {
     if (query) {
       this.store.dispatch(
diff --git a/projects/core/src/product/model/product-scope.ts b/projects/core/src/product/model/product-scope.ts
index ada63a61a3f..34081b55f84 100644
--- a/projects/core/src/product/model/product-scope.ts
+++ b/projects/core/src/product/model/product-scope.ts
@@ -9,6 +9,7 @@ export const enum ProductScope {
   DETAILS = 'details',
   ATTRIBUTES = 'attributes',
   VARIANTS = 'variants',
+  CODE = 'code',
   PRICE = 'price',
   /** Fetch the default stock information. */
   STOCK = 'stock',
diff --git a/projects/core/src/product/store/actions/product-group.actions.ts b/projects/core/src/product/store/actions/product-group.actions.ts
index e6cc5661364..c58fbd60f59 100644
--- a/projects/core/src/product/store/actions/product-group.actions.ts
+++ b/projects/core/src/product/store/actions/product-group.actions.ts
@@ -8,4 +8,5 @@ export * from './product-references.action';
 export * from './product-reviews.action';
 export * from './product-search.action';
 export * from './product-search-by-code.action';
+export * from './product-search-by-category.action';
 export * from './product.action';
diff --git a/projects/core/src/product/store/actions/product-search-by-category.action.spec.ts b/projects/core/src/product/store/actions/product-search-by-category.action.spec.ts
new file mode 100644
index 00000000000..a6c275e2f21
--- /dev/null
+++ b/projects/core/src/product/store/actions/product-search-by-category.action.spec.ts
@@ -0,0 +1,72 @@
+import { EntityScopedLoaderActions } from '../../../state/utils/scoped-loader/entity-scoped-loader.actions';
+import { PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY } from '../product-state';
+import * as fromProductSearchByCategory from './product-search-by-category.action';
+
+describe('ProductSearchByCategory Actions', () => {
+  describe('ProductSearchLoadByCategory', () => {
+    it('should create an action', () => {
+      const payload = { categoryCode: 'testCategory', scope: 'testScope' };
+      const action =
+        new fromProductSearchByCategory.ProductSearchLoadByCategory(payload);
+
+      expect({ ...action }).toEqual({
+        type: fromProductSearchByCategory.PRODUCT_SEARCH_LOAD_BY_CATEGORY,
+        payload: payload,
+        meta: EntityScopedLoaderActions.entityScopedLoadMeta(
+          PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
+          payload.categoryCode,
+          payload.scope
+        ),
+      });
+    });
+  });
+
+  describe('ProductSearchLoadByCategorySuccess', () => {
+    it('should create an action', () => {
+      const payload = {
+        categoryCode: 'testCategory',
+        scope: 'testScope',
+        products: [{ code: 'product1' }, { code: 'product2' }],
+      };
+      const action =
+        new fromProductSearchByCategory.ProductSearchLoadByCategorySuccess(
+          payload
+        );
+
+      expect({ ...action }).toEqual({
+        type: fromProductSearchByCategory.PRODUCT_SEARCH_LOAD_BY_CATEGORY_SUCCESS,
+        payload: payload.products,
+        meta: EntityScopedLoaderActions.entityScopedSuccessMeta(
+          PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
+          payload.categoryCode,
+          payload.scope
+        ),
+      });
+    });
+  });
+
+  describe('ProductSearchLoadByCategoryFail', () => {
+    it('should create an action', () => {
+      const payload = {
+        categoryCode: 'testCategory',
+        scope: 'testScope',
+        error: 'someError',
+      };
+      const action =
+        new fromProductSearchByCategory.ProductSearchLoadByCategoryFail(
+          payload
+        );
+
+      expect({ ...action }).toEqual({
+        type: fromProductSearchByCategory.PRODUCT_SEARCH_LOAD_BY_CATEGORY_FAIL,
+        meta: EntityScopedLoaderActions.entityScopedFailMeta(
+          PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
+          payload.categoryCode,
+          payload.scope,
+          payload.error
+        ),
+        error: payload.error,
+      });
+    });
+  });
+});
diff --git a/projects/core/src/product/store/actions/product-search-by-category.action.ts b/projects/core/src/product/store/actions/product-search-by-category.action.ts
new file mode 100644
index 00000000000..01c2369f2a9
--- /dev/null
+++ b/projects/core/src/product/store/actions/product-search-by-category.action.ts
@@ -0,0 +1,71 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EntityScopedLoaderActions } from '../../../state/utils/scoped-loader/entity-scoped-loader.actions';
+
+import { PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY } from '../product-state';
+
+import { ErrorAction } from '../../../error-handling';
+import { Product } from '../../../model/product.model';
+export const PRODUCT_SEARCH_LOAD_BY_CATEGORY =
+  '[Product] Product Search Load By Category';
+export const PRODUCT_SEARCH_LOAD_BY_CATEGORY_SUCCESS =
+  '[Product] Product Search Load By Category Success';
+export const PRODUCT_SEARCH_LOAD_BY_CATEGORY_FAIL =
+  '[Product] Product Search Load By Category Fail';
+
+export class ProductSearchLoadByCategory extends EntityScopedLoaderActions.EntityScopedLoadAction {
+  readonly type = PRODUCT_SEARCH_LOAD_BY_CATEGORY;
+  constructor(
+    public payload: {
+      categoryCode: string;
+      scope: string;
+    }
+  ) {
+    super(
+      PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
+      payload.categoryCode,
+      payload.scope
+    );
+  }
+}
+
+export class ProductSearchLoadByCategorySuccess extends EntityScopedLoaderActions.EntityScopedSuccessAction {
+  readonly type = PRODUCT_SEARCH_LOAD_BY_CATEGORY_SUCCESS;
+  constructor(payload: {
+    products: Product[];
+    categoryCode: string;
+    scope: string;
+  }) {
+    super(
+      PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
+      payload.categoryCode,
+      payload.scope,
+      payload.products
+    );
+  }
+}
+
+export class ProductSearchLoadByCategoryFail
+  extends EntityScopedLoaderActions.EntityScopedFailAction
+  implements ErrorAction
+{
+  readonly type = PRODUCT_SEARCH_LOAD_BY_CATEGORY_FAIL;
+  constructor(payload: { categoryCode: string; scope: string; error: any }) {
+    super(
+      PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
+      payload.categoryCode,
+      payload.scope,
+      payload.error
+    );
+  }
+}
+
+// action types
+export type ProductSearchByCategoryAction =
+  | ProductSearchLoadByCategory
+  | ProductSearchLoadByCategorySuccess
+  | ProductSearchLoadByCategoryFail;
diff --git a/projects/core/src/product/store/effects/index.ts b/projects/core/src/product/store/effects/index.ts
index b27d7f18b3e..4ea62901091 100644
--- a/projects/core/src/product/store/effects/index.ts
+++ b/projects/core/src/product/store/effects/index.ts
@@ -9,10 +9,12 @@ import { ProductReviewsEffects } from './product-reviews.effect';
 import { ProductsSearchEffects } from './product-search.effect';
 import { ProductEffects } from './product.effect';
 import { ProductSearchByCodeEffects } from './product-search-by-code.effect';
+import { ProductSearchByCategoryEffects } from './product-search-by-category.effect';
 
 export const effects: any[] = [
   ProductsSearchEffects,
   ProductSearchByCodeEffects,
+  ProductSearchByCategoryEffects,
   ProductEffects,
   ProductReviewsEffects,
   ProductReferencesEffects,
@@ -22,4 +24,5 @@ export * from './product-references.effect';
 export * from './product-reviews.effect';
 export * from './product-search.effect';
 export * from './product-search-by-code.effect';
+export * from './product-search-by-category.effect';
 export * from './product.effect';
diff --git a/projects/core/src/product/store/effects/product-search-by-category.effect.spec.ts b/projects/core/src/product/store/effects/product-search-by-category.effect.spec.ts
new file mode 100644
index 00000000000..0aab9f2e022
--- /dev/null
+++ b/projects/core/src/product/store/effects/product-search-by-category.effect.spec.ts
@@ -0,0 +1,120 @@
+import { TestBed } from '@angular/core/testing';
+import { provideMockActions } from '@ngrx/effects/testing';
+import { Observable } from 'rxjs';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { ProductSearchConnector } from '../../connectors/search/product-search.connector';
+import { LoggerService } from '../../../logger/logger.service';
+import { ProductActions } from '../actions';
+import { ProductSearchByCategoryEffects } from './product-search-by-category.effect';
+import { tryNormalizeHttpError } from '@spartacus/core';
+
+describe('ProductSearchByCategoryEffects', () => {
+  let actions$: Observable<any>;
+  let effects: ProductSearchByCategoryEffects;
+  let productSearchConnector: jasmine.SpyObj<ProductSearchConnector>;
+  let logger: jasmine.SpyObj<LoggerService>;
+
+  beforeEach(() => {
+    productSearchConnector = jasmine.createSpyObj('ProductSearchConnector', [
+      'searchByCategory',
+    ]);
+    logger = jasmine.createSpyObj('LoggerService', ['error']);
+
+    TestBed.configureTestingModule({
+      providers: [
+        ProductSearchByCategoryEffects,
+        provideMockActions(() => actions$),
+        { provide: ProductSearchConnector, useValue: productSearchConnector },
+        { provide: LoggerService, useValue: logger },
+      ],
+    });
+
+    effects = TestBed.inject(ProductSearchByCategoryEffects);
+  });
+
+  it('should load products by category codes successfully', () => {
+    const action = new ProductActions.ProductSearchLoadByCategory({
+      categoryCode: 'brand_1',
+      scope: 'list',
+    });
+    const completion = new ProductActions.ProductSearchLoadByCategorySuccess({
+      categoryCode: 'brand_1',
+      scope: 'list',
+      products: [{ code: '123' }],
+    });
+
+    actions$ = hot('-a', { a: action });
+    const response = cold('-a|', { a: { products: [{ code: '123' }] } });
+    productSearchConnector.searchByCategory.and.returnValue(response);
+
+    const expected = cold('---b', { b: completion });
+
+    expect(
+      effects.searchByCategory$({ scheduler: getTestScheduler() })
+    ).toBeObservable(expected);
+  });
+
+  it('should handle multiple categories successfully', () => {
+    const action1 = new ProductActions.ProductSearchLoadByCategory({
+      categoryCode: 'brand_1',
+      scope: 'list',
+    });
+    const action2 = new ProductActions.ProductSearchLoadByCategory({
+      categoryCode: 'brand_2',
+      scope: 'list',
+    });
+    const completion1 = new ProductActions.ProductSearchLoadByCategorySuccess({
+      categoryCode: 'brand_1',
+      scope: 'list',
+      products: [{ code: '123' }, { code: '456' }],
+    });
+    const completion2 = new ProductActions.ProductSearchLoadByCategorySuccess({
+      categoryCode: 'brand_2',
+      scope: 'list',
+      products: [{ code: '789' }, { code: '101' }],
+    });
+
+    actions$ = hot('-a-b', { a: action1, b: action2 });
+
+    const response1 = cold('-a|', {
+      a: { products: [{ code: '123' }, { code: '456' }] },
+    });
+    const response2 = cold('-a|', {
+      a: { products: [{ code: '789' }, { code: '101' }] },
+    });
+
+    productSearchConnector.searchByCategory.and.returnValues(
+      response1,
+      response2
+    );
+
+    const expected = cold('---c-d', { c: completion1, d: completion2 });
+
+    expect(
+      effects.searchByCategory$({ scheduler: getTestScheduler() })
+    ).toBeObservable(expected);
+  });
+
+  it('should handle errors when loading products by category codes', () => {
+    const action = new ProductActions.ProductSearchLoadByCategory({
+      categoryCode: 'brand_1',
+      scope: 'list',
+    });
+    const error = tryNormalizeHttpError('Error loading products', logger);
+    const completion = new ProductActions.ProductSearchLoadByCategoryFail({
+      categoryCode: 'brand_1',
+      scope: 'list',
+      error,
+    });
+
+    actions$ = hot('-a-', { a: action });
+    const response = cold('-#|', {}, error);
+    productSearchConnector.searchByCategory.and.returnValue(response);
+
+    const expected = cold('--b', { b: completion });
+
+    expect(
+      effects.searchByCategory$({ scheduler: getTestScheduler() })
+    ).toBeObservable(expected);
+  });
+});
diff --git a/projects/core/src/product/store/effects/product-search-by-category.effect.ts b/projects/core/src/product/store/effects/product-search-by-category.effect.ts
new file mode 100644
index 00000000000..5d4561c89dd
--- /dev/null
+++ b/projects/core/src/product/store/effects/product-search-by-category.effect.ts
@@ -0,0 +1,105 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { inject, Injectable } from '@angular/core';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
+import { Action } from '@ngrx/store';
+import { forkJoin, Observable } from 'rxjs';
+import { catchError, groupBy, map, mergeMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger/logger.service';
+import { SiteContextActions } from '../../../site-context/store/actions/index';
+import { bufferDebounceTime } from '../../../util/rxjs/buffer-debounce-time';
+import { withdrawOn } from '../../../util/rxjs/withdraw-on';
+import { ProductSearchConnector } from '../../connectors/search/product-search.connector';
+import { ProductActions } from '../actions/index';
+import { tryNormalizeHttpError } from '../../../util/try-normalize-http-error';
+
+@Injectable()
+export class ProductSearchByCategoryEffects {
+  protected logger = inject(LoggerService);
+  private actions$ = inject(Actions);
+  private productSearchConnector = inject(ProductSearchConnector);
+
+  private contextChange$: Observable<Action> = this.actions$.pipe(
+    ofType(
+      SiteContextActions.CURRENCY_CHANGE,
+      SiteContextActions.LANGUAGE_CHANGE
+    )
+  );
+
+  searchByCategory$ = createEffect(
+    () =>
+      ({ scheduler, debounce = 0 } = {}): Observable<
+        | ProductActions.ProductSearchLoadByCategorySuccess
+        | ProductActions.ProductSearchLoadByCategoryFail
+      > =>
+        this.actions$.pipe(
+          ofType(ProductActions.PRODUCT_SEARCH_LOAD_BY_CATEGORY),
+
+          groupBy(
+            (action: ProductActions.ProductSearchLoadByCategory) =>
+              action.payload.scope
+          ),
+          mergeMap((group) => {
+            const scope = group.key;
+
+            return group.pipe(
+              map(
+                (action: ProductActions.ProductSearchLoadByCategory) =>
+                  action.payload
+              ),
+
+              bufferDebounceTime(debounce, scheduler),
+
+              mergeMap(
+                (payloads: { categoryCode: string; scope: string }[]) => {
+                  const categoryCodes = payloads.map(
+                    (payload) => payload.categoryCode
+                  );
+
+                  return forkJoin(
+                    categoryCodes.map((categoryCode) =>
+                      this.productSearchConnector.searchByCategory(
+                        categoryCode,
+                        scope
+                      )
+                    )
+                  ).pipe(
+                    mergeMap((searchResults, _index) => {
+                      return categoryCodes.map((categoryCode, idx) => {
+                        const categoryProducts =
+                          searchResults[idx]?.products ?? [];
+                        return new ProductActions.ProductSearchLoadByCategorySuccess(
+                          {
+                            categoryCode,
+                            scope,
+                            products: categoryProducts,
+                          }
+                        );
+                      });
+                    }),
+                    catchError(
+                      (
+                        error
+                      ): ProductActions.ProductSearchLoadByCategoryFail[] => {
+                        return payloads.map(
+                          (payload) =>
+                            new ProductActions.ProductSearchLoadByCategoryFail({
+                              ...payload,
+                              error: tryNormalizeHttpError(error, this.logger),
+                            })
+                        );
+                      }
+                    )
+                  );
+                }
+              )
+            );
+          }),
+          withdrawOn(this.contextChange$)
+        )
+  );
+}
diff --git a/projects/core/src/product/store/product-state.ts b/projects/core/src/product/store/product-state.ts
index 9b76b269864..de1dfb6c5dd 100644
--- a/projects/core/src/product/store/product-state.ts
+++ b/projects/core/src/product/store/product-state.ts
@@ -16,6 +16,9 @@ export const PRODUCT_DETAIL_ENTITY = '[Product] Detail Entity';
 export const PRODUCT_SEARCH_RESULTS_BY_CODES_ENTITY =
   '[Product] Search Results By Codes Entity';
 
+export const PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY =
+  '[Product] Search Results By Category Entity';
+
 export interface StateWithProduct {
   [PRODUCT_FEATURE]: ProductsState;
 }
@@ -24,6 +27,7 @@ export interface ProductsState {
   details: EntityScopedLoaderState<Product>;
   search: ProductsSearchState;
   searchByCode: EntityScopedLoaderState<Product>;
+  searchByCategory: EntityScopedLoaderState<Product[]>;
   reviews: ProductReviewsState;
   references: ProductReferencesState;
 }
diff --git a/projects/core/src/product/store/reducers/index.ts b/projects/core/src/product/store/reducers/index.ts
index a1b9b5c2138..e8ffd632c54 100644
--- a/projects/core/src/product/store/reducers/index.ts
+++ b/projects/core/src/product/store/reducers/index.ts
@@ -13,6 +13,7 @@ import {
   ProductsState,
   PRODUCT_DETAIL_ENTITY,
   PRODUCT_SEARCH_RESULTS_BY_CODES_ENTITY,
+  PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY,
 } from '../product-state';
 import * as fromProductReferences from './product-references.reducer';
 import * as fromProductReviews from './product-reviews.reducer';
@@ -24,6 +25,9 @@ export function getReducers(): ActionReducerMap<ProductsState, any> {
     searchByCode: entityScopedLoaderReducer<Product>(
       PRODUCT_SEARCH_RESULTS_BY_CODES_ENTITY
     ),
+    searchByCategory: entityScopedLoaderReducer<Product[]>(
+      PRODUCT_SEARCH_RESULTS_BY_CATEGORY_ENTITY
+    ),
     details: entityScopedLoaderReducer<Product>(PRODUCT_DETAIL_ENTITY),
     reviews: fromProductReviews.reducer,
     references: fromProductReferences.reducer,
diff --git a/projects/core/src/product/store/selectors/product-group.selectors.ts b/projects/core/src/product/store/selectors/product-group.selectors.ts
index 0f87832fa73..da3c462c5ff 100644
--- a/projects/core/src/product/store/selectors/product-group.selectors.ts
+++ b/projects/core/src/product/store/selectors/product-group.selectors.ts
@@ -9,4 +9,5 @@ export * from './product-references.selectors';
 export * from './product-reviews.selectors';
 export * from './product-search.selectors';
 export * from './product-search-by-code.selectors';
+export * from './product-search-by-category.selectors';
 export * from './product.selectors';
diff --git a/projects/core/src/product/store/selectors/product-search-by-category.selectors.spec.ts b/projects/core/src/product/store/selectors/product-search-by-category.selectors.spec.ts
new file mode 100644
index 00000000000..33152207941
--- /dev/null
+++ b/projects/core/src/product/store/selectors/product-search-by-category.selectors.spec.ts
@@ -0,0 +1,102 @@
+import { TestBed } from '@angular/core/testing';
+import { Store, StoreModule } from '@ngrx/store';
+import { StateUtils } from '../../../state/utils';
+import { Product } from '../../../model/product.model';
+import { PRODUCT_FEATURE, StateWithProduct } from '../product-state';
+import * as fromReducers from '../reducers';
+import * as ProductActions from '../actions/product-search-by-category.action';
+import { getSelectedProductSearchByCategoryStateFactory } from './product-search-by-category.selectors';
+
+describe('getSelectedProductSearchByCategoryStateFactory', () => {
+  let store: Store<StateWithProduct>;
+
+  const categoryCode = 'testCategory';
+  const scope = 'testScope';
+  const products: Product[] = [
+    { code: 'product1', name: 'Test Product 1' },
+    { code: 'product2', name: 'Test Product 2' },
+  ];
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot({}),
+        StoreModule.forFeature(PRODUCT_FEATURE, fromReducers.getReducers()),
+      ],
+    });
+
+    store = TestBed.inject(Store);
+    spyOn(store, 'dispatch').and.callThrough();
+  });
+
+  it('should return the initial loader state when no category is found', () => {
+    let result: StateUtils.LoaderState<Product[]>;
+    store
+      .select(
+        getSelectedProductSearchByCategoryStateFactory({ categoryCode, scope })
+      )
+      .subscribe((value) => (result = value));
+
+    expect(result).toEqual(StateUtils.initialLoaderState);
+  });
+
+  it('should return the correct product state when products are found', () => {
+    let result: StateUtils.LoaderState<Product[]>;
+    store
+      .select(
+        getSelectedProductSearchByCategoryStateFactory({ categoryCode, scope })
+      )
+      .subscribe((value) => (result = value));
+
+    store.dispatch(
+      new ProductActions.ProductSearchLoadByCategorySuccess({
+        categoryCode,
+        scope,
+        products,
+      })
+    );
+
+    expect(result.value).toEqual(products);
+  });
+
+  it('should return a loading state when loading is triggered', () => {
+    let result: StateUtils.LoaderState<Product[]>;
+    store
+      .select(
+        getSelectedProductSearchByCategoryStateFactory({ categoryCode, scope })
+      )
+      .subscribe((value) => (result = value));
+
+    store.dispatch(
+      new ProductActions.ProductSearchLoadByCategory({
+        categoryCode,
+        scope,
+      })
+    );
+
+    expect(result.loading).toBeTruthy();
+    expect(result.value).toBeUndefined();
+  });
+
+  it('should return an error state when the loading fails', () => {
+    let result: StateUtils.LoaderState<Product[]>;
+    const error = { message: 'Error occurred' };
+
+    store
+      .select(
+        getSelectedProductSearchByCategoryStateFactory({ categoryCode, scope })
+      )
+      .subscribe((value) => (result = value));
+
+    store.dispatch(
+      new ProductActions.ProductSearchLoadByCategoryFail({
+        categoryCode,
+        scope,
+        error,
+      })
+    );
+
+    expect(result.error).toBeTruthy();
+    expect(result.success).toBeFalsy();
+  });
+});
diff --git a/projects/core/src/product/store/selectors/product-search-by-category.selectors.ts b/projects/core/src/product/store/selectors/product-search-by-category.selectors.ts
new file mode 100644
index 00000000000..75b3dcc76ad
--- /dev/null
+++ b/projects/core/src/product/store/selectors/product-search-by-category.selectors.ts
@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createSelector, MemoizedSelector } from '@ngrx/store';
+import { Product } from '../../../model/product.model';
+import { StateUtils } from '../../../state/utils/index';
+import { EntityScopedLoaderState } from '../../../state/utils/scoped-loader/scoped-loader.state';
+import { ProductsState, StateWithProduct } from '../product-state';
+import { getProductsState } from './feature.selector';
+
+export const getProductSearchByCategoryState: MemoizedSelector<
+  StateWithProduct,
+  EntityScopedLoaderState<Product[]>
+> = createSelector(
+  getProductsState,
+  (state: ProductsState) => state.searchByCategory
+);
+
+export const getSelectedProductSearchByCategoryStateFactory = (payload: {
+  categoryCode: string;
+  scope: string;
+}): MemoizedSelector<StateWithProduct, StateUtils.LoaderState<Product[]>> => {
+  return createSelector(
+    getProductSearchByCategoryState,
+    (productSearchByCategoryResults) =>
+      (
+        StateUtils.entityLoaderStateSelector(
+          productSearchByCategoryResults,
+          payload.categoryCode
+        ) as any
+      )[payload.scope] || StateUtils.initialLoaderState
+  );
+};
diff --git a/projects/core/src/state/config/state-config.ts b/projects/core/src/state/config/state-config.ts
index 63667b067ff..830a233c1d0 100644
--- a/projects/core/src/state/config/state-config.ts
+++ b/projects/core/src/state/config/state-config.ts
@@ -28,7 +28,7 @@ export abstract class StateConfig {
         /**
          * A set of state keys that should be transferred from server.
          */
-        [key: string]: StateTransferType;
+        [key: string]: StateTransferType | undefined;
       };
     };
   };
diff --git a/projects/core/src/state/reducers/transfer-state.reducer.ts b/projects/core/src/state/reducers/transfer-state.reducer.ts
index c61d80ff100..c31fe548cef 100644
--- a/projects/core/src/state/reducers/transfer-state.reducer.ts
+++ b/projects/core/src/state/reducers/transfer-state.reducer.ts
@@ -41,7 +41,7 @@ export function getTransferStateReducer(
 
 export function getServerTransferStateReducer(
   transferState: TransferState,
-  keys: { [key: string]: StateTransferType }
+  keys: { [key: string]: StateTransferType | undefined }
 ) {
   const transferStateKeys = filterKeysByType(
     keys,
@@ -63,7 +63,7 @@ export function getServerTransferStateReducer(
 
 export function getBrowserTransferStateReducer(
   transferState: TransferState,
-  keys: { [key: string]: StateTransferType },
+  keys: { [key: string]: StateTransferType | undefined },
   isLoggedIn: boolean
 ) {
   const transferStateKeys = filterKeysByType(
diff --git a/projects/core/src/state/utils/get-state-slice.ts b/projects/core/src/state/utils/get-state-slice.ts
index 1c0dab8dc59..32604b6a5fe 100644
--- a/projects/core/src/state/utils/get-state-slice.ts
+++ b/projects/core/src/state/utils/get-state-slice.ts
@@ -102,7 +102,7 @@ export function getExclusionKeys(key: string, excludeKeys: string[]): string[] {
 }
 
 export function filterKeysByType(
-  keys: { [key: string]: StorageSyncType | StateTransferType },
+  keys: { [key: string]: StorageSyncType | StateTransferType | undefined },
   type: StorageSyncType | StateTransferType
 ): string[] {
   if (!keys) {
diff --git a/projects/core/src/user/connectors/customer-coupon/customer-coupon.adapter.ts b/projects/core/src/user/connectors/customer-coupon/customer-coupon.adapter.ts
index 9923117908f..9dd21376486 100644
--- a/projects/core/src/user/connectors/customer-coupon/customer-coupon.adapter.ts
+++ b/projects/core/src/user/connectors/customer-coupon/customer-coupon.adapter.ts
@@ -29,6 +29,11 @@ export abstract class CustomerCouponAdapter {
     couponCode: string
   ): Observable<{}>;
 
+  abstract claimCustomerCouponWithCodeInBody(
+    userId: string,
+    couponVal: string
+  ): Observable<CustomerCoupon2Customer>;
+
   abstract claimCustomerCoupon(
     userId: string,
     couponCode: string
diff --git a/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.spec.ts b/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.spec.ts
index ff670877e56..4d0163a7316 100644
--- a/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.spec.ts
+++ b/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.spec.ts
@@ -3,6 +3,7 @@ import { of } from 'rxjs';
 import { CustomerCouponAdapter } from './customer-coupon.adapter';
 import { CustomerCouponConnector } from './customer-coupon.connector';
 import createSpy = jasmine.createSpy;
+import { FeatureConfigService } from '../../../features-config/services/feature-config.service';
 
 const PAGE_SIZE = 5;
 const currentPage = 1;
@@ -21,6 +22,9 @@ class MockUserAdapter implements CustomerCouponAdapter {
   claimCustomerCoupon = createSpy('claimCustomerCoupon').and.callFake(
     (userId) => of(`claim-${userId}`)
   );
+  claimCustomerCouponWithCodeInBody = createSpy(
+    'claimCustomerCouponWithCodeInBody'
+  ).and.callFake((userId) => of(`claim-${userId}`));
   disclaimCustomerCoupon = createSpy('disclaimCustomerCoupon').and.callFake(
     (userId) => of(`disclaim-${userId}`)
   );
@@ -29,6 +33,7 @@ class MockUserAdapter implements CustomerCouponAdapter {
 describe('CustomerCouponConnector', () => {
   let service: CustomerCouponConnector;
   let adapter: CustomerCouponAdapter;
+  let featureConfigService: FeatureConfigService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -39,6 +44,7 @@ describe('CustomerCouponConnector', () => {
 
     service = TestBed.inject(CustomerCouponConnector);
     adapter = TestBed.inject(CustomerCouponAdapter);
+    featureConfigService = TestBed.inject(FeatureConfigService);
   });
 
   it('should be created', () => {
@@ -83,8 +89,9 @@ describe('CustomerCouponConnector', () => {
     );
   });
 
-  it('claimCustomerCoupon should call adapter', () => {
+  it('claimCustomerCoupon should call adapter.claimCustomerCoupon in case enableClaimCustomerCouponWithCodeInRequestBody is disabled', () => {
     let result;
+    spyOn(featureConfigService, 'isEnabled').and.returnValue(false);
     service
       .claimCustomerCoupon('userId', 'couponCode')
       .subscribe((res) => (result = res));
@@ -95,6 +102,19 @@ describe('CustomerCouponConnector', () => {
     );
   });
 
+  it('claimCustomerCoupon should call adapter.claimCustomerCouponWithCodeInBody in case enableClaimCustomerCouponWithCodeInRequestBody is enabled', () => {
+    let result;
+    spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
+    service
+      .claimCustomerCoupon('userId', 'couponCode')
+      .subscribe((res) => (result = res));
+    expect(result).toEqual('claim-userId');
+    expect(adapter.claimCustomerCouponWithCodeInBody).toHaveBeenCalledWith(
+      'userId',
+      'couponCode'
+    );
+  });
+
   it('disclaimCustomerCoupon should call adapter', () => {
     let result;
     service
diff --git a/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.ts b/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.ts
index 97d874c7077..82f856fb384 100644
--- a/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.ts
+++ b/projects/core/src/user/connectors/customer-coupon/customer-coupon.connector.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
   CustomerCoupon2Customer,
@@ -12,11 +12,13 @@ import {
   CustomerCouponSearchResult,
 } from '../../../model/customer-coupon.model';
 import { CustomerCouponAdapter } from './customer-coupon.adapter';
+import { FeatureConfigService } from '../../../features-config/services/feature-config.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class CustomerCouponConnector {
+  private featureConfigService = inject(FeatureConfigService);
   constructor(protected adapter: CustomerCouponAdapter) {}
 
   getCustomerCoupons(
@@ -43,7 +45,15 @@ export class CustomerCouponConnector {
     userId: string,
     couponCode: string
   ): Observable<CustomerCoupon2Customer> {
-    return this.adapter.claimCustomerCoupon(userId, couponCode);
+    if (
+      this.featureConfigService.isEnabled(
+        'enableClaimCustomerCouponWithCodeInRequestBody'
+      )
+    ) {
+      return this.adapter.claimCustomerCouponWithCodeInBody(userId, couponCode);
+    } else {
+      return this.adapter.claimCustomerCoupon(userId, couponCode);
+    }
   }
 
   disclaimCustomerCoupon(
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index 96d8107b74d..88ea3fd8c2a 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/schematics",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Spartacus schematics",
   "keywords": [
     "spartacus",
@@ -21,14 +21,14 @@
     "@angular/ssr": "^18.2.9",
     "semver": "^7.5.2",
     "ts-morph": "^23.0.0",
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/core": "^18.2.9",
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/compiler": "^18.2.9",
     "@schematics/angular": "^18.2.9",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "parse5": "^7.2.1",
     "typescript": "^5.2.2"
   },
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 5a77e7abc0e..a81b1b5d4c6 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -19,12 +19,12 @@
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/compiler": "^18.2.9",
     "@schematics/angular": "^18.2.9",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "parse5": "^7.2.1",
     "typescript": "^5.2.2"
   },
   "ssr-tests": {
-    "@spartacus/core": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
     "http-proxy": "^1.18.1",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0"
@@ -41,12 +41,12 @@
     "@ngrx/effects": "^18.1.1",
     "@ngrx/router-store": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
     "ngx-infinite-scroll": "^18.0.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/styles": {
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.7.2",
     "@ng-select/ng-select": "^13.9.1",
     "bootstrap": "^4.6.2"
@@ -54,10 +54,10 @@
   "@spartacus/setup": {
     "@angular/core": "^18.2.9",
     "@angular/ssr": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1"
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/user": "2211.32.0"
   },
   "@spartacus/asm": {
     "@angular-devkit/schematics": "^18.2.9",
@@ -67,14 +67,14 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefinder": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefinder": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cart": {
@@ -86,11 +86,11 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -102,13 +102,13 @@
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -118,23 +118,23 @@
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/estimated-delivery-date": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/order": {
@@ -146,13 +146,13 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/pdf-invoices": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/pdf-invoices": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/organization": {
@@ -164,13 +164,13 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -179,10 +179,10 @@
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/pickup-in-store": {
@@ -193,14 +193,14 @@
     "@angular/router": "^18.2.9",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefinder": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefinder": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -209,10 +209,10 @@
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -225,13 +225,13 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/product-multi-dimensional": {
@@ -241,10 +241,10 @@
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -252,9 +252,9 @@
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -264,11 +264,11 @@
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -277,21 +277,21 @@
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/smartedit": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/storefinder": {
@@ -302,10 +302,10 @@
     "@angular/router": "^18.2.9",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -313,8 +313,8 @@
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/user": {
@@ -325,10 +325,10 @@
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdc": {
@@ -340,19 +340,19 @@
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/asm": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/organization": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/asm": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/organization": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdp": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/customer-ticketing": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/customer-ticketing": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cds": {
@@ -361,22 +361,22 @@
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/tracking": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/tracking": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cpq-quote": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/digital-payments": {
@@ -386,11 +386,11 @@
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/epd-visualization": {
@@ -400,11 +400,11 @@
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@sapui5/ts-types-esm": "1.120.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -414,9 +414,9 @@
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/opf": {
@@ -427,14 +427,14 @@
     "@angular/platform-browser": "^18.2.9",
     "@angular/router": "^18.2.9",
     "@ng-select/ng-select": "^13.9.1",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
-    "@spartacus/user": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
+    "@spartacus/user": "2211.32.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -443,9 +443,9 @@
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/s4-service": {
@@ -454,33 +454,33 @@
     "@angular/core": "^18.2.9",
     "@angular/forms": "^18.2.9",
     "@angular/router": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/checkout": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/order": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/checkout": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/order": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/s4om": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/cart": "2211.32.0-1",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/pdf-invoices": "2211.32.0-1",
-    "@spartacus/requested-delivery-date": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
-    "@spartacus/storefront": "2211.32.0-1",
-    "@spartacus/styles": "2211.32.0-1",
+    "@spartacus/cart": "2211.32.0",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/pdf-invoices": "2211.32.0",
+    "@spartacus/requested-delivery-date": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
+    "@spartacus/storefront": "2211.32.0",
+    "@spartacus/styles": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/segment-refs": {
     "@angular-devkit/schematics": "^18.2.9",
     "@angular/common": "^18.2.9",
     "@angular/core": "^18.2.9",
-    "@spartacus/core": "2211.32.0-1",
-    "@spartacus/schematics": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
+    "@spartacus/schematics": "2211.32.0",
     "rxjs": "^7.8.0"
   },
   "storefrontapp": {
@@ -496,7 +496,7 @@
     "@angular/router": "^18.2.9",
     "@angular/service-worker": "^18.2.9",
     "@angular/ssr": "^18.2.9",
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.7.2",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
@@ -516,7 +516,7 @@
     "i18next-resources-to-backend": "^1.2.0",
     "ngx-infinite-scroll": "^18.0.0",
     "rxjs": "^7.8.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.8.1",
     "zone.js": "0.14.10"
   }
 }
diff --git a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
index 01c83c08293..b75857a883d 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -55,17 +55,17 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@angular/router": "^18.2.0",
     "@angular/service-worker": "^18.2.9",
     "@angular/ssr": "^18.2.9",
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.7.2",
     "@ng-select/ng-select": "^13.9.1",
     "@ngrx/effects": "^18.1.1",
     "@ngrx/router-store": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/assets": "~2211.32.0-1",
-    "@spartacus/core": "~2211.32.0-1",
-    "@spartacus/setup": "~2211.32.0-1",
-    "@spartacus/storefront": "~2211.32.0-1",
-    "@spartacus/styles": "~2211.32.0-1",
+    "@spartacus/assets": "~2211.32.0",
+    "@spartacus/core": "~2211.32.0",
+    "@spartacus/setup": "~2211.32.0",
+    "@spartacus/storefront": "~2211.32.0",
+    "@spartacus/styles": "~2211.32.0",
     "angular-oauth2-oidc": "^17.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.18.2",
@@ -89,7 +89,7 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",
     "jasmine-core": "~5.2.0",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
diff --git a/projects/ssr-tests/package.json b/projects/ssr-tests/package.json
index 186f6742f89..a1d3c1edd03 100644
--- a/projects/ssr-tests/package.json
+++ b/projects/ssr-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssr-tests",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "private": true,
   "description": "Spartacus SSR Tests",
   "keywords": [
@@ -14,10 +14,10 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@spartacus/core": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
     "http-proxy": "^1.18.1",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0"
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/skip-focus-header-items-mobile.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/skip-focus-header-items-mobile.e2e.cy.ts
new file mode 100644
index 00000000000..1bf9bd0a4a9
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/skip-focus-header-items-mobile.e2e.cy.ts
@@ -0,0 +1,95 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { formats } from '../../sample-data/viewports';
+
+const mobileHeaderVisibleElements = [
+  'cx-banner a',
+  'button.search',
+  'cx-mini-cart a',
+];
+
+describe('Skipping elements from tab navigation in header', () => {
+  beforeEach(() => {
+    cy.viewport(formats.mobile.width, formats.mobile.height);
+    cy.visit('/');
+    // close the cookie banner
+    cy.get('button').contains('Allow All').click();
+  });
+
+  it('toggles elements tabindex', () => {
+    // when hamburger menu is closed
+    mobileHeaderVisibleElements.forEach((selector) => {
+      cy.get(selector).should('not.have.attr', 'tabIndex', '-1');
+    });
+
+    // open hamburger menu
+    cy.get('button.cx-hamburger').click();
+
+    // elements are hidden from tabbing
+    mobileHeaderVisibleElements.forEach((selector) => {
+      cy.get(selector).should('have.attr', 'tabIndex', '-1');
+    });
+
+    // close hamburger menu
+    cy.get('button.cx-hamburger').click();
+
+    // elements are available for tabbing again
+    mobileHeaderVisibleElements.forEach((selector) => {
+      cy.get(selector).should('not.have.attr', 'tabIndex', '-1');
+    });
+  });
+
+  it('persists tabbing sequence', () => {
+    // menu is closed
+    cy.get('button.cx-hamburger').focus();
+    cy.pressTab();
+    cy.focused().should('have.attr', 'aria-label', 'SAP Commerce');
+    cy.pressTab(true);
+
+    // open menu
+    cy.focused().click();
+    cy.get('button.cx-hamburger').focus();
+    cy.pressTab();
+    cy.focused().should('have.text', 'Sign In / Register');
+
+    // return to button and close the menu
+    cy.pressTab(true);
+    cy.focused().click();
+
+    // tab through header
+    cy.pressTab();
+    cy.focused().should('have.attr', 'aria-label', 'SAP Commerce');
+    cy.pressTab();
+    cy.focused().should('have.attr', 'title', 'Search');
+    cy.pressTab();
+    cy.focused().should(
+      'have.attr',
+      'aria-label',
+      '0 items currently in your cart'
+    );
+  });
+
+  it('restores header item tabbing after navigation', () => {
+    cy.get('button.cx-hamburger').click();
+    cy.pressTab(true);
+    cy.focused().click();
+
+    // elements are available for tabbing again
+    mobileHeaderVisibleElements.forEach((selector) => {
+      cy.get(selector).should('not.have.attr', 'tabIndex', '-1');
+    });
+
+    // tab through header in reverse order
+    cy.get('cx-mini-cart a').focus();
+    cy.pressTab(true);
+    cy.focused().should('have.attr', 'title', 'Search');
+    cy.pressTab(true);
+    cy.focused().should('have.attr', 'aria-label', 'SAP Commerce');
+    cy.pressTab(true);
+    cy.focused().should('have.class', 'cx-hamburger');
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer360-promotion.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer360-promotion.e2e.cy.ts
index b918d62194b..00f3b991672 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer360-promotion.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer360-promotion.e2e.cy.ts
@@ -111,7 +111,7 @@ context('Assisted Service Module', () => {
     it('should be able to sent customer coupon for customer coupon (CXSPA-3945)', () => {
       interceptPost(
         'claim_customer_coupon',
-        '/users/*/customercoupons/*/claim?*'
+        '/users/*/customercoupons/*/claim?*' //TODO check '/users/*/customercoupons/claim?*' instead when enable 'enableClaimCustomerCouponWithCodeInRequestBody' with the new Occ endpoint is available since Commerce 2211.28
       );
       cy.get('.cx-asm-customer-360-promotion-listing-row')
         .contains(customer_coupon.name)
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/user-registration/b2b-user-registration-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/user-registration/b2b-user-registration-e2e.cy.ts
index 8fa69ef853e..17ceb8a6d9d 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/user-registration/b2b-user-registration-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/user-registration/b2b-user-registration-e2e.cy.ts
@@ -81,9 +81,16 @@ context('B2B - User Registration', () => {
 
           fillOrganizationUserRegistrationForm(user);
           submitOrganizationUserRegistrationForm();
-          verifyGlobalMessageAfterRegistration(
-            'User with this e-mail address already exists.'
-          );
+
+          /*
+           * CXSPA-9183
+           * Leave below check commented until cx-server gets upgraded to 2211.32
+           * tbd after upgrade: POST orgUsers request should expect '201 created' response.
+           */
+
+          // verifyGlobalMessageAfterRegistration(
+          //   'User with this e-mail address already exists.'
+          // );
         });
       });
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
index 1cd94194a4b..f93adb0dda0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
@@ -61,9 +61,17 @@ context('Assisted Service Module', () => {
       cy.get('.cx-page-title').then((el) => {
         const orderNumber = el.text().match(/\d+/)[0];
         cy.log('--> End session');
+        // const homepage = waitForPage('homepage', 'getHomePage');
         cy.get('cx-customer-emulation')
           .findByText(/End Session/i)
           .click();
+        // Make sure homepage is visible
+        cy.wait(`@getHomePage`).its('response.statusCode').should('eq', 200);
+        cy.get('cx-global-message div').should(
+          'contain',
+          'You have successfully signed out.'
+        );
+        cy.wait(1000);
         asm.startCustomerEmulationWithOrderID(orderNumber, customer);
       });
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer360.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer360.e2e.cy.ts
index 1a6ea661457..8ba6eb7a173 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer360.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer360.e2e.cy.ts
@@ -290,7 +290,7 @@ context('Assisted Service Module', () => {
     it('should be able to sent customer coupon for customer coupon (CXSPA-3945)', () => {
       interceptPost(
         'claim_customer_coupon',
-        '/users/*/customercoupons/*/claim?*'
+        '/users/*/customercoupons/*/claim?*' //TODO check '/users/*/customercoupons/claim?*' instead when enable 'enableClaimCustomerCouponWithCodeInRequestBody' with the new Occ endpoint is available since Commerce 2211.28
       );
       cy.get('.cx-asm-customer-360-promotion-listing-row')
         .contains('Buy over $1000 get 20% off on cart')
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/coupons/my-coupons.e2e-spec-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/coupons/my-coupons.e2e-spec-flaky.cy.ts
index 31a0b38dada..04bb6e91a60 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/coupons/my-coupons.e2e-spec-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/coupons/my-coupons.e2e-spec-flaky.cy.ts
@@ -34,6 +34,16 @@ viewportContext(['mobile', 'desktop'], () => {
     });
   });
 
+  describe('My coupons - claim coupons with code in body using authenticated user', () => {
+    beforeEach(() => {
+      cy.window().then((win) => {
+        win.sessionStorage.clear();
+      });
+      cy.requireLoggedIn();
+    });
+    myCoupons.testClaimCustomerCouponWithCodeInBody();
+  });
+
   describe('My coupons - Authenticated user', () => {
     beforeEach(() => {
       cy.window().then((win) => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts
new file mode 100644
index 00000000000..3ba06a4027e
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/user_access/navigation-login-a11y.e2e.cy.ts
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as login from '../../../helpers/login';
+import { viewportContext } from '../../../helpers/viewport-context';
+
+function assertNavigationButtonsAttributes(buttonsSelector: string) {
+  cy.get(buttonsSelector).each(($btn) => {
+    const btnAriaControl = $btn.attr('aria-controls');
+    cy.wrap($btn)
+      .should('have.attr', 'title', `${btnAriaControl} Menu`)
+      .should('have.attr', 'aria-label', btnAriaControl);
+  });
+}
+
+describe('Navigation Login', () => {
+  let user;
+  viewportContext(['desktop'], () => {
+    before(() => {
+      cy.visit('/login');
+      user = login.registerUserFromLoginPage();
+    });
+
+    it('should login and logout successfully and have correct Navigation Menu buttons values', () => {
+      login.loginUser();
+
+      const tokenRevocationRequestAlias =
+        login.listenForTokenRevocationRequest();
+
+      cy.get('cx-login button')
+        .as('myAccountBtn')
+        .invoke('attr', 'ariaLabel')
+        .contains(`Hi, ${user.firstName} ${user.lastName}`);
+
+      const mainCategoryMenuBrandsRootBtnSelector =
+        'cx-category-navigation button[aria-controls]';
+      assertNavigationButtonsAttributes(mainCategoryMenuBrandsRootBtnSelector);
+
+      login.signOutUser();
+      cy.wait(tokenRevocationRequestAlias);
+      cy.get('@myAccountBtn').should('not.exist');
+      assertNavigationButtonsAttributes(mainCategoryMenuBrandsRootBtnSelector);
+    });
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/anonymous-consents.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/anonymous-consents.ts
index 4ac7ec08215..7e1fd5cc09a 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/anonymous-consents.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/anonymous-consents.ts
@@ -133,7 +133,7 @@ export function checkDialogClosed() {
 }
 
 export function closeAnonymousConsentsDialog() {
-  cy.get(`${ANONYMOUS_DIALOG} button.close`).click({ force: true });
+  cy.get(`${ANONYMOUS_DIALOG} button.close`).first().click({ force: true });
 }
 
 export function toggleAnonymousConsent(position) {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index b8c32c367df..433ea470c1b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -531,6 +531,7 @@ export function startCustomerEmulationWithOrderID(
   cy.get('cx-customer-selection form').within(() => {
     cy.get('[formcontrolname="searchOrder"]')
       .should('not.be.disabled')
+      .focus()
       .type(order);
     cy.get('[formcontrolname="searchOrder"]').should('have.value', `${order}`);
   });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/coupons/my-coupons.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/coupons/my-coupons.ts
index 2aa2e10210f..10c879ba601 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/coupons/my-coupons.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/coupons/my-coupons.ts
@@ -70,6 +70,14 @@ export function verifyClaimCouponSuccess(couponCode: string) {
   });
 }
 
+export function verifClaimCouponSuccessWithCodeInBody(couponCode: string) {
+  claimCouponWithCodeInBody(couponCode);
+  cy.location('pathname').should('contain', myCouponsUrl);
+  cy.get('.cx-coupon-card').within(() => {
+    cy.get('.cx-coupon-card-id').should('contain', couponCode);
+  });
+}
+
 export function verifyClaimCouponFail(couponCode: string) {
   claimCoupon(couponCode);
   cy.location('pathname').should('contain', myCouponsUrl);
@@ -78,6 +86,14 @@ export function verifyClaimCouponFail(couponCode: string) {
   });
 }
 
+export function verifyClaimCouponFailWithCodeInBody(couponCode: string) {
+  claimCouponWithCodeInBody(couponCode);
+  cy.location('pathname').should('contain', myCouponsUrl);
+  cy.get('.cx-coupon-card').within(() => {
+    cy.get('.cx-coupon-card-id').should('not.contain', couponCode);
+  });
+}
+
 export function goMyCoupon() {
   cy.visit('/my-account/coupons');
   cy.get('.cx-coupon-card').should('have.length', 3);
@@ -100,6 +116,7 @@ export function claimCoupon(couponCode: string) {
     'getClaimedCouponPage'
   );
 
+  //TODO when 'enableClaimCustomerCouponWithCodeInRequestBody' is true, call the mothod of 'waitForClaimCouponWithCodeInBody' instead once ClaimCustomerCouponWithCodeInBody works in the backend(available since Commerce 2211.28)
   const claimCoupon = waitForClaimCoupon(couponCode);
 
   const getCoupons = waitForGetCoupons();
@@ -115,6 +132,24 @@ export function claimCoupon(couponCode: string) {
   cy.wait(`@${getCoupons}`);
 }
 
+export function claimCouponWithCodeInBody(couponCode: string) {
+  const claimCoupon = waitForClaimCouponWithCodeInBody(couponCode);
+  const getCoupons = waitForGetCoupons();
+  const couponsPage = waitForPage(myCouponsUrl, 'getCouponsPage');
+  cy.visit(myCouponsUrl + '#' + couponCode);
+
+  verifyClaimDialog();
+  cy.wait(`@${claimCoupon}`);
+
+  cy.wait(`@${couponsPage}`);
+  cy.wait(`@${getCoupons}`);
+}
+
+export function verifyResetClaimCouponCode(couponCode: string) {
+  cy.visit(myCouponsUrl + '#' + couponCode);
+  verifyResetByClickButton(couponCode);
+}
+
 export function createStandardUser() {
   standardUser.registrationData.email = generateMail(randomString(), true);
   cy.requireLoggedIn(standardUser);
@@ -174,6 +209,24 @@ export function verifyReadMore() {
   cy.get('.cx-dialog-header span').click();
 }
 
+export function verifyClaimDialog() {
+  cy.get('cx-claim-dialog').should('exist');
+  cy.get('.cx-dialog-body .cx-dialog-row-submit-button .btn:first').click({
+    force: true,
+  });
+}
+
+export function verifyResetByClickButton(couponCode: string) {
+  cy.get('cx-claim-dialog').should('exist');
+  cy.get('.cx-dialog-body input').should('have.value', couponCode);
+  cy.get('[formcontrolname="couponCode"]').clear().type('resetTest');
+  cy.get('.cx-dialog-body input').should('have.value', 'resetTest');
+  cy.get('.cx-dialog-body .cx-dialog-row--reset-button .btn:first').click({
+    force: true,
+  });
+  cy.get('.cx-dialog-body input').should('have.value', couponCode);
+}
+
 export function verifyFindProduct(couponCode: string, productNumber: number) {
   const productSearchPage = waitForPage('search', 'getProductSearchPage');
 
@@ -214,6 +267,15 @@ export function waitForGetCoupons(): string {
   return `${aliasName}`;
 }
 
+export function waitForClaimCouponWithCodeInBody(couponCode: string): string {
+  const aliasName = `claimCouponInBody_${couponCode}`;
+  cy.intercept({
+    method: 'POST',
+    url: `${pageUrl}/users/current/customercoupons/claim*`,
+  }).as(aliasName);
+  return `${aliasName}`;
+}
+
 export function testClaimCustomerCoupon() {
   describe('Claim customer coupon', () => {
     it('should claim customer coupon successfully', () => {
@@ -227,3 +289,24 @@ export function testClaimCustomerCoupon() {
     });
   });
 }
+
+export function testClaimCustomerCouponWithCodeInBody() {
+  describe('Claim customer coupon with code in requestBody', () => {
+    //TODO uncomment when enable 'enableClaimCustomerCouponWithCodeInRequestBody' to make ClaimCustomerCouponWithCodeInBody work in the backend, the new Occ endpoint is available since Commerce 2211.28.
+    it.skip('should claim customer coupon successfully with code in requestBody', () => {
+      verifClaimCouponSuccessWithCodeInBody(validCouponCode);
+      cy.saveLocalStorage();
+    });
+
+    //TODO uncomment when enable 'enableClaimCustomerCouponWithCodeInRequestBody' to make ClaimCustomerCouponWithCodeInBody work in the backend, the new Occ endpoint is available since Commerce 2211.28.
+    it.skip('should not claim invalid customer coupon', () => {
+      cy.restoreLocalStorage();
+      verifyClaimCouponFailWithCodeInBody(invalidCouponCode);
+    });
+
+    it('should reset coupon code val after clicking reset button', () => {
+      cy.restoreLocalStorage();
+      verifyResetClaimCouponCode(validCouponCode);
+    });
+  });
+}
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 583a9d33c97..5de9b0a1893 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -317,6 +317,7 @@ if (environment.cpq) {
         a11yPreventHorizontalScroll: true,
         a11yReorderDialog: true,
         a11yPopoverFocus: true,
+        a11yPopoverHighContrast: true,
         a11yScheduleReplenishment: true,
         a11yScrollToTop: true,
         a11ySavedCartsZoom: true,
@@ -327,10 +328,12 @@ if (environment.cpq) {
         a11yOrganizationsBanner: true,
         a11yOrganizationListHeadingOrder: true,
         a11yCartImportConfirmationMessage: true,
+        a11yAnonymousConsentMessageInDialog: true,
         a11yReplenishmentOrderFieldset: true,
         a11yListOversizedFocus: true,
         a11yStoreFinderOverflow: true,
         a11yMobileFocusOnFirstNavigationItem: true,
+        a11yQuickOrderSearchListKeyboardNavigation: false,
         a11yCartSummaryHeadingOrder: true,
         a11ySearchBoxMobileFocus: true,
         a11yFacetKeyboardNavigation: true,
@@ -350,6 +353,7 @@ if (environment.cpq) {
         a11yVisibleFocusOverflows: true,
         a11yTruncatedTextForResponsiveView: true,
         a11yTruncatedTextStoreFinder: true,
+        a11yTruncatedTextUnitLevelOrderHistory: true,
         a11ySemanticPaginationLabel: true,
         a11yPreventCartItemsFormRedundantRecreation: true,
         a11yMyAccountLinkOutline: true,
@@ -366,16 +370,22 @@ if (environment.cpq) {
         a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields:
           true,
         a11yFacetsDialogFocusHandling: true,
+        a11yResetFocusAfterNavigating: true,
         headerLayoutForSmallerViewports: true,
         a11yStoreFinderAlerts: true,
-        a11yStoreFinderLabel: true,
         a11yFormErrorMuteIcon: true,
+        a11yStoreFinderLabel: true,
         a11yCxMessageFocus: true,
         occCartNameAndDescriptionInHttpRequestBody: true,
         a11yLinkBtnsToTertiaryBtns: true,
         a11yRepeatedPageTitleFix: true,
         a11yDeliveryModeRadiogroup: true,
-        a11yNgSelectOptionsCount: true,
+        /**
+         * Defaults to false cause ng-select options ariaLabels are working as expected
+         * since Spartacus 2211.33
+         * TODO: CXSPA-9005: Remove this flag and related code in next major release
+         */
+        a11yNgSelectOptionsCount: false,
         a11yNgSelectCloseDropdownOnEscape: true,
         a11yRepeatedCancelOrderError: true,
         a11yAddedToCartActiveDialog: true,
@@ -389,7 +399,7 @@ if (environment.cpq) {
         a11yAddToWishlistFocus: true,
         a11ySearchBoxFocusOnEscape: true,
         a11yUpdatingCartNoNarration: true,
-        a11yPasswordVisibilityBtnValueOverflow: true,
+        a11yPasswordVisibliltyBtnValueOverflow: true,
         a11yItemCounterFocus: true,
         a11yScrollToReviewByShowReview: true,
         a11yViewHoursButtonIconContrast: true,
@@ -397,6 +407,7 @@ if (environment.cpq) {
         a11yCheckoutStepsLandmarks: true,
         a11yQTY2Quantity: true,
         a11yImproveButtonsInCardComponent: true,
+        a11yMiniCartFocusOnMobile: true,
         a11yApprovalProcessWithNoClearable: true,
         a11yPostRegisterSuccessMessage: true,
         a11yDeleteButton2First: true,
@@ -406,19 +417,30 @@ if (environment.cpq) {
         a11yTextSpacingAdjustments: true,
         a11yTableHeaderReadout: true,
         a11ySearchboxAssistiveMessage: true,
+        updateConsentGivenInOnChanges: true,
         a11yDifferentiateFocusedAndSelected: true,
+        a11yQuickOrderSearchBoxRefocusOnClose: true,
+        a11yKeyboardFocusInSearchBox: true,
         a11yAddPaddingToCarouselPanel: true,
+        a11yFocusOnCardAfterSelecting: true,
+        a11ySearchableDropdownFirstElementFocus: true,
+        a11yHideConsentButtonWhenBannerVisible: true,
+        a11yRepeatingButtonsUniqueLabels: true,
+        a11yHighContrastBorders: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,
-        useSiteThemeService: false,
+        useSiteThemeService: true,
         enableConsecutiveCharactersPasswordRequirement: true,
         enablePasswordsCannotMatchInPasswordUpdateForm: true,
         allPageMetaResolversEnabledInCsr: true,
         a11yPdpGridArrangement: true,
+        a11yHamburgerMenuTrapFocus: true,
         useExtendedMediaComponentConfiguration: true,
-        a11yScrollToTopPositioning: true,
         showRealTimeStockInPDP: false,
+        a11yScrollToTopPositioning: false,
         a11yWrapReviewOrderInSection: true,
+        enableCarouselCategoryProducts: true,
         enableSecurePasswordValidation: true,
+        enableClaimCustomerCouponWithCodeInRequestBody: false,
       };
       return appFeatureToggles;
     }),
diff --git a/projects/storefrontlib/cms-components/anonymous-consent-management/anonymous-consent-management.module.ts b/projects/storefrontlib/cms-components/anonymous-consent-management/anonymous-consent-management.module.ts
index a3b0328671f..a25360aa618 100644
--- a/projects/storefrontlib/cms-components/anonymous-consent-management/anonymous-consent-management.module.ts
+++ b/projects/storefrontlib/cms-components/anonymous-consent-management/anonymous-consent-management.module.ts
@@ -9,6 +9,7 @@ import { NgModule } from '@angular/core';
 import {
   CmsConfig,
   DeferLoadingStrategy,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
 } from '@spartacus/core';
@@ -18,7 +19,12 @@ import { defaultAnonymousConsentLayoutConfig } from './default-anonymous-consent
 import { AnonymousConsentOpenDialogComponent } from './open-dialog/anonymous-consent-open-dialog.component';
 
 @NgModule({
-  imports: [CommonModule, I18nModule, KeyboardFocusModule],
+  imports: [
+    CommonModule,
+    I18nModule,
+    KeyboardFocusModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(defaultAnonymousConsentLayoutConfig),
     provideDefaultConfig(<CmsConfig>{
diff --git a/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.html b/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.html
index 76a16d0b45c..969c9b37e89 100644
--- a/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.html
+++ b/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.html
@@ -4,7 +4,7 @@
     class="anonymous-consent-banner"
   >
     <div class="container">
-      <div class="row">
+      <div class="row" *cxFeature="'!a11yHideConsentButtonWhenBannerVisible'">
         <div class="col-lg-7 col-xs-12">
           <div class="cx-banner-title">
             {{ 'anonymousConsents.banner.title' | cxTranslate }}
@@ -23,6 +23,25 @@
           </button>
         </div>
       </div>
+      <div class="row" *cxFeature="'a11yHideConsentButtonWhenBannerVisible'">
+        <div class="col-xl-7 col-lg-6 col-xs-12">
+          <div class="cx-banner-title">
+            {{ 'anonymousConsents.banner.title' | cxTranslate }}
+          </div>
+          <div class="cx-banner-description">
+            {{ 'anonymousConsents.banner.description' | cxTranslate }}
+          </div>
+        </div>
+
+        <div class="col-xl-5 col-lg-6 col-xs-12 cx-banner-buttons">
+          <button class="btn btn-secondary" (click)="viewDetails()">
+            {{ 'anonymousConsents.banner.consentManagement' | cxTranslate }}
+          </button>
+          <button class="btn btn-primary" (click)="allowAll()">
+            {{ 'anonymousConsents.banner.allowAll' | cxTranslate }}
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </ng-container>
diff --git a/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.ts b/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.ts
index e3267fb3ed3..e95e03bf9a8 100644
--- a/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.ts
+++ b/projects/storefrontlib/cms-components/anonymous-consent-management/banner/anonymous-consent-management-banner.component.ts
@@ -5,7 +5,7 @@
  */
 
 import { Component, OnDestroy, ViewContainerRef } from '@angular/core';
-import { AnonymousConsentsService } from '@spartacus/core';
+import { AnonymousConsentsService, useFeatureStyles } from '@spartacus/core';
 import { Observable, Subscription } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { LAUNCH_CALLER } from '../../../layout/launch-dialog/config/launch-config';
@@ -25,7 +25,9 @@ export class AnonymousConsentManagementBannerComponent implements OnDestroy {
     protected anonymousConsentsService: AnonymousConsentsService,
     protected vcr: ViewContainerRef,
     protected launchDialogService: LaunchDialogService
-  ) {}
+  ) {
+    useFeatureStyles('a11yScrollToTopPositioning');
+  }
 
   viewDetails(): void {
     this.hideBanner();
diff --git a/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.html b/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.html
index e1e481b3440..0de6c607987 100644
--- a/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.html
+++ b/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.html
@@ -1,3 +1,16 @@
-<button #open class="btn btn-link" (click)="openDialog()">
-  {{ 'anonymousConsents.dialog.title' | cxTranslate }}
-</button>
+<ng-container *cxFeature="'!a11yHideConsentButtonWhenBannerVisible'">
+  <button #open class="btn btn-link" (click)="openDialog()">
+    {{ 'anonymousConsents.dialog.title' | cxTranslate }}
+  </button>
+</ng-container>
+
+<ng-container *cxFeature="'a11yHideConsentButtonWhenBannerVisible'">
+  <button
+    *ngIf="!(bannerVisible$ | async)"
+    #open
+    class="btn btn-link"
+    (click)="openDialog()"
+  >
+    {{ 'anonymousConsents.dialog.title' | cxTranslate }}
+  </button>
+</ng-container>
diff --git a/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.spec.ts b/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.spec.ts
index c484a559268..58aada72e6b 100644
--- a/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.spec.ts
+++ b/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.spec.ts
@@ -1,10 +1,27 @@
 import { ElementRef, ViewContainerRef } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { I18nTestingModule } from '@spartacus/core';
-import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
-import { EMPTY } from 'rxjs';
+import {
+  AnonymousConsentsService,
+  ConsentTemplate,
+  I18nTestingModule,
+} from '@spartacus/core';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
+import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
+import { EMPTY, Observable, of } from 'rxjs';
 import { AnonymousConsentOpenDialogComponent } from './anonymous-consent-open-dialog.component';
 
+class MockAnonymousConsentsService {
+  isBannerVisible(): Observable<boolean> {
+    return EMPTY;
+  }
+  giveAllConsents(): Observable<ConsentTemplate[]> {
+    return EMPTY;
+  }
+  getTemplatesUpdated(): Observable<boolean> {
+    return EMPTY;
+  }
+  toggleBannerDismissed(_dismissed: boolean): void {}
+}
 class MockLaunchDialogService implements Partial<LaunchDialogService> {
   openDialog(
     _caller: LAUNCH_CALLER,
@@ -23,8 +40,12 @@ describe('AnonymousConsentOpenDialogComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [I18nTestingModule],
-      declarations: [AnonymousConsentOpenDialogComponent],
+      declarations: [AnonymousConsentOpenDialogComponent, MockFeatureDirective],
       providers: [
+        {
+          provide: AnonymousConsentsService,
+          useClass: MockAnonymousConsentsService,
+        },
         {
           provide: LaunchDialogService,
           useClass: MockLaunchDialogService,
@@ -45,15 +66,35 @@ describe('AnonymousConsentOpenDialogComponent', () => {
   });
 
   describe('openDialog', () => {
-    it('should call modalService.open', () => {
-      spyOn(launchDialogService, 'openDialog');
-      component.openDialog();
-
-      expect(launchDialogService.openDialog).toHaveBeenCalledWith(
-        LAUNCH_CALLER.ANONYMOUS_CONSENT,
-        component.openElement,
-        component['vcr']
-      );
+    it('should not show the button if the banner is visible', () => {
+      component.bannerVisible$ = of(true);
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        const button =
+          fixture.debugElement.nativeElement.querySelector('button');
+        expect(button).toBeNull();
+      });
     });
+
+    it('should show the button and open the dialog if the banner is not visible', waitForAsync(() => {
+      component.bannerVisible$ = of(false);
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        const button =
+          fixture.debugElement.nativeElement.querySelector('button');
+        expect(button).not.toBeNull();
+
+        spyOn(launchDialogService, 'openDialog');
+        button.click();
+
+        expect(launchDialogService.openDialog).toHaveBeenCalledWith(
+          LAUNCH_CALLER.ANONYMOUS_CONSENT,
+          component.openElement,
+          component['vcr']
+        );
+      });
+    }));
   });
 });
diff --git a/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.ts b/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.ts
index b4e78f6991a..b407739a5fc 100644
--- a/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.ts
+++ b/projects/storefrontlib/cms-components/anonymous-consent-management/open-dialog/anonymous-consent-open-dialog.component.ts
@@ -10,9 +10,11 @@ import {
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
-import { LaunchDialogService } from '../../../layout/launch-dialog/services/launch-dialog.service';
-import { LAUNCH_CALLER } from '../../../layout/launch-dialog/config/launch-config';
+import { AnonymousConsentsService, useFeatureStyles } from '@spartacus/core';
+import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
+import { LAUNCH_CALLER } from '../../../layout/launch-dialog/config/launch-config';
+import { LaunchDialogService } from '../../../layout/launch-dialog/services/launch-dialog.service';
 
 @Component({
   selector: 'cx-anonymous-consent-open-dialog',
@@ -20,11 +22,16 @@ import { take } from 'rxjs/operators';
 })
 export class AnonymousConsentOpenDialogComponent {
   @ViewChild('open') openElement: ElementRef;
+  bannerVisible$: Observable<boolean> =
+    this.anonymousConsentsService.isBannerVisible();
 
   constructor(
     protected vcr: ViewContainerRef,
+    protected anonymousConsentsService: AnonymousConsentsService,
     protected launchDialogService: LaunchDialogService
-  ) {}
+  ) {
+    useFeatureStyles('a11yHideConsentButtonWhenBannerVisible');
+  }
 
   openDialog(): void {
     const dialog = this.launchDialogService.openDialog(
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts
index 977a181318f..a981a4e62b9 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts
@@ -4,11 +4,18 @@ import { By } from '@angular/platform-browser';
 import {
   ANONYMOUS_CONSENT_STATUS,
   ConsentTemplate,
+  FeatureConfigService,
   I18nTestingModule,
 } from '@spartacus/core';
 import { ConsentManagementFormComponent } from './consent-management-form.component';
 import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 
+class MockFeatureConfigService {
+  isEnabled(): boolean {
+    return true;
+  }
+}
+
 describe('ConsentManagementFormComponent', () => {
   let component: ConsentManagementFormComponent;
   let fixture: ComponentFixture<ConsentManagementFormComponent>;
@@ -18,6 +25,9 @@ describe('ConsentManagementFormComponent', () => {
     TestBed.configureTestingModule({
       imports: [I18nTestingModule],
       declarations: [ConsentManagementFormComponent, MockFeatureDirective],
+      providers: [
+        { provide: FeatureConfigService, useClass: MockFeatureConfigService },
+      ],
     }).compileComponents();
   }));
 
@@ -120,7 +130,6 @@ describe('ConsentManagementFormComponent', () => {
 
         component.consentTemplate = mockConsentTemplate;
         component.consentGiven = true;
-        component.ngOnInit();
         fixture.detectChanges();
 
         const checkbox = el.query(By.css('input')).nativeElement as HTMLElement;
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.ts
index 0c48aab9691..3a641b778d4 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.ts
@@ -4,18 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  inject,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import {
   AnonymousConsent,
   ANONYMOUS_CONSENT_STATUS,
   ConsentTemplate,
+  FeatureConfigService,
 } from '@spartacus/core';
 
 @Component({
   selector: 'cx-consent-management-form',
   templateUrl: './consent-management-form.component.html',
 })
-export class ConsentManagementFormComponent implements OnInit {
+export class ConsentManagementFormComponent implements OnInit, OnChanges {
   consentGiven = false;
 
   @Input()
@@ -35,23 +45,24 @@ export class ConsentManagementFormComponent implements OnInit {
     template: ConsentTemplate;
   }>();
 
+  private featureConfigService = inject(FeatureConfigService, {
+    optional: true,
+  });
+
   constructor() {
     // Intentional empty constructor
   }
 
   ngOnInit(): void {
-    if (this.consent) {
-      this.consentGiven = Boolean(
-        this.consent.consentState === ANONYMOUS_CONSENT_STATUS.GIVEN
-      );
-    } else {
-      if (this.consentTemplate && this.consentTemplate.currentConsent) {
-        if (this.consentTemplate.currentConsent.consentWithdrawnDate) {
-          this.consentGiven = false;
-        } else if (this.consentTemplate.currentConsent.consentGivenDate) {
-          this.consentGiven = true;
-        }
-      }
+    this.updateConsentGiven();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (
+      this.featureConfigService?.isEnabled('updateConsentGivenInOnChanges') &&
+      (changes.consent || changes.consentTemplate)
+    ) {
+      this.updateConsentGiven();
     }
   }
 
@@ -67,4 +78,20 @@ export class ConsentManagementFormComponent implements OnInit {
   isRequired(templateId: string | undefined): boolean {
     return templateId ? this.requiredConsents.includes(templateId) : false;
   }
+
+  protected updateConsentGiven(): void {
+    if (this.consent) {
+      this.consentGiven = Boolean(
+        this.consent.consentState === ANONYMOUS_CONSENT_STATUS.GIVEN
+      );
+    } else {
+      if (this.consentTemplate && this.consentTemplate.currentConsent) {
+        if (this.consentTemplate.currentConsent.consentWithdrawnDate) {
+          this.consentGiven = false;
+        } else if (this.consentTemplate.currentConsent.consentGivenDate) {
+          this.consentGiven = true;
+        }
+      }
+    }
+  }
 }
diff --git a/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-consent-management/components/consent-form/my-account-v2-consent-management-form.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-consent-management/components/consent-form/my-account-v2-consent-management-form.component.spec.ts
index 89db9b79c7e..2f80f227892 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-consent-management/components/consent-form/my-account-v2-consent-management-form.component.spec.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-account-v2/my-account-v2-consent-management/components/consent-form/my-account-v2-consent-management-form.component.spec.ts
@@ -4,10 +4,17 @@ import { By } from '@angular/platform-browser';
 import {
   ANONYMOUS_CONSENT_STATUS,
   ConsentTemplate,
+  FeatureConfigService,
   I18nTestingModule,
 } from '@spartacus/core';
 import { MyAccountV2ConsentManagementFormComponent } from './my-account-v2-consent-management-form.component';
 
+class MockFeatureConfigService {
+  isEnabled(): boolean {
+    return true;
+  }
+}
+
 describe('MyAccountV2ConsentManagementFormComponent', () => {
   let component: MyAccountV2ConsentManagementFormComponent;
   let fixture: ComponentFixture<MyAccountV2ConsentManagementFormComponent>;
@@ -17,6 +24,12 @@ describe('MyAccountV2ConsentManagementFormComponent', () => {
     TestBed.configureTestingModule({
       imports: [I18nTestingModule],
       declarations: [MyAccountV2ConsentManagementFormComponent],
+      providers: [
+        {
+          provide: FeatureConfigService,
+          useClass: MockFeatureConfigService,
+        },
+      ],
     }).compileComponents();
   }));
 
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.html b/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.html
new file mode 100644
index 00000000000..50f862e20d0
--- /dev/null
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.html
@@ -0,0 +1,86 @@
+<div
+  class="cx-coupon-dialog"
+  role="dialog"
+  [cxFocus]="focusConfig"
+  (esc)="close('Escape clicked')"
+  aria-labelledby="dialogTitle"
+>
+  <div class="cx-coupon-container">
+    <!-- Modal Header -->
+
+    <div class="cx-dialog-header modal-header">
+      <h3 id="dialogTitle" class="cx-dialog-title modal-title">
+        {{ 'myCoupons.claimCoupondialogTitle' | cxTranslate }}
+      </h3>
+      <button
+        type="button"
+        class="close"
+        title="{{ 'common.close' | cxTranslate }}"
+        [attr.aria-label]="'common.close' | cxTranslate"
+        (click)="close('Cross click')"
+      >
+        <span aria-hidden="true">
+          <cx-icon [type]="iconTypes.CLOSE"></cx-icon>
+        </span>
+      </button>
+    </div>
+    <!-- Modal Body -->
+    <div class="cx-dialog-body modal-body">
+      <form (ngSubmit)="onSubmit()" [formGroup]="form" class="cx-dialog-item">
+        <label>
+          <span class="label-content"
+            >{{ 'myCoupons.claimCouponCode.label' | cxTranslate }}
+            <ng-template [ngTemplateOutlet]="requiredAsterisk"></ng-template
+          ></span>
+          <input
+            required="true"
+            type="text"
+            name="couponCode"
+            formControlName="couponCode"
+            placeholder="{{
+              'myCoupons.claimCouponCode.placeholder' | cxTranslate
+            }}"
+            class="form-control"
+            [attr.aria-describedby]="'couponCodeError'"
+          />
+          <cx-form-errors
+            id="couponCodeError"
+            aria-live="off"
+            [translationParams]="{
+              label: 'myCoupons.claimCouponCode.label' | cxTranslate,
+            }"
+            [control]="form.get('couponCode')"
+          ></cx-form-errors>
+        </label>
+        <div class="cx-dialog-row">
+          <div class="col-md-6 cx-dialog-row--reset-button">
+            <a
+              role="button"
+              class="btn btn-block btn-secondary"
+              (click)="cancelEdit()"
+            >
+              {{ 'myCoupons.reset' | cxTranslate }}
+            </a>
+          </div>
+          <div class="col-md-6 cx-dialog-row-submit-button">
+            <button
+              class="btn btn-block btn-primary"
+              [disabled]="form.disabled"
+            >
+              {{ 'myCoupons.claim' | cxTranslate }}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<ng-template #requiredAsterisk>
+  <abbr
+    aria-hidden="true"
+    class="text-decoration-none"
+    title="{{ 'common.required' | cxTranslate }}"
+    >*</abbr
+  >
+</ng-template>
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.spec.ts
new file mode 100644
index 00000000000..8482dbe984c
--- /dev/null
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.spec.ts
@@ -0,0 +1,160 @@
+import { Component, Input } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { I18nTestingModule } from '@spartacus/core';
+import {
+  RoutingService,
+  CustomerCouponService,
+  GlobalMessageService,
+  GlobalMessageType,
+} from '@spartacus/core';
+import {
+  ReactiveFormsModule,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import { FocusDirective, FormErrorsModule } 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 { ClaimDialogComponent } from './claim-dialog.component';
+
+const mockCoupon: string = 'testCode';
+const form = new FormGroup({
+  couponCode: new FormControl('', [Validators.required]),
+});
+
+@Component({
+  selector: 'cx-icon',
+  template: '',
+})
+class MockCxIconComponent {
+  @Input() type: ICON_TYPE;
+}
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  get data$(): Observable<any> {
+    return of({ coupon: 'testCode', pageSize: 10 });
+  }
+
+  closeDialog(_reason: string): void {}
+}
+
+describe('ClaimDialogComponent', () => {
+  let component: ClaimDialogComponent;
+  let fixture: ComponentFixture<ClaimDialogComponent>;
+  let launchDialogService: LaunchDialogService;
+
+  const couponService = jasmine.createSpyObj('CustomerCouponService', [
+    'claimCustomerCoupon',
+    'getClaimCustomerCouponResultSuccess',
+    'loadCustomerCoupons',
+  ]);
+  const routingService = jasmine.createSpyObj('RoutingService', ['go']);
+  const globalMessageService = jasmine.createSpyObj('GlobalMessageService', [
+    'add',
+  ]);
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        ClaimDialogComponent,
+        MockCxIconComponent,
+        FocusDirective,
+        MockFeatureDirective,
+      ],
+      imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule],
+      providers: [
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: CustomerCouponService, useValue: couponService },
+        { provide: RoutingService, useValue: routingService },
+        { provide: GlobalMessageService, useValue: globalMessageService },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ClaimDialogComponent);
+    component = fixture.componentInstance;
+    launchDialogService = TestBed.inject(LaunchDialogService);
+    component.couponCode = mockCoupon;
+    component.form = form;
+  });
+
+  it('should create', () => {
+    fixture.detectChanges();
+    expect(component).toBeTruthy();
+  });
+
+  it('should be able to show claim customer coupon dialog', () => {
+    fixture.detectChanges();
+    const dialogTitle = fixture.debugElement.query(By.css('.cx-dialog-title'))
+      .nativeElement.textContent;
+    expect(dialogTitle).toContain('myCoupons.claimCoupondialogTitle');
+
+    const closeBtn = fixture.debugElement.query(By.css('button'));
+    expect(closeBtn).toBeTruthy();
+
+    const couponLabel = fixture.debugElement.query(
+      By.css('.cx-dialog-body .label-content')
+    ).nativeElement.textContent;
+    expect(couponLabel).toContain('myCoupons.claimCouponCode.label');
+  });
+
+  it('should be able to close dialog', () => {
+    spyOn(launchDialogService, 'closeDialog').and.stub();
+    fixture.detectChanges();
+    const closeBtn = fixture.debugElement.query(By.css('button'));
+    closeBtn.nativeElement.click();
+    expect(launchDialogService.closeDialog).toHaveBeenCalled();
+  });
+
+  describe('Form Interactions', () => {
+    it('should reset the coupon code after click reset button', () => {
+      component.ngOnInit();
+      expect(component.couponCode).toBe(mockCoupon);
+
+      (form.get('couponCode') as FormControl).setValue('testcodechanged');
+
+      component.cancelEdit();
+      fixture.detectChanges();
+      expect((form.get('couponCode') as FormControl).value).toBe(mockCoupon);
+    });
+
+    it('should succeed on submit', () => {
+      (form.get('couponCode') as FormControl).setValue(mockCoupon);
+      fixture.detectChanges();
+      couponService.claimCustomerCoupon.and.stub();
+      couponService.loadCustomerCoupons.and.stub();
+      couponService.getClaimCustomerCouponResultSuccess.and.returnValue(
+        of(true)
+      );
+      routingService.go.and.stub();
+      globalMessageService.add.and.stub();
+      component.onSubmit();
+
+      expect(globalMessageService.add).toHaveBeenCalledWith(
+        { key: 'myCoupons.claimCustomerCoupon' },
+        GlobalMessageType.MSG_TYPE_CONFIRMATION
+      );
+      expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'coupons' });
+      expect(couponService.claimCustomerCoupon).toHaveBeenCalledTimes(1);
+      expect(couponService.loadCustomerCoupons).toHaveBeenCalledTimes(1);
+    });
+
+    it('should fail on submit', () => {
+      (form.get('couponCode') as FormControl).setValue(mockCoupon);
+      fixture.detectChanges();
+      couponService.claimCustomerCoupon.and.stub();
+      couponService.loadCustomerCoupons.and.stub();
+      couponService.getClaimCustomerCouponResultSuccess.and.returnValue(
+        of(false)
+      );
+      routingService.go.and.stub();
+      globalMessageService.add.and.stub();
+      component.onSubmit();
+      expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'coupons' });
+    });
+  });
+});
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.ts
new file mode 100644
index 00000000000..06b512fa678
--- /dev/null
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/claim-dialog/claim-dialog.component.ts
@@ -0,0 +1,104 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+  inject,
+} from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+
+import { Subscription } from 'rxjs';
+import {
+  RoutingService,
+  CustomerCouponService,
+  GlobalMessageService,
+  GlobalMessageType,
+} from '@spartacus/core';
+import { FocusConfig, LaunchDialogService } from '../../../../layout/index';
+import { ICON_TYPE } from '../../../../cms-components/misc/icon/index';
+
+@Component({
+  selector: 'cx-claim-dialog',
+  templateUrl: './claim-dialog.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ClaimDialogComponent implements OnDestroy, OnInit {
+  private subscription = new Subscription();
+  iconTypes = ICON_TYPE;
+  protected pageSize = 10;
+  couponCode: string;
+
+  focusConfig: FocusConfig = {
+    trap: true,
+    block: true,
+    autofocus: 'button',
+    focusOnEscape: true,
+  };
+
+  form: FormGroup = new FormGroup({
+    couponCode: new FormControl('', [Validators.required]),
+  });
+
+  protected couponService = inject(CustomerCouponService);
+  protected routingService = inject(RoutingService);
+  protected messageService = inject(GlobalMessageService);
+  protected launchDialogService = inject(LaunchDialogService);
+
+  ngOnInit(): void {
+    this.subscription.add(
+      this.launchDialogService.data$.subscribe((data) => {
+        if (data) {
+          this.couponCode = data.coupon;
+          this.pageSize = data.pageSize;
+          (this.form.get('couponCode') as FormControl).setValue(
+            this.couponCode
+          );
+        }
+      })
+    );
+  }
+
+  onSubmit(): void {
+    if (!this.form.valid) {
+      this.form.markAllAsTouched();
+      return;
+    }
+    const couponVal = (this.form.get('couponCode') as FormControl).value;
+    if (couponVal) {
+      this.couponService.claimCustomerCoupon(couponVal);
+      this.subscription = this.couponService
+        .getClaimCustomerCouponResultSuccess()
+        .subscribe((success) => {
+          if (success) {
+            this.messageService.add(
+              { key: 'myCoupons.claimCustomerCoupon' },
+              GlobalMessageType.MSG_TYPE_CONFIRMATION
+            );
+          }
+          this.routingService.go({ cxRoute: 'coupons' });
+          this.couponService.loadCustomerCoupons(this.pageSize);
+          this.close('Cross click');
+        });
+    } else {
+      this.routingService.go({ cxRoute: 'notFound' });
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subscription?.unsubscribe();
+  }
+
+  close(reason?: any): void {
+    this.launchDialogService.closeDialog(reason);
+  }
+
+  cancelEdit(): void {
+    (this.form.get('couponCode') as FormControl).setValue(this.couponCode);
+  }
+}
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/default-coupon-card-layout.config.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/default-coupon-card-layout.config.ts
index 54ebc3b1e42..27fd40a1745 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/default-coupon-card-layout.config.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/default-coupon-card-layout.config.ts
@@ -6,6 +6,7 @@
 
 import { DIALOG_TYPE, LayoutConfig } from '../../../layout/index';
 import { CouponDialogComponent } from './coupon-card/coupon-dialog/coupon-dialog.component';
+import { ClaimDialogComponent } from './claim-dialog/claim-dialog.component';
 
 export const defaultCouponLayoutConfig: LayoutConfig = {
   launch: {
@@ -14,5 +15,10 @@ export const defaultCouponLayoutConfig: LayoutConfig = {
       component: CouponDialogComponent,
       dialogType: DIALOG_TYPE.DIALOG,
     },
+    CLAIM_DIALOG: {
+      inlineRoot: true,
+      component: ClaimDialogComponent,
+      dialogType: DIALOG_TYPE.DIALOG,
+    },
   },
 };
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/index.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/index.ts
index f27097e47b5..a7dccda60b2 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/index.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/index.ts
@@ -8,5 +8,6 @@ export * from './my-coupons.component';
 export * from './my-coupons.module';
 export * from './coupon-card/coupon-card.component';
 export * from './coupon-card/coupon-dialog/coupon-dialog.component';
+export * from './claim-dialog/claim-dialog.component';
 export * from './coupon-claim/coupon-claim.component';
 export * from './my-coupons.component.service';
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.spec.ts
index 254c72ab32d..97bdc497f94 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.spec.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.spec.ts
@@ -2,6 +2,7 @@ import {
   Component,
   DebugElement,
   EventEmitter,
+  ElementRef,
   Input,
   Output,
 } from '@angular/core';
@@ -14,8 +15,9 @@ import {
   FeaturesConfig,
   I18nTestingModule,
 } from '@spartacus/core';
+import { LAUNCH_CALLER, LaunchDialogService } from '../../../layout/index';
 import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
-import { BehaviorSubject, Observable, of } from 'rxjs';
+import { BehaviorSubject, EMPTY, Observable, of } from 'rxjs';
 import { SpinnerModule } from '../../../shared/components/spinner/spinner.module';
 import { ICON_TYPE } from '../../misc/icon/icon.model';
 import { MyCouponsComponent } from './my-coupons.component';
@@ -142,10 +144,17 @@ class MockSortingComponent {
   @Output() sortListEvent = new EventEmitter<string>();
 }
 
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  openDialogAndSubscribe(_caller: LAUNCH_CALLER, _openElement?: ElementRef) {
+    return EMPTY;
+  }
+}
+
 describe('MyCouponsComponent', () => {
   let component: MyCouponsComponent;
   let fixture: ComponentFixture<MyCouponsComponent>;
   let el: DebugElement;
+  let launchDialogService: LaunchDialogService;
 
   const customerCouponService = jasmine.createSpyObj('CustomerCouponService', [
     'getCustomerCoupons',
@@ -182,6 +191,7 @@ describe('MyCouponsComponent', () => {
           provide: MyCouponsComponentService,
           useValue: myCouponsComponentService,
         },
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         {
           provide: FeaturesConfig,
           useValue: {
@@ -196,6 +206,7 @@ describe('MyCouponsComponent', () => {
     fixture = TestBed.createComponent(MyCouponsComponent);
     component = fixture.componentInstance;
     el = fixture.debugElement;
+    launchDialogService = TestBed.inject(LaunchDialogService);
 
     customerCouponService.getCustomerCoupons.and.returnValue(
       of(emptyCouponResult)
@@ -317,4 +328,12 @@ describe('MyCouponsComponent', () => {
       PAGE_SIZE
     );
   });
+
+  it('should be able to open coupon claim dialog if has hash str in location', () => {
+    spyOn(component, 'getHashStr').and.returnValue(String('#testcode'));
+    component.ngOnInit();
+    spyOn(launchDialogService, 'openDialogAndSubscribe').and.stub();
+    fixture.detectChanges();
+    expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
+  });
 });
diff --git a/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.ts b/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.ts
index 8b2fda253c6..4971f3ad48c 100644
--- a/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.ts
+++ b/projects/storefrontlib/cms-components/myaccount/my-coupons/my-coupons.component.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, inject, OnDestroy, OnInit } from '@angular/core';
 import {
   CustomerCouponSearchResult,
   CustomerCouponService,
@@ -13,6 +13,7 @@ import {
 import { combineLatest, Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 import { ICON_TYPE } from '../../misc/icon/icon.model';
+import { LaunchDialogService, LAUNCH_CALLER } from '../../../layout/index';
 import { MyCouponsComponentService } from './my-coupons.component.service';
 
 @Component({
@@ -64,6 +65,8 @@ export class MyCouponsComponent implements OnInit, OnDestroy {
     byEndDateDesc: string;
   }>;
 
+  protected launchDialogService = inject(LaunchDialogService);
+
   constructor(
     protected couponService: CustomerCouponService,
     protected myCouponsComponentService: MyCouponsComponentService
@@ -107,6 +110,23 @@ export class MyCouponsComponent implements OnInit, OnDestroy {
           this.subscriptionFail(error);
         })
     );
+
+    const resultStr = decodeURIComponent(this.getHashStr());
+    const index = resultStr.indexOf('#');
+    if (index !== -1) {
+      const couponCode = resultStr.substring(index + 1);
+      if (couponCode !== undefined && couponCode.length > 0) {
+        this.launchDialogService.openDialogAndSubscribe(
+          LAUNCH_CALLER.CLAIM_DIALOG,
+          undefined,
+          { coupon: couponCode, pageSize: this.PAGE_SIZE }
+        );
+      }
+    }
+  }
+
+  getHashStr() {
+    return location.hash;
   }
 
   private subscriptionFail(error: boolean) {
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 7224e1f2c41..80f58e967d5 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
@@ -7,6 +7,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+import { ReactiveFormsModule } from '@angular/forms';
 import {
   AuthGuard,
   CmsConfig,
@@ -21,16 +22,20 @@ 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 { FormErrorsModule } from '../../../shared/components/form/form-errors';
 import { IconModule } from '../../misc/icon/icon.module';
 import { CouponCardComponent } from './coupon-card/coupon-card.component';
 import { CouponDialogComponent } from './coupon-card/coupon-dialog/coupon-dialog.component';
 import { CouponClaimComponent } from './coupon-claim/coupon-claim.component';
+import { ClaimDialogComponent } from './claim-dialog/claim-dialog.component';
 import { defaultCouponLayoutConfig } from './default-coupon-card-layout.config';
 import { MyCouponsComponent } from './my-coupons.component';
 
 @NgModule({
   imports: [
     CommonModule,
+    ReactiveFormsModule,
+    FormErrorsModule,
     CardModule,
     SpinnerModule,
     I18nModule,
@@ -55,6 +60,7 @@ import { MyCouponsComponent } from './my-coupons.component';
     CouponCardComponent,
     CouponDialogComponent,
     CouponClaimComponent,
+    ClaimDialogComponent,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
@@ -67,10 +73,14 @@ import { MyCouponsComponent } from './my-coupons.component';
           component: CouponClaimComponent,
           guards: [AuthGuard],
         },
+        ClaimDialogComponent: {
+          component: ClaimDialogComponent,
+          guards: [AuthGuard],
+        },
       },
     }),
     provideDefaultConfig(defaultCouponLayoutConfig),
   ],
-  exports: [MyCouponsComponent, CouponClaimComponent],
+  exports: [MyCouponsComponent, CouponClaimComponent, ClaimDialogComponent],
 })
 export class MyCouponsModule {}
diff --git a/projects/storefrontlib/cms-components/navigation/breadcrumb/breadcrumb.component.html b/projects/storefrontlib/cms-components/navigation/breadcrumb/breadcrumb.component.html
index 39ad7ed124a..507bc0dea02 100644
--- a/projects/storefrontlib/cms-components/navigation/breadcrumb/breadcrumb.component.html
+++ b/projects/storefrontlib/cms-components/navigation/breadcrumb/breadcrumb.component.html
@@ -1,7 +1,17 @@
 <nav [attr.aria-label]="'common.breadcrumbs' | cxTranslate" tabindex="-1">
   <ol [attr.aria-label]="'common.breadcrumbs' | cxTranslate">
-    <li *ngFor="let crumb of crumbs$ | async">
-      <a [routerLink]="crumb.link" [innerHTML]="crumb.label"></a>
+    <li *ngFor="let crumb of crumbs$ | async; let last = last">
+      <a
+        [routerLink]="crumb.link"
+        [innerHTML]="crumb.label"
+        [attr.aria-label]="
+          last
+            ? ('common.breadcrumbsCurrentPage' | cxTranslate) +
+              ' ' +
+              crumb.label
+            : crumb.label
+        "
+      ></a>
     </li>
   </ol>
 </nav>
diff --git a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
index 89ea959fa34..f2b0f989db2 100644
--- a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
+++ b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
@@ -90,6 +90,9 @@
             [attr.aria-haspopup]="true"
             [attr.aria-expanded]="false"
             [attr.aria-label]="node.title"
+            [attr.title]="
+              'navigation.menuButonTitle' | cxTranslate: { title: node.title }
+            "
             (click)="toggleOpen($any($event))"
             (mouseenter)="onMouseEnter($event)"
             (keydown.space)="toggleOpen($any($event))"
@@ -108,7 +111,10 @@
             [attr.aria-haspopup]="true"
             [attr.aria-expanded]="false"
             [attr.aria-controls]="node.title"
-            [attr.aria-describedby]="'greeting'"
+            [attr.aria-label]="node.title"
+            [attr.title]="
+              'navigation.menuButonTitle' | cxTranslate: { title: node.title }
+            "
             (click)="toggleOpen($any($event))"
             (mouseenter)="onMouseEnter($event)"
             (keydown.space)="onSpace($any($event))"
diff --git a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.spec.ts b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.spec.ts
index a4cfe925b56..d450979a444 100644
--- a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.spec.ts
+++ b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.spec.ts
@@ -462,4 +462,29 @@ describe('Navigation UI Component', () => {
       expect(mockHeader.focus).toHaveBeenCalled();
     }));
   });
+
+  describe('trigger buttions ariaLabel/title', () => {
+    it('should have the ariaLabel and title set', () => {
+      const rootNode = mockNode.children?.[0];
+      const childNode = rootNode?.children?.[0];
+      const rootTitle = rootNode?.title;
+      const childTitle = childNode?.title;
+      fixture.detectChanges();
+      const nestedTriggerButton = fixture.debugElement.query(
+        By.css(`button[aria-label="${childTitle}"]`)
+      ).nativeElement;
+      const rootTriggerButton = fixture.debugElement.query(
+        By.css(`button[aria-label="${rootTitle}"]`)
+      ).nativeElement;
+
+      expect(nestedTriggerButton).toBeDefined();
+      expect(rootTriggerButton).toBeDefined();
+      expect(rootTriggerButton.getAttribute('title')).toEqual(
+        `navigation.menuButonTitle title:${rootTitle}`
+      );
+      expect(nestedTriggerButton.getAttribute('title')).toEqual(
+        `navigation.menuButonTitle title:${childTitle}`
+      );
+    });
+  });
 });
diff --git a/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.html b/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.html
index 8dfb220c8a3..5da35d2699b 100644
--- a/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.html
+++ b/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.html
@@ -3,7 +3,6 @@
   [attr.aria-label]="'navigation.scrollToTop' | cxTranslate"
   [title]="'navigation.scrollToTop' | cxTranslate"
   class="cx-scroll-to-top-btn"
-  [class.elevated-position]="elevatedPosition$ | async"
   (click)="scrollToTop($event)"
   (focusout)="onFocusOut()"
   (keydown.Tab)="onTab($event)"
diff --git a/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.spec.ts b/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.spec.ts
index 492243b83bf..1c8cb9ca0ab 100644
--- a/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.spec.ts
+++ b/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.spec.ts
@@ -2,7 +2,6 @@ import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import {
-  AnonymousConsentsService,
   CmsScrollToTopComponent,
   FeatureConfigService,
   I18nTestingModule,
@@ -29,12 +28,6 @@ class MockFeatureConfigService {
   }
 }
 
-class MockAnonymousConsentsService {
-  isBannerVisible() {
-    return of(false);
-  }
-}
-
 describe('ScrollToTopComponent', () => {
   let component: ScrollToTopComponent;
   let fixture: ComponentFixture<ScrollToTopComponent>;
@@ -55,10 +48,6 @@ describe('ScrollToTopComponent', () => {
           provide: FeatureConfigService,
           useClass: MockFeatureConfigService,
         },
-        {
-          provide: AnonymousConsentsService,
-          useClass: MockAnonymousConsentsService,
-        },
       ],
     }).compileComponents();
 
diff --git a/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.ts b/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.ts
index a37b6022463..3ea9b4f1970 100644
--- a/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.ts
+++ b/projects/storefrontlib/cms-components/navigation/scroll-to-top/scroll-to-top.component.ts
@@ -20,10 +20,8 @@ import {
   FeatureConfigService,
   ScrollBehavior,
   WindowRef,
-  AnonymousConsentsService,
-  useFeatureStyles,
 } from '@spartacus/core';
-import { take, Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
 import { CmsComponentData } from '../../../cms-structure/page/model/cms-component-data';
 import { SelectFocusUtility } from '../../../layout/a11y/index';
 import { ICON_TYPE } from '../../misc/icon/icon.model';
@@ -39,7 +37,6 @@ export class ScrollToTopComponent implements OnInit {
   @HostBinding('class.display')
   display: boolean | undefined;
 
-  protected elevatedPosition$: Observable<boolean> | undefined;
   protected window: Window | undefined = this.winRef.nativeWindow;
   protected scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH;
   protected displayThreshold: number = (this.window?.innerHeight ?? 400) / 2;
@@ -52,26 +49,15 @@ export class ScrollToTopComponent implements OnInit {
   @Optional() protected featureConfigService = inject(FeatureConfigService, {
     optional: true,
   });
-  @Optional() protected anonymousConsentsService = inject(
-    AnonymousConsentsService,
-    {
-      optional: true,
-    }
-  );
 
   constructor(
     protected winRef: WindowRef,
     protected componentData: CmsComponentData<CmsScrollToTopComponent>,
     protected selectFocusUtility: SelectFocusUtility
-  ) {
-    useFeatureStyles('a11yScrollToTopPositioning');
-  }
+  ) {}
 
   ngOnInit(): void {
     this.setConfig();
-    if (this.featureConfigService?.isEnabled('a11yScrollToTopPositioning')) {
-      this.elevatedPosition$ = this.anonymousConsentsService?.isBannerVisible();
-    }
   }
 
   @HostListener('window:scroll', ['$event'])
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
index 54473f0fcee..5afcf32a15d 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
@@ -24,8 +24,8 @@ import {
   FeatureConfigService,
   PageType,
   RoutingService,
-  WindowRef,
   useFeatureStyles,
+  WindowRef,
 } from '@spartacus/core';
 import { Observable, of, Subscription } from 'rxjs';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
@@ -156,6 +156,7 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     protected routingService: RoutingService
   ) {
     useFeatureStyles('a11ySearchboxLabel');
+    useFeatureStyles('a11yKeyboardFocusInSearchBox');
   }
 
   /**
@@ -480,6 +481,15 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     ];
     // Focus on first index moving to last
     if (results.length) {
+      if (
+        this.featureConfigService?.isEnabled(
+          'a11ySearchableDropdownFirstElementFocus'
+        )
+      ) {
+        this.winRef.document
+          .querySelector('header')
+          ?.classList.remove('mouse-focus');
+      }
       if (focusedIndex >= results.length - 1) {
         results[0].focus();
       } else {
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts
index 8d7516e167a..fbddd34755e 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts
@@ -15,11 +15,12 @@ import {
   provideDefaultConfig,
 } from '@spartacus/core';
 import { OutletModule } from '../../../cms-structure';
+import { KeyboardFocusModule } from '../../../layout/a11y/keyboard-focus/keyboard-focus.module';
+import { CarouselModule } from '../../../shared';
 import { MediaModule } from '../../../shared/components/media/media.module';
 import { IconModule } from '../../misc/icon/icon.module';
 import { HighlightPipe } from './highlight.pipe';
 import { SearchBoxComponent } from './search-box.component';
-import { CarouselModule } from '../../../shared';
 
 @NgModule({
   imports: [
@@ -32,6 +33,7 @@ import { CarouselModule } from '../../../shared';
     OutletModule,
     FeaturesConfigModule,
     CarouselModule,
+    KeyboardFocusModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts b/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts
index 6f6f8720d0c..de108f6528b 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.spec.ts
@@ -13,6 +13,7 @@ import {
   I18nTestingModule,
   Product,
   ProductScope,
+  ProductSearchByCategoryService,
   ProductSearchByCodeService,
   ProductService,
 } from '@spartacus/core';
@@ -111,6 +112,14 @@ const mockProductsFromSearchByCodes: Record<string, Record<string, Product>> = {
     },
   },
 };
+const mockProductsFromSearchByCategory: Record<
+  string,
+  Record<string, Product[]>
+> = {
+  electronics: {
+    code: [{ code: 'prod3' }, { code: 'prod4' }, { code: 'prod5' }],
+  },
+};
 
 const mockComponentData: CmsProductCarouselComponent = {
   uid: '001',
@@ -122,6 +131,7 @@ const mockComponentData: CmsProductCarouselComponent = {
   title: 'Mock Title',
   name: 'Mock Product Carousel',
   container: 'false',
+  categoryCodes: 'electronics ',
 };
 const mockComponentWithAddCartData: CmsProductCarouselComponent = {
   ...mockComponentData,
@@ -134,11 +144,13 @@ const MockCmsProductCarouselComponent = <CmsComponentData<any>>{
 const MockCmsProductCarouselComponentAddToCart = <CmsComponentData<any>>{
   data$: of(mockComponentWithAddCartData),
 };
+
 class MockProductService implements Partial<ProductService> {
   get(productCode: string): Observable<Product> {
     return of(mockProducts[productCode]);
   }
 }
+
 class MockFeatureConfigService {
   isEnabled(feature: string): boolean {
     return feature === 'useProductCarouselBatchApi';
@@ -153,11 +165,22 @@ class MockProductSearchByCodeService
   }
 }
 
+class MockProductSearchByCategoryService
+  implements Partial<ProductSearchByCategoryService>
+{
+  get({ categoryCode, scope }: { categoryCode: string; scope?: string }) {
+    const products =
+      mockProductsFromSearchByCategory[categoryCode]?.[scope ?? ''] || [];
+    return of(products);
+  }
+}
+
 describe('ProductCarouselComponent', () => {
   let component: ProductCarouselComponent;
   let fixture: ComponentFixture<ProductCarouselComponent>;
   let featureConfigService: MockFeatureConfigService;
   let productSearchByCodeService: MockProductSearchByCodeService;
+  let productSearchByCategoryService: MockProductSearchByCategoryService;
 
   const testBedDefaults = {
     imports: [I18nTestingModule],
@@ -185,6 +208,10 @@ describe('ProductCarouselComponent', () => {
         provide: ProductSearchByCodeService,
         useClass: MockProductSearchByCodeService,
       },
+      {
+        provide: ProductSearchByCategoryService,
+        useClass: MockProductSearchByCategoryService,
+      },
     ],
   };
 
@@ -201,6 +228,9 @@ describe('ProductCarouselComponent', () => {
     productSearchByCodeService = TestBed.inject(
       ProductSearchByCodeService
     ) as MockProductSearchByCodeService;
+    productSearchByCategoryService = TestBed.inject(
+      ProductSearchByCategoryService
+    ) as MockProductSearchByCategoryService;
     fixture.detectChanges();
   });
 
@@ -236,7 +266,9 @@ describe('ProductCarouselComponent', () => {
   }));
 
   it('FeatureToggleEnable: Should use batch API with carouselMinimal scope when componentMappingExist is false', (done) => {
-    spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
+    spyOn(featureConfigService, 'isEnabled').and.callFake(
+      (val: string) => val === 'useProductCarouselBatchApi'
+    );
     spyOn(productSearchByCodeService, 'get').and.callThrough();
 
     component.items$.subscribe((items) => {
@@ -303,7 +335,9 @@ describe('ProductCarouselComponent', () => {
     });
 
     it('FeatureToggleEnable: Should use batch API with carousel scope when componentMappingExist is true', (done) => {
-      spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
+      spyOn(featureConfigService, 'isEnabled').and.callFake(
+        (val: string) => val === 'useProductCarouselBatchApi'
+      );
       spyOn(productSearchByCodeService, 'get').and.callThrough();
 
       component.items$.subscribe((items) => {
@@ -323,4 +357,40 @@ describe('ProductCarouselComponent', () => {
       });
     });
   });
+  describe('Carousel with category products', () => {
+    beforeEach(() => {
+      TestBed.resetTestingModule();
+      TestBed.configureTestingModule(testBedDefaults);
+
+      TestBed.overrideProvider(CmsComponentData, {
+        useValue: MockCmsProductCarouselComponentAddToCart,
+      });
+      TestBed.compileComponents();
+      fixture = TestBed.createComponent(ProductCarouselComponent);
+      component = fixture.componentInstance;
+      featureConfigService = TestBed.inject(
+        FeatureConfigService
+      ) as MockFeatureConfigService;
+      productSearchByCategoryService = TestBed.inject(
+        ProductSearchByCategoryService
+      ) as MockProductSearchByCategoryService;
+      fixture.detectChanges();
+    });
+
+    it('should retrieve products by category', (done) => {
+      spyOn(featureConfigService, 'isEnabled').and.callFake(
+        (val: string) => val !== 'useProductCarouselBatchApi'
+      );
+
+      spyOn(productSearchByCategoryService, 'get').and.callThrough();
+
+      component.items$.subscribe((items) => {
+        expect(items?.length).toBe(5);
+
+        expect(productSearchByCategoryService.get).toHaveBeenCalledTimes(2);
+
+        done();
+      });
+    });
+  });
 });
diff --git a/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.ts b/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.ts
index 336d73eeab2..f6d0c89b012 100644
--- a/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.ts
+++ b/projects/storefrontlib/cms-components/product/carousel/product-carousel/product-carousel.component.ts
@@ -10,10 +10,11 @@ import {
   FeatureConfigService,
   Product,
   ProductScope,
-  ProductService,
+  ProductSearchByCategoryService,
   ProductSearchByCodeService,
+  ProductService,
 } from '@spartacus/core';
-import { Observable } from 'rxjs';
+import { Observable, of, switchMap, zip } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { CmsComponentData } from '../../../../cms-structure/page/model/cms-component-data';
 
@@ -28,6 +29,8 @@ export class ProductCarouselComponent {
   protected productSearchByCodeService: ProductSearchByCodeService = inject(
     ProductSearchByCodeService
   );
+  protected productSearchByCategoryService: ProductSearchByCategoryService =
+    inject(ProductSearchByCategoryService);
   protected readonly PRODUCT_SCOPE = [ProductScope.LIST, ProductScope.STOCK];
 
   protected readonly PRODUCT_SCOPE_ITEM = [ProductScope.LIST_ITEM];
@@ -52,6 +55,7 @@ export class ProductCarouselComponent {
    */
   items$: Observable<Observable<Product | undefined>[]> =
     this.componentData$.pipe(
+      switchMap((data) => this.handleCategoryCodes(data)),
       map((data) => {
         const componentMappingExist = !!data.composition?.inner?.length;
         const codes = data.productCodes?.trim().split(' ') ?? [];
@@ -78,4 +82,36 @@ export class ProductCarouselComponent {
     protected componentData: CmsComponentData<model>,
     protected productService: ProductService
   ) {}
+  handleCategoryCodes(data: model): Observable<model> {
+    const categoryCodes = data?.categoryCodes?.split(' ');
+
+    // Try to add category codes to the carousel product codes
+    if (
+      categoryCodes &&
+      this.featureConfigService.isEnabled('enableCarouselCategoryProducts')
+    ) {
+      return zip(
+        categoryCodes.map((categoryCode) =>
+          this.productSearchByCategoryService.get({
+            categoryCode,
+            scope: ProductScope.CODE,
+          })
+        )
+      ).pipe(
+        map((results) => {
+          const codes = results
+            .flat()
+            .map((product) => product?.code)
+            .join(' ');
+
+          return {
+            ...data,
+            productCodes: data.productCodes + ' ' + codes,
+          };
+        })
+      );
+    }
+
+    return of(data);
+  }
 }
diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html
index c54dbe95eb2..e80bb446705 100644
--- a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html
+++ b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html
@@ -20,7 +20,7 @@
   </div>
   <div class="col-12 col-md-8">
     <ng-container *cxFeature="'a11yExpandedFocusIndicator'">
-      <h2 class="cx-product-name">
+      <h2 [id]="product.code + '_header'" class="cx-product-name">
         <a
           [routerLink]="{ cxRoute: 'product', params: product } | cxUrl"
           [innerHtml]="product.nameHtml"
diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html
index fd679c23476..1debfa71c06 100644
--- a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html
+++ b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html
@@ -94,11 +94,14 @@ <h3>{{ 'productReview.overallRating' | cxTranslate }}</h3>
             type="text"
             class="form-control"
             formControlName="title"
+            [attr.aria-describedby]="'titleError'"
           />
 
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="titleError"
+            aria-live="off"
             [translationParams]="{
               label: 'productReview.reviewTitle' | cxTranslate,
             }"
@@ -122,11 +125,14 @@ <h3>{{ 'productReview.overallRating' | cxTranslate }}</h3>
             class="form-control"
             rows="3"
             formControlName="comment"
+            [attr.aria-describedby]="'commentError'"
           ></textarea>
 
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="commentError"
+            aria-live="off"
             [translationParams]="{
               label: 'productReview.writeYourComments' | cxTranslate,
             }"
@@ -150,6 +156,7 @@ <h3>{{ 'productReview.overallRating' | cxTranslate }}</h3>
             type="number"
             formControlName="rating"
             class="rating-input"
+            [attr.aria-describedby]="'ratingError'"
           />
           <cx-star-rating
             tabindex="0"
@@ -161,6 +168,8 @@ <h3>{{ 'productReview.overallRating' | cxTranslate }}</h3>
           <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
           <cx-form-errors
             *cxFeature="'formErrorsDescriptiveMessages'"
+            id="ratingError"
+            aria-live="off"
             [translationParams]="{
               label: 'productReview.rating' | cxTranslate,
             }"
diff --git a/projects/storefrontlib/layout/a11y/index.ts b/projects/storefrontlib/layout/a11y/index.ts
index eaadc2b9e15..acfd3342c0e 100644
--- a/projects/storefrontlib/layout/a11y/index.ts
+++ b/projects/storefrontlib/layout/a11y/index.ts
@@ -7,3 +7,4 @@
 export * from './keyboard-focus/index';
 export * from './skip-link/index';
 export * from './btn-like-link';
+export * from './on-dom-change';
diff --git a/projects/storefrontlib/layout/a11y/keyboard-focus/index.ts b/projects/storefrontlib/layout/a11y/keyboard-focus/index.ts
index 05f6ca2881d..f5d1074cde7 100644
--- a/projects/storefrontlib/layout/a11y/keyboard-focus/index.ts
+++ b/projects/storefrontlib/layout/a11y/keyboard-focus/index.ts
@@ -8,6 +8,7 @@
 // NOT exposing all it to the public API.
 export * from './focus.directive';
 export { FocusConfig, TrapFocus, TrapFocusType } from './keyboard-focus.model';
+export * from './skip-focus.directive';
 export * from './keyboard-focus.module';
 export * from './focus-testing.module';
 export * from './services/index';
diff --git a/projects/storefrontlib/layout/a11y/keyboard-focus/keyboard-focus.module.ts b/projects/storefrontlib/layout/a11y/keyboard-focus/keyboard-focus.module.ts
index 737d1e712a6..4d04dc9444c 100644
--- a/projects/storefrontlib/layout/a11y/keyboard-focus/keyboard-focus.module.ts
+++ b/projects/storefrontlib/layout/a11y/keyboard-focus/keyboard-focus.module.ts
@@ -7,6 +7,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FocusDirective } from './focus.directive';
+import { SkipFocusDirective } from './skip-focus.directive';
 
 const directives = [
   // PersistFocusDirective,
@@ -18,6 +19,7 @@ const directives = [
   // TrapFocusDirective,
   // TabFocusDirective,
   FocusDirective,
+  SkipFocusDirective,
 ];
 
 @NgModule({
diff --git a/projects/storefrontlib/layout/a11y/keyboard-focus/services/select-focus.util.spec.ts b/projects/storefrontlib/layout/a11y/keyboard-focus/services/select-focus.util.spec.ts
index 504e5fe350d..6b020003ac5 100644
--- a/projects/storefrontlib/layout/a11y/keyboard-focus/services/select-focus.util.spec.ts
+++ b/projects/storefrontlib/layout/a11y/keyboard-focus/services/select-focus.util.spec.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { SelectFocusUtility } from './select-focus.util';
 
diff --git a/projects/storefrontlib/layout/a11y/keyboard-focus/skip-focus.directive.ts b/projects/storefrontlib/layout/a11y/keyboard-focus/skip-focus.directive.ts
new file mode 100644
index 00000000000..7716751ddd0
--- /dev/null
+++ b/projects/storefrontlib/layout/a11y/keyboard-focus/skip-focus.directive.ts
@@ -0,0 +1,80 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  Directive,
+  ElementRef,
+  inject,
+  Input,
+  OnChanges,
+  Renderer2,
+} from '@angular/core';
+import { WindowRef } from '@spartacus/core';
+
+export interface SkipFocusConfig {
+  isEnabled: boolean;
+  /**
+   * elements selectors that should not be skipped
+   * for ex `activeElementSelectors: ['button.cx-hamburger']`
+   */
+  activeElementSelectors?: string[];
+}
+/**
+ * Directive that removes all visible and focusable elements
+ * in a host container from `tab` or `shift-tab` navigation
+ * except elements in `activeElementSelectors` config.
+ */
+@Directive({
+  selector: '[cxSkipFocus]',
+})
+export class SkipFocusDirective implements OnChanges {
+  @Input('cxSkipFocus') config: SkipFocusConfig = { isEnabled: false };
+
+  protected elementRef = inject(ElementRef);
+  protected winRef = inject(WindowRef);
+  protected renderer = inject(Renderer2);
+
+  public ngOnChanges(): void {
+    this.excludeFromFocus(
+      this.config.isEnabled,
+      this.config.activeElementSelectors
+    );
+  }
+
+  protected excludeFromFocus(
+    isEnabled: boolean,
+    skipSelectors: string[] = []
+  ): void {
+    if (!this.winRef.isBrowser()) {
+      return;
+    }
+    const tabindex = isEnabled ? '-1' : '0';
+    const focusableElementsSelector =
+      'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"]';
+    const focusableElements = this.elementRef.nativeElement.querySelectorAll(
+      focusableElementsSelector
+    );
+    Array.from(focusableElements || []).forEach((el) => {
+      const element = el as HTMLElement;
+      const shouldSkip = skipSelectors.some((selector) => {
+        return element.matches(selector);
+      });
+      if (!shouldSkip && this.isElementVisible(element)) {
+        this.renderer.setAttribute(element, 'tabindex', tabindex);
+      }
+    });
+  }
+
+  protected isElementVisible(element: HTMLElement): boolean {
+    const style = this.winRef.nativeWindow?.getComputedStyle(element);
+    return (
+      style?.visibility !== 'hidden' &&
+      style?.display !== 'none' &&
+      element.offsetWidth > 0 &&
+      element.offsetHeight > 0
+    );
+  }
+}
diff --git a/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.directive.spec.ts b/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.directive.spec.ts
new file mode 100644
index 00000000000..907f079c1db
--- /dev/null
+++ b/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.directive.spec.ts
@@ -0,0 +1,101 @@
+import { Component, ElementRef } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { DomChangeDirective } from './dom-change.directive';
+
+@Component({
+  template: `
+    <div id="testElement" cxDomChange>
+      <div class="targetElement"></div>
+    </div>
+  `,
+})
+class TestHostComponent {}
+
+describe('DomChangeDirective', () => {
+  // let component: TestHostComponent;
+  let fixture: ComponentFixture<TestHostComponent>;
+  let testElement: ElementRef;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [TestHostComponent, DomChangeDirective],
+      imports: [BrowserAnimationsModule],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TestHostComponent);
+
+    testElement = fixture.debugElement.query(By.directive(DomChangeDirective));
+  }));
+
+  it('should emit when a child element is added', (done) => {
+    const directive = fixture.debugElement
+      .query(By.directive(DomChangeDirective))
+      .injector.get(DomChangeDirective);
+    const newElement = document.createElement('div');
+
+    directive.cxDomChange.subscribe((mutation: MutationRecord) => {
+      expect(mutation.type).toBe('childList');
+      done();
+    });
+
+    // Set DOM
+    testElement.nativeElement.appendChild(newElement);
+    fixture.detectChanges();
+  });
+
+  it('should emit when a child element is removed', (done) => {
+    const directive = fixture.debugElement
+      .query(By.directive(DomChangeDirective))
+      .injector.get(DomChangeDirective);
+    const childElement =
+      testElement.nativeElement.querySelector('.targetElement');
+
+    directive.cxDomChange.subscribe((mutation: MutationRecord) => {
+      expect(mutation.type).toBe('childList');
+      done();
+    });
+
+    // Set DOM
+    testElement.nativeElement.removeChild(childElement);
+    fixture.detectChanges();
+  });
+
+  it('should filter mutations based on the target selector', (done) => {
+    const directive = fixture.debugElement
+      .query(By.directive(DomChangeDirective))
+      .injector.get(DomChangeDirective);
+    directive.cxDomChangeTargetSelector = '.targetElement';
+
+    directive.cxDomChange.subscribe((mutation: MutationRecord) => {
+      expect(mutation.target).toHaveClass('targetElement');
+      done();
+    });
+
+    // Set DOM
+    const targetElement =
+      testElement.nativeElement.querySelector('.targetElement');
+    targetElement.appendChild(document.createTextNode('Test Text'));
+    fixture.detectChanges();
+  });
+
+  it('should not emit when mutations do not match target selector', () => {
+    let called = false;
+    const directive = fixture.debugElement
+      .query(By.directive(DomChangeDirective))
+      .injector.get(DomChangeDirective);
+    directive.cxDomChangeTargetSelector = '.non-matching-selector';
+
+    directive.cxDomChange.subscribe(() => {
+      called = true;
+    });
+
+    // Set DOM
+    const newElement = document.createElement('div');
+    testElement.nativeElement.appendChild(newElement);
+    fixture.detectChanges();
+
+    expect(called).toBe(false);
+  });
+});
diff --git a/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.directive.ts b/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.directive.ts
new file mode 100644
index 00000000000..d0313b44180
--- /dev/null
+++ b/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.directive.ts
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  inject,
+  Input,
+  OnDestroy,
+  Output,
+} from '@angular/core';
+
+/**
+ * Custom Directive used to enable clients to track (react to) Host's Element DOM changes.
+ *
+ * Whenever the mutation (Host's element DOM subthree change) is detected it will trigger the
+ * _cxDomChange_ Output allowing clients to react to the Host's element DOM changes.
+ *
+ * Optional _cxDomChangeTargetSelector_ Input enables clients to be more specifixc when reacting to
+ * the Host's element DOM changes by allowing them to specify css selector (relative to Host Element)
+ * that narrows down the number of _cxDomChange_ Output executions to be triggered only when
+ * _cxDomChangeTargetSelector_ Input relevant elements changes are detected.
+ */
+@Directive({
+  selector: '[cxDomChange]',
+})
+export class DomChangeDirective implements OnDestroy {
+  protected changes: MutationObserver;
+
+  /**
+   * Optional Css Selector Input filtering DOM mutations to those targeting only elements described via provided selector
+   */
+  @Input() cxDomChangeTargetSelector?: string;
+
+  @Output()
+  public cxDomChange = new EventEmitter<MutationRecord>();
+
+  protected elementRef: ElementRef;
+
+  constructor() {
+    this.elementRef = inject(ElementRef);
+    this.changes = new MutationObserver((mutations: MutationRecord[]) => {
+      const affectedMutations = this.cxDomChangeTargetSelector
+        ? mutations.filter(
+            (mutation) =>
+              mutation.target ===
+              this.elementRef.nativeElement.querySelector(
+                this.cxDomChangeTargetSelector
+              )
+          )
+        : mutations;
+      affectedMutations.forEach((mutation) => this.cxDomChange.emit(mutation));
+    });
+
+    this.changes.observe(this.elementRef.nativeElement, {
+      subtree: true,
+      childList: true,
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.changes.disconnect();
+  }
+}
diff --git a/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.module.ts b/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.module.ts
new file mode 100644
index 00000000000..eeec3602c74
--- /dev/null
+++ b/projects/storefrontlib/layout/a11y/on-dom-change/dom-change.module.ts
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { DomChangeDirective } from './dom-change.directive';
+
+@NgModule({
+  imports: [CommonModule],
+  declarations: [DomChangeDirective],
+  exports: [DomChangeDirective],
+})
+export class DomChangeModule {}
diff --git a/projects/storefrontlib/layout/a11y/on-dom-change/index.ts b/projects/storefrontlib/layout/a11y/on-dom-change/index.ts
new file mode 100644
index 00000000000..df08d06e4a6
--- /dev/null
+++ b/projects/storefrontlib/layout/a11y/on-dom-change/index.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './dom-change.directive';
+export * from './dom-change.module';
+export { DomChangeModule } from './dom-change.module';
diff --git a/projects/storefrontlib/layout/a11y/skip-link/service/skip-link.service.ts b/projects/storefrontlib/layout/a11y/skip-link/service/skip-link.service.ts
index 88a553dff51..635438e32f6 100644
--- a/projects/storefrontlib/layout/a11y/skip-link/service/skip-link.service.ts
+++ b/projects/storefrontlib/layout/a11y/skip-link/service/skip-link.service.ts
@@ -53,7 +53,16 @@ export class SkipLinkService {
     }
   }
 
-  scrollToTarget(skipLink: SkipLink): void {
+  scrollToTarget(scrollTo: string | SkipLink): void {
+    const skipLink =
+      typeof scrollTo === 'string'
+        ? this.findSkipLinkByKey(scrollTo)
+        : scrollTo;
+
+    if (!skipLink) {
+      return;
+    }
+
     const target =
       skipLink.target instanceof HTMLElement
         ? skipLink.target
@@ -77,6 +86,10 @@ export class SkipLinkService {
     }
   }
 
+  protected findSkipLinkByKey(key: string): SkipLink | undefined {
+    return this.skipLinks$.value.find((skipLink) => skipLink.key === key);
+  }
+
   protected getSkipLinkIndexInArray(key: string): number {
     let index: number =
       this.config.skipLinks?.findIndex((skipLink) => skipLink.key === key) ?? 0;
diff --git a/projects/storefrontlib/layout/launch-dialog/config/launch-config.ts b/projects/storefrontlib/layout/launch-dialog/config/launch-config.ts
index 1854c193c35..5f9fc9e9852 100644
--- a/projects/storefrontlib/layout/launch-dialog/config/launch-config.ts
+++ b/projects/storefrontlib/layout/launch-dialog/config/launch-config.ts
@@ -98,5 +98,6 @@ export const enum LAUNCH_CALLER {
   PLACE_ORDER_SPINNER = 'PLACE_ORDER_SPINNER',
   SUGGESTED_ADDRESSES = 'SUGGESTED_ADDRESSES',
   COUPON = 'COUPON',
+  CLAIM_DIALOG = 'CLAIM_DIALOG',
   STOCK_NOTIFICATION = 'STOCK_NOTIFICATION',
 }
diff --git a/projects/storefrontlib/layout/main/storefront.component.html b/projects/storefrontlib/layout/main/storefront.component.html
index f3146127e0e..a06324c0755 100644
--- a/projects/storefrontlib/layout/main/storefront.component.html
+++ b/projects/storefrontlib/layout/main/storefront.component.html
@@ -3,12 +3,16 @@
     <header
       id="cx-header"
       cxSkipLink="cx-header"
-      [cxFocus]="{ disableMouseFocus: true }"
+      [cxFocus]="focusConfig"
       [class.is-expanded]="isExpanded$ | async"
       (keydown.escape)="collapseMenu()"
       (click)="collapseMenuIfClickOutside($event)"
     >
-      <cx-page-layout section="header"></cx-page-layout>
+      <cx-page-layout
+        section="header"
+        [cxSkipFocus]="skipFocusConfig"
+      ></cx-page-layout>
+
       <cx-page-layout section="navigation"></cx-page-layout>
     </header>
     <cx-page-slot
diff --git a/projects/storefrontlib/layout/main/storefront.component.spec.ts b/projects/storefrontlib/layout/main/storefront.component.spec.ts
index 39f7f17a832..8560b2850e7 100644
--- a/projects/storefrontlib/layout/main/storefront.component.spec.ts
+++ b/projects/storefrontlib/layout/main/storefront.component.spec.ts
@@ -1,9 +1,10 @@
 import { Component, DebugElement, Directive, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RoutingService } from '@spartacus/core';
+import { FeatureConfigService, RoutingService } from '@spartacus/core';
 import { EMPTY, Observable, of } from 'rxjs';
 import { OutletDirective } from '../../cms-structure';
 import { MockFeatureDirective } from '../../shared/test/mock-feature-directive';
+import { SkipLinkService } from '../a11y/skip-link/index';
 import { HamburgerMenuService } from '../header/hamburger-menu/hamburger-menu.service';
 import { StorefrontComponent } from './storefront.component';
 
@@ -51,6 +52,7 @@ class MockPageLayoutComponent {}
 
 class MockHamburgerMenuService {
   toggle(_forceCollapse?: boolean): void {}
+  isExpanded = of(false);
 }
 
 @Directive({
@@ -60,11 +62,25 @@ class MockOutletDirective implements Partial<OutletDirective> {
   @Input() cxOutlet: string;
 }
 
+class MockSkipLinkService implements Partial<SkipLinkService> {
+  getSkipLinks() {
+    return of([
+      {
+        key: 'cx-main',
+        target: document.createElement('div'),
+        i18nKey: 'skipLink.main',
+      },
+    ]);
+  }
+  scrollToTarget(): void {}
+}
+
 describe('StorefrontComponent', () => {
   let component: StorefrontComponent;
   let fixture: ComponentFixture<StorefrontComponent>;
   let el: DebugElement;
   let routingService: RoutingService;
+  let skipLinkService: SkipLinkService;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -88,6 +104,16 @@ describe('StorefrontComponent', () => {
           provide: HamburgerMenuService,
           useClass: MockHamburgerMenuService,
         },
+        {
+          provide: SkipLinkService,
+          useClass: MockSkipLinkService,
+        },
+        {
+          provide: FeatureConfigService,
+          useValue: {
+            isEnabled: () => true,
+          },
+        },
       ],
     }).compileComponents();
   }));
@@ -97,6 +123,7 @@ describe('StorefrontComponent', () => {
     component = fixture.componentInstance;
     el = fixture.debugElement;
     routingService = TestBed.inject(RoutingService);
+    skipLinkService = TestBed.inject(SkipLinkService);
   });
 
   it('should create', () => {
@@ -145,4 +172,63 @@ describe('StorefrontComponent', () => {
     component.collapseMenuIfClickOutside(mockEvent);
     expect(component.collapseMenu).not.toHaveBeenCalled();
   });
+
+  describe('onNavigation', () => {
+    it('should set navigation flags correctly when navigation starts', () => {
+      component['onNavigation'](true);
+      expect(component.startNavigating).toBe(true);
+      expect(component.stopNavigating).toBe(false);
+    });
+
+    it('should set navigation flags correctly when navigation ends', () => {
+      component['onNavigation'](false);
+      expect(component.startNavigating).toBe(false);
+      expect(component.stopNavigating).toBe(true);
+    });
+
+    it('should call skipLinkService.scrollToTarget when navigation ends and document has active element', () => {
+      spyOn(skipLinkService, 'scrollToTarget');
+      spyOn(component['featureConfigService'], 'isEnabled').and.returnValue(
+        true
+      );
+
+      const mockDocument = {
+        activeElement: document.createElement('button'),
+        body: document.createElement('body'),
+      };
+      component['document'] = mockDocument as any;
+
+      component['onNavigation'](false);
+
+      expect(skipLinkService.scrollToTarget).toHaveBeenCalledWith('cx-main');
+    });
+
+    it('should not call skipLinkService.scrollToTarget when navigation ends and focus is on body', () => {
+      spyOn(skipLinkService, 'scrollToTarget');
+      spyOn(component['featureConfigService'], 'isEnabled').and.returnValue(
+        true
+      );
+      const body = document.createElement('body');
+      const mockDocument = {
+        activeElement: body,
+        body,
+      };
+      component['document'] = mockDocument as any;
+
+      component['onNavigation'](false);
+
+      expect(skipLinkService.scrollToTarget).not.toHaveBeenCalled();
+    });
+
+    it('should not call skipLinkService.scrollToTarget when feature is disabled', () => {
+      spyOn(skipLinkService, 'scrollToTarget');
+      spyOn(component['featureConfigService'], 'isEnabled').and.returnValue(
+        false
+      );
+
+      component['onNavigation'](false);
+
+      expect(skipLinkService.scrollToTarget).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/projects/storefrontlib/layout/main/storefront.component.ts b/projects/storefrontlib/layout/main/storefront.component.ts
index 2b7cbf8d402..7e4051315ea 100644
--- a/projects/storefrontlib/layout/main/storefront.component.ts
+++ b/projects/storefrontlib/layout/main/storefront.component.ts
@@ -6,13 +6,15 @@
 
 import {
   Component,
+  DestroyRef,
   ElementRef,
   HostBinding,
   HostListener,
+  inject,
   OnDestroy,
   OnInit,
+  Optional,
   ViewChild,
-  inject,
 } from '@angular/core';
 import {
   FeatureConfigService,
@@ -22,11 +24,15 @@ import {
 import { Observable, Subscription, tap } from 'rxjs';
 import {
   FocusConfig,
+  SkipFocusConfig,
   KeyboardFocusService,
 } from '../a11y/keyboard-focus/index';
-import { SkipLinkComponent } from '../a11y/skip-link/index';
+import { SkipLinkComponent, SkipLinkService } from '../a11y/skip-link/index';
 import { HamburgerMenuService } from '../header/hamburger-menu/hamburger-menu.service';
 import { StorefrontOutlets } from './storefront-outlets.model';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { distinctUntilChanged } from 'rxjs/operators';
+import { DOCUMENT } from '@angular/common';
 
 @Component({
   selector: 'cx-storefront',
@@ -34,11 +40,23 @@ import { StorefrontOutlets } from './storefront-outlets.model';
 })
 export class StorefrontComponent implements OnInit, OnDestroy {
   navigateSubscription: Subscription;
+  focusConfig: FocusConfig = { disableMouseFocus: true, trap: false };
+  skipFocusConfig: SkipFocusConfig = {
+    isEnabled: false,
+    activeElementSelectors: ['button.cx-hamburger'],
+  };
   isExpanded$: Observable<boolean> = this.hamburgerMenuService.isExpanded;
 
   readonly StorefrontOutlets = StorefrontOutlets;
 
   private featureConfigService = inject(FeatureConfigService);
+  protected destroyRef = inject(DestroyRef);
+  @Optional() protected document = inject(DOCUMENT, {
+    optional: true,
+  });
+  @Optional() protected skipLinkService = inject(SkipLinkService, {
+    optional: true,
+  });
 
   @HostBinding('class.start-navigating') startNavigating: boolean;
   @HostBinding('class.stop-navigating') stopNavigating: boolean;
@@ -83,15 +101,13 @@ export class StorefrontComponent implements OnInit, OnDestroy {
     useFeatureStyles('cmsBottomHeaderSlotUsingFlexStyles');
     useFeatureStyles('headerLayoutForSmallerViewports');
     useFeatureStyles('a11yPdpGridArrangement');
+    useFeatureStyles('a11yKeyboardFocusInSearchBox');
   }
 
   ngOnInit(): void {
     this.navigateSubscription = this.routingService
       .isNavigating()
-      .subscribe((val) => {
-        this.startNavigating = val === true;
-        this.stopNavigating = val === false;
-      });
+      .subscribe((val) => this.onNavigation(val));
     if (
       this.featureConfigService.isEnabled(
         'a11yMobileFocusOnFirstNavigationItem'
@@ -105,6 +121,10 @@ export class StorefrontComponent implements OnInit, OnDestroy {
         })
       );
     }
+
+    if (this.featureConfigService.isEnabled('a11yHamburgerMenuTrapFocus')) {
+      this.trapFocusOnMenuIfExpanded();
+    }
   }
 
   collapseMenuIfClickOutside(event: any): void {
@@ -121,6 +141,18 @@ export class StorefrontComponent implements OnInit, OnDestroy {
     this.hamburgerMenuService.toggle(true);
   }
 
+  protected trapFocusOnMenuIfExpanded(): void {
+    this.isExpanded$
+      .pipe(distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
+      .subscribe((isExpanded) => {
+        this.focusConfig = { ...this.focusConfig, trap: isExpanded };
+        this.skipFocusConfig = {
+          ...this.skipFocusConfig,
+          isEnabled: isExpanded,
+        };
+      });
+  }
+
   protected focusOnFirstNavigationItem() {
     const closestNavigationUi = this.elementRef.nativeElement.querySelector(
       'header cx-navigation-ui'
@@ -138,4 +170,18 @@ export class StorefrontComponent implements OnInit, OnDestroy {
       this.navigateSubscription.unsubscribe();
     }
   }
+
+  protected onNavigation(isNavigating: boolean): void {
+    this.startNavigating = isNavigating === true;
+    this.stopNavigating = isNavigating === false;
+
+    // After clicking a link the focus should move to the first available item in the main content area.
+    if (
+      this.featureConfigService.isEnabled('a11yResetFocusAfterNavigating') &&
+      this.stopNavigating &&
+      this.document?.activeElement !== this.document?.body
+    ) {
+      this.skipLinkService?.scrollToTarget('cx-main');
+    }
+  }
 }
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index 23452257d85..652a5f06c2d 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefront",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "keywords": [
     "spartacus",
     "storefront",
@@ -10,7 +10,7 @@
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/storefrontlib",
   "license": "Apache-2.0",
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular/common": "^18.2.9",
@@ -23,7 +23,7 @@
     "@ngrx/effects": "^18.1.1",
     "@ngrx/router-store": "^18.1.1",
     "@ngrx/store": "^18.1.1",
-    "@spartacus/core": "2211.32.0-1",
+    "@spartacus/core": "2211.32.0",
     "ngx-infinite-scroll": "^18.0.0",
     "rxjs": "^7.8.0"
   },
diff --git a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.html b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.html
index 600a6a98465..7147bf922b9 100644
--- a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.html
+++ b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.html
@@ -38,6 +38,19 @@ <h3 id="dialogTitle">
           class="cx-dialog-separator col-sm-12 d-xs-block d-sm-block d-md-none"
         ></div>
       </div>
+
+      <ng-container *cxFeature="'a11yAnonymousConsentMessageInDialog'">
+        <div class="cx-dialog-message" aria-live="assertive" aria-atomic="true">
+          <cx-message
+            *ngIf="message$ | async as message"
+            [text]="message.key | cxTranslate"
+            [type]="message.type"
+            [isVisibleCloseButton]="true"
+            (closeMessage)="closeMessage()"
+            [cxFocus]="{ autofocus: '.cx-message' }"
+          ></cx-message>
+        </div>
+      </ng-container>
       <!-- Actions -->
       <div class="cx-dialog-buttons">
         <ng-container *cxFeature="'a11yUseButtonsForBtnLinks'">
diff --git a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.spec.ts b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.spec.ts
index ccacc98c671..b66b4af24d5 100644
--- a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.spec.ts
+++ b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.spec.ts
@@ -374,6 +374,14 @@ describe('AnonymousConsentsDialogComponent', () => {
     });
   });
 
+  describe('closeMessage', () => {
+    it('should reset message$ subject', () => {
+      spyOn(component.message$, 'next').and.stub();
+      component.closeMessage();
+      expect(component.message$.next).toHaveBeenCalledWith(null);
+    });
+  });
+
   describe('ngOnDestroy', () => {
     it('should call unsubscribe', () => {
       spyOn<any>(component['subscriptions'], 'unsubscribe').and.stub();
diff --git a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.ts b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.ts
index 0343921e4c7..f4c9aa07422 100644
--- a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.ts
+++ b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consent-dialog.component.ts
@@ -7,7 +7,6 @@
 import {
   Component,
   ElementRef,
-  HostBinding,
   HostListener,
   inject,
   OnDestroy,
@@ -24,7 +23,7 @@ import {
   GlobalMessageType,
   useFeatureStyles,
 } from '@spartacus/core';
-import { combineLatest, Observable, Subscription } from 'rxjs';
+import { combineLatest, Observable, Subject, Subscription } from 'rxjs';
 import { distinctUntilChanged, take, tap } from 'rxjs/operators';
 import { ICON_TYPE } from '../../../cms-components/misc/icon/index';
 import { FocusConfig } from '../../../layout/a11y/keyboard-focus/index';
@@ -35,9 +34,6 @@ import { LaunchDialogService } from '../../../layout/launch-dialog/services/laun
   templateUrl: './anonymous-consent-dialog.component.html',
 })
 export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
-  @HostBinding('attr.role') role = 'dialog';
-  @HostBinding('attr.aria-modal') modal = true;
-
   private subscriptions = new Subscription();
   private featureConfigService = inject(FeatureConfigService);
 
@@ -59,6 +55,8 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
   @Optional() globalMessageService = inject(GlobalMessageService, {
     optional: true,
   });
+  globalMessageType = GlobalMessageType;
+  message$ = new Subject<{ type: GlobalMessageType; key: string } | null>();
 
   @HostListener('click', ['$event'])
   handleClick(event: UIEvent): void {
@@ -83,6 +81,7 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
     }
     useFeatureStyles('a11yUseButtonsForBtnLinks');
     useFeatureStyles('a11yExpandedFocusIndicator');
+    useFeatureStyles('a11yAnonymousConsentMessageInDialog');
   }
 
   ngOnInit(): void {
@@ -121,7 +120,13 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
         )
         .subscribe(() => this.onConsentWithdrawnSuccess())
     );
-    this.close('rejectAll');
+    if (
+      !this.featureConfigService.isEnabled(
+        'a11yAnonymousConsentMessageInDialog'
+      )
+    ) {
+      this.close('rejectAll');
+    }
   }
 
   allowAll(): void {
@@ -151,7 +156,13 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
         )
         .subscribe(() => this.onConsentGivenSuccess())
     );
-    this.close('allowAll');
+    if (
+      !this.featureConfigService.isEnabled(
+        'a11yAnonymousConsentMessageInDialog'
+      )
+    ) {
+      this.close('allowAll');
+    }
   }
 
   private isRequiredConsent(template: ConsentTemplate): boolean {
@@ -194,6 +205,13 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
 
   protected onConsentGivenSuccess(): void {
     if (
+      this.featureConfigService.isEnabled('a11yAnonymousConsentMessageInDialog')
+    ) {
+      this.message$.next({
+        type: GlobalMessageType.MSG_TYPE_CONFIRMATION,
+        key: 'consentManagementForm.message.success.given',
+      });
+    } else if (
       this.featureConfigService.isEnabled('a11yNotificationsOnConsentChange')
     ) {
       this.globalMessageService?.add(
@@ -205,6 +223,13 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
 
   protected onConsentWithdrawnSuccess(): void {
     if (
+      this.featureConfigService.isEnabled('a11yAnonymousConsentMessageInDialog')
+    ) {
+      this.message$.next({
+        type: GlobalMessageType.MSG_TYPE_CONFIRMATION,
+        key: 'consentManagementForm.message.success.withdrawn',
+      });
+    } else if (
       this.featureConfigService.isEnabled('a11yNotificationsOnConsentChange')
     ) {
       this.globalMessageService?.add(
@@ -214,6 +239,10 @@ export class AnonymousConsentDialogComponent implements OnInit, OnDestroy {
     }
   }
 
+  closeMessage(): void {
+    this.message$.next(null);
+  }
+
   ngOnDestroy(): void {
     this.subscriptions.unsubscribe();
   }
diff --git a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consents-dialog.module.ts b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consents-dialog.module.ts
index 3d9bd409473..879917f4cf1 100644
--- a/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consents-dialog.module.ts
+++ b/projects/storefrontlib/shared/components/anonymous-consents-dialog/anonymous-consents-dialog.module.ts
@@ -9,6 +9,7 @@ import { NgModule } from '@angular/core';
 import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import { IconModule } from '../../../cms-components/misc/icon/icon.module';
 import { ConsentManagementModule } from '../../../cms-components/myaccount/consent-management/consent-management.module';
+import { MessageComponentModule } from '../../../cms-components/misc/message';
 import { KeyboardFocusModule } from '../../../layout/a11y/keyboard-focus/index';
 import { SpinnerModule } from '../spinner/spinner.module';
 import { AnonymousConsentDialogComponent } from './anonymous-consent-dialog.component';
@@ -22,6 +23,7 @@ import { AnonymousConsentDialogComponent } from './anonymous-consent-dialog.comp
     ConsentManagementModule,
     KeyboardFocusModule,
     FeaturesConfigModule,
+    MessageComponentModule,
   ],
   declarations: [AnonymousConsentDialogComponent],
   exports: [AnonymousConsentDialogComponent],
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.html b/projects/storefrontlib/shared/components/carousel/carousel.component.html
index 74fcf0e9779..23759f3e7e7 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.html
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.html
@@ -96,11 +96,7 @@ <h2 *ngIf="title">{{ title }}</h2>
     </ng-container>
   </div>
 
-  <div
-    *ngIf="!hideIndicators && size < items.length"
-    role="tablist"
-    class="indicators"
-  >
+  <div *ngIf="!hideIndicators && size < items.length" class="indicators">
     <ng-container *ngFor="let _ of items; let i = index">
       <!-- TODO: (CXSPA-6904) - Remove feature flag next major release -->
       <ng-container *cxFeature="'a11yFocusableCarouselControls'">
@@ -125,7 +121,6 @@ <h2 *ngIf="title">{{ title }}</h2>
                     numberOfSlides: size,
                   }
           "
-          role="tab"
         >
           <cx-icon [type]="indicatorIcon" aria-hidden="true"></cx-icon>
         </button>
diff --git a/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html b/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html
index 6e64febc82b..132c9e0c384 100644
--- a/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html
+++ b/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html
@@ -8,11 +8,14 @@
   (change)="change()"
   [placeholder]="placeholder"
   [pattern]="pattern"
+  [attr.aria-describedby]="'controlError'"
 />
 
 <!-- TODO: (CXSPA-7315) Remove feature toggle in the next major -->
 <cx-form-errors
   *cxFeature="'formErrorsDescriptiveMessages'"
+  id="controlError"
+  aria-live="off"
   [control]="control"
   prefix="formErrors.labeled.date"
   fallbackPrefix="formErrors.date"
diff --git a/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts b/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts
index a8ddb2e8f66..0636acf9f75 100644
--- a/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts
+++ b/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts
@@ -40,6 +40,10 @@ export class NgSelectA11yDirective implements AfterViewInit {
    */
   @Input() cxNgSelectA11y: { ariaLabel?: string; ariaControls?: string };
 
+  //TODO: CXSPA-9005: Remove this property in next major release
+  /**
+   * @deprecated since 2211.33
+   */
   protected translationService = inject(TranslationService);
   protected domSanitizer = inject(DomSanitizer);
   protected selectComponent = inject(NgSelectComponent);
@@ -47,6 +51,10 @@ export class NgSelectA11yDirective implements AfterViewInit {
   private featureConfigService = inject(FeatureConfigService);
 
   @HostListener('open')
+  //TODO: CXSPA-9005: Remove this method in next major release
+  /**
+   * @deprecated since 2211.33
+   */
   onOpen() {
     if (!this.featureConfigService?.isEnabled('a11yNgSelectOptionsCount')) {
       return;
@@ -137,6 +145,10 @@ export class NgSelectA11yDirective implements AfterViewInit {
     }
   }
 
+  //TODO: CXSPA-9005: Remove this method in next major release
+  /**
+   * @deprecated since 2211.33
+   */
   appendAriaLabelToOptions(
     _changes: MutationRecord[],
     observerInstance: MutationObserver
diff --git a/projects/storefrontlib/shared/components/popover/popover.directive.ts b/projects/storefrontlib/shared/components/popover/popover.directive.ts
index 256660049d5..c5d32d5402c 100644
--- a/projects/storefrontlib/shared/components/popover/popover.directive.ts
+++ b/projects/storefrontlib/shared/components/popover/popover.directive.ts
@@ -225,8 +225,16 @@ export class PopoverDirective implements OnInit {
         this.cxPopoverOptions?.autoPositioning;
 
       if (this.cxPopoverOptions?.appendToBody) {
+        const body = this.winRef.document.body;
+        const element = this.featureConfigService?.isEnabled(
+          'a11yPopoverHighContrast'
+        )
+          ? // we need to select first child element if exists,
+            // otherwise HCT theming in popover will not be picked up.
+            (body.firstElementChild ?? body)
+          : body;
         this.renderer.appendChild(
-          this.winRef.document.body,
+          element,
           this.popoverContainer.location.nativeElement
         );
       }
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index 29521406a88..a343f4720c0 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/styles",
-  "version": "2211.32.0-1",
+  "version": "2211.32.0",
   "description": "Style library containing global styles",
   "keywords": [
     "spartacus",
@@ -18,7 +18,7 @@
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.7.2",
     "@ng-select/ng-select": "^13.9.1",
     "bootstrap": "^4.6.2"
diff --git a/projects/storefrontstyles/scss/components/content/navigation/_scroll-to-top.scss b/projects/storefrontstyles/scss/components/content/navigation/_scroll-to-top.scss
index 7828e563f4d..deeb4cdda3b 100644
--- a/projects/storefrontstyles/scss/components/content/navigation/_scroll-to-top.scss
+++ b/projects/storefrontstyles/scss/components/content/navigation/_scroll-to-top.scss
@@ -12,12 +12,6 @@
     animation: popup 1s 1;
   }
 
-  @include forFeature('a11yScrollToTopPositioning') {
-    &:has(.elevated-position) {
-      bottom: 180px;
-    }
-  }
-
   button {
     height: inherit;
     width: inherit;
diff --git a/projects/storefrontstyles/scss/components/content/tab/_tab.scss b/projects/storefrontstyles/scss/components/content/tab/_tab.scss
index f6cad2b2917..64a176b4774 100644
--- a/projects/storefrontstyles/scss/components/content/tab/_tab.scss
+++ b/projects/storefrontstyles/scss/components/content/tab/_tab.scss
@@ -104,6 +104,7 @@
       background-color: var(--cx-tab-btn-bg-color);
       border: var(--cx-tab-btn-border);
       border-radius: var(--cx-tab-btn-border-radius);
+      color: inherit;
     }
   }
 
@@ -119,6 +120,7 @@
       text-align: start;
       height: 63px;
       position: relative;
+      color: inherit;
 
       &:before {
         margin: 0px 15px;
diff --git a/projects/storefrontstyles/scss/components/layout/_storefront.scss b/projects/storefrontstyles/scss/components/layout/_storefront.scss
index 8f41db5f972..3ef6ec0cadd 100644
--- a/projects/storefrontstyles/scss/components/layout/_storefront.scss
+++ b/projects/storefrontstyles/scss/components/layout/_storefront.scss
@@ -35,6 +35,12 @@
         box-shadow: 0 0 0 0;
       }
     }
+
+    @include forFeature('a11yKeyboardFocusInSearchBox') {
+      :focus-within {
+        --cx-visual-focus-width: 0;
+      }
+    }
   }
 
   main {
@@ -42,4 +48,13 @@
       background-color: var(--cx-color-background);
     }
   }
+
+  &.cx-theme-high-contrast-dark,
+  &.cx-theme-high-contrast-light {
+    @media (forced-colors: active) {
+      // Prevents forced colors from being applied while Spartacus contrast themes are active.
+      // This prevents interference with the contrast themes yet still allows the default one to be modified.
+      forced-color-adjust: none !important;
+    }
+  }
 }
diff --git a/projects/storefrontstyles/scss/components/misc/popover/_popover.scss b/projects/storefrontstyles/scss/components/misc/popover/_popover.scss
index 7098be1208e..4708af828ac 100644
--- a/projects/storefrontstyles/scss/components/misc/popover/_popover.scss
+++ b/projects/storefrontstyles/scss/components/misc/popover/_popover.scss
@@ -209,4 +209,14 @@
       font-size: 1rem;
     }
   }
+
+  @include cx-highContrastTheme {
+    background-color: var(--cx-color-background);
+    box-shadow: none;
+    .popover-body > .cx-close-row {
+      .close {
+        color: var(--cx-color-text);
+      }
+    }
+  }
 }
diff --git a/projects/storefrontstyles/scss/components/myaccount/_index.scss b/projects/storefrontstyles/scss/components/myaccount/_index.scss
index ba7a3d4de36..e922e308cc5 100644
--- a/projects/storefrontstyles/scss/components/myaccount/_index.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/_index.scss
@@ -9,12 +9,13 @@
 @import './my-coupons';
 @import './my-coupons-card';
 @import './my-coupons-dialog';
+@import './my-claim-dialog';
 @import './my-interests';
 @import './cx-my-account-v2-notification-preference';
 
 $myaccount-components-allowlist: cx-anonymous-consent-management-banner,
   cx-anonymous-consent-dialog, cx-anonymous-consent-open-dialog,
   cx-consent-management-form, cx-consent-management, cx-my-interests,
-  cx-my-coupons, cx-coupon-card, cx-coupon-dialog, cx-payment-methods,
-  cx-my-account-v2-notification-preference,
+  cx-my-coupons, cx-coupon-card, cx-coupon-dialog, cx-claim-dialog,
+  cx-payment-methods, cx-my-account-v2-notification-preference,
   cx-my-account-v2-consent-management-form, cx-my-account-v2-consent-management !default;
diff --git a/projects/storefrontstyles/scss/components/myaccount/_my-claim-dialog.scss b/projects/storefrontstyles/scss/components/myaccount/_my-claim-dialog.scss
new file mode 100644
index 00000000000..87fa3a320c8
--- /dev/null
+++ b/projects/storefrontstyles/scss/components/myaccount/_my-claim-dialog.scss
@@ -0,0 +1,65 @@
+%cx-claim-dialog {
+  background-color: rgba(0, 0, 0, 0.5);
+  .cx-coupon-dialog {
+    @extend .modal-dialog;
+    @extend .modal-dialog-centered;
+    @extend .modal-lg;
+
+    .cx-coupon-container {
+      @extend .modal-content;
+      .cx-dialog-item {
+        padding-inline-end: 1.75rem;
+        padding-inline-start: 1.75rem;
+      }
+
+      .cx-dialog-header {
+        padding-top: 2rem;
+        padding-inline-end: 1.75rem;
+        padding-bottom: 0.85rem;
+        padding-inline-start: 5.75rem;
+        border-width: 0;
+        @include cx-highContrastTheme {
+          background-color: var(--cx-color-background);
+        }
+      }
+
+      .cx-dialog-title {
+        @include type('3');
+      }
+
+      .cx-dialog-body {
+        padding-top: 1rem;
+        padding-inline-end: 5.75rem;
+        padding-bottom: 0;
+        padding-inline-start: 5.75rem;
+        @include media-breakpoint-down(sm) {
+          padding: 0;
+        }
+        @include cx-highContrastTheme {
+          background-color: var(--cx-color-background);
+        }
+      }
+
+      .cx-dialog-row {
+        margin: 0;
+        display: flex;
+        padding: 0 0 2.875rem;
+        max-width: 100%;
+        margin-top: 2.875rem;
+        margin-bottom: 1.5rem;
+
+        @include media-breakpoint-down(sm) {
+          padding: 0;
+        }
+      }
+
+      .cx-dialog-row--reset-button {
+        padding: 0 12px 0 0;
+      }
+
+      .cx-dialog-row-submit-button {
+        padding: 0 0 0 12px;
+      }
+    }
+  }
+}
diff --git a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss
index 7f070c10926..487e6b82399 100644
--- a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss
@@ -40,6 +40,16 @@
         }
       }
 
+      @include forFeature('a11yAnonymousConsentMessageInDialog') {
+        .cx-dialog-message {
+          padding: 1.5rem 1.75rem 0;
+
+          .cx-message {
+            margin: 0;
+          }
+        }
+      }
+
       .cx-action-link {
         margin: 0 0.35rem;
 
diff --git a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-management-banner.scss b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-management-banner.scss
index 52dc1cca21c..747c614fdd1 100644
--- a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-management-banner.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-management-banner.scss
@@ -50,4 +50,10 @@
       background-color: var(--cx-color-background);
     }
   }
+
+  @include forFeature('a11yScrollToTopPositioning') {
+    &:has(.anonymous-consent-banner) ~ cx-scroll-to-top {
+      bottom: 180px;
+    }
+  }
 }
diff --git a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss
index 536a752051f..c7bdec2fa9a 100644
--- a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss
@@ -3,10 +3,17 @@
   justify-content: center;
   margin: 0 3vw 3vw 3vw;
 
+  @include forFeature('a11yHideConsentButtonWhenBannerVisible') {
+    margin: 0;
+  }
+
   @include media-breakpoint-down(sm) {
     justify-content: flex-start;
   }
   .btn-link {
+    @include forFeature('a11yHideConsentButtonWhenBannerVisible') {
+      margin: 1.5vw 3vw;
+    }
     padding: 0;
     color: var(--cx-color-inverse);
     font-size: 0.875rem;
diff --git a/projects/storefrontstyles/scss/components/product/_star-rating.scss b/projects/storefrontstyles/scss/components/product/_star-rating.scss
index 28638f69f02..8db7d2975be 100644
--- a/projects/storefrontstyles/scss/components/product/_star-rating.scss
+++ b/projects/storefrontstyles/scss/components/product/_star-rating.scss
@@ -24,7 +24,7 @@
           var(--cx-color-primary) 0%,
           var(--cx-color-primary)
             calc((var(--star-fill, 0) - #{$i} + 1) * 100%),
-          var(--cx-color-medium) calc((var(--star-fill, 0) - #{$i} + 1) * 100%)
+          var(--cx-color-dark) calc((var(--star-fill, 0) - #{$i} + 1) * 100%)
         );
         // somehow we cannot move the text related clip and fill color outside this loop.
         // most likely they cannot come before the definition of the background.
diff --git a/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss b/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss
index ffa90d27442..57c9982c329 100644
--- a/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss
+++ b/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss
@@ -206,33 +206,6 @@
     }
   }
 
-  @mixin carousel-native-high-contrast {
-    @media (forced-colors: active) {
-      .indicators button .cx-icon {
-        forced-color-adjust: none;
-        background-color: Canvas;
-        border-color: CanvasText;
-        color: Canvas;
-      }
-
-      .indicators button[disabled] {
-        .cx-icon {
-          color: CanvasText;
-          background-color: Canvas;
-          padding: 2px;
-        }
-      }
-
-      .indicators button[aria-disabled='true'] {
-        .cx-icon {
-          color: CanvasText;
-          background-color: Canvas;
-          padding: 4px;
-        }
-      }
-    }
-  }
-
   @include cx-highContrastTheme {
     .indicators {
       button {
@@ -259,7 +232,5 @@
       background-color: var(--cx-color-dark);
       border: 3px solid var(--cx-color-dark);
     }
-
-    @include carousel-native-high-contrast;
   }
 }
diff --git a/projects/storefrontstyles/scss/components/product/list/_facet-list.scss b/projects/storefrontstyles/scss/components/product/list/_facet-list.scss
index e84ab9ed833..ba518fe646e 100644
--- a/projects/storefrontstyles/scss/components/product/list/_facet-list.scss
+++ b/projects/storefrontstyles/scss/components/product/list/_facet-list.scss
@@ -163,4 +163,10 @@ body.modal-open {
       height: 95%;
     }
   }
+
+  @include cx-highContrastTheme-dark {
+    .inner cx-tab .tab-btn {
+      color: var(--cx-color-text);
+    }
+  }
 }
diff --git a/projects/storefrontstyles/scss/components/product/list/_facet.scss b/projects/storefrontstyles/scss/components/product/list/_facet.scss
index 477df36bc48..d5ac839423f 100644
--- a/projects/storefrontstyles/scss/components/product/list/_facet.scss
+++ b/projects/storefrontstyles/scss/components/product/list/_facet.scss
@@ -181,41 +181,11 @@ $intialExpandedFacetsLarge: 3 !default;
       background-color: var(--cx-color-primary);
       border-color: var(--cx-color-primary);
       color: var(--cx-color-inverse);
-    }
-  }
 
-  @mixin native-high-contrast-fix {
-    @media (forced-colors: active) {
-      a,
-      button {
-        color: CanvasText;
-        &.value:hover {
-          color: LinkText;
-        }
-      }
-
-      &.multi-select a.value {
-        forced-color-adjust: none;
-        &:hover {
-          &:not(.selected)::before {
-            border-color: LinkText;
-          }
-        }
-        &::before {
-          border: solid 2px CanvasText;
-        }
-        &.selected::before {
-          background-color: Canvas;
-          border-color: CanvasText;
-          color: CanvasText;
-        }
+      @include cx-highContrastTheme-dark {
+        background-color: transparent;
+        border-color: var(--cx-color-dark);
       }
     }
   }
-
-  @include native-high-contrast-fix;
-
-  @include cx-highContrastTheme {
-    @include native-high-contrast-fix;
-  }
 }
diff --git a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
index 9e8d96fe39a..4c5624a83ee 100644
--- a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
+++ b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
@@ -279,6 +279,12 @@
       padding-bottom: 6px;
       padding-inline-start: 10px;
 
+      @include forFeature('a11yKeyboardFocusInSearchBox') {
+        &:focus-within {
+          @include visible-focus();
+        }
+      }
+
       @include media-breakpoint-up(md) {
         border: 1px solid var(--cx-color-medium);
         width: 27vw;
@@ -295,6 +301,13 @@
         background-color: var(--cx-color-inverse);
         z-index: 20;
         padding-top: 25px;
+
+        @include forFeature('a11yKeyboardFocusInSearchBox') {
+          &:focus-within {
+            padding: 27px 10px 8px;
+            outline: 0;
+          }
+        }
       }
     }
 
@@ -310,6 +323,12 @@
         height: 48px;
         border: 1px solid var(--cx-color-medium);
         border-radius: 4px;
+
+        @include forFeature('a11yKeyboardFocusInSearchBox') {
+          &:focus {
+            @include visible-focus();
+          }
+        }
       }
 
       flex-basis: 100%;
@@ -920,10 +939,5 @@
         border: 1px solid var(--cx-color-text);
       }
     }
-
-    // native high contrast themes fix
-    @media (forced-colors: active) {
-      border-color: Canvas;
-    }
   }
 }
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss b/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss
index 7dc1fe1fef3..27e9fbecb97 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss
@@ -337,3 +337,12 @@ button,
     @include visible-focus();
   }
 }
+
+// override opacity of bootstrap .close class
+button.close:not(:disabled):not(.disabled) {
+  @include forFeature('a11yImproveContrast') {
+    &:focus {
+      opacity: 1;
+    }
+  }
+}
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/forms.scss b/projects/storefrontstyles/scss/cxbase/blocks/forms.scss
index e74ee9f3d7c..d8d0512a6ae 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/forms.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/forms.scss
@@ -510,8 +510,10 @@ form {
 }
 
 input[cxpasswordvisibilityswitch] {
-  @include forFeature('a11yPasswordVisibilityBtnValueOverflow') {
-    $password-visibility-btn-width: 30px;
-    padding-inline-end: calc($password-visibility-btn-width + $input-padding-x);
+  @include forFeature('a11yPasswordVisibliltyBtnValueOverflow') {
+    $password-visibbility-btn-width: 30px;
+    padding-inline-end: calc(
+      $password-visibbility-btn-width + $input-padding-x
+    );
   }
 }
diff --git a/tools/config/const.ts b/tools/config/const.ts
index 0dd3e174e20..fb6204788a3 100644
--- a/tools/config/const.ts
+++ b/tools/config/const.ts
@@ -10,4 +10,4 @@ export const SPARTACUS_SCOPE = '@spartacus';
 export const SAP_SCOPE = 'sap';
 export const SAPUI5_TYPES = '@sapui5/ts-types-esm';
 export const SPARTACUS_SCHEMATICS = `${SPARTACUS_SCOPE}/schematics`;
-export const PUBLISHING_VERSION = '2211.32.0-1';
+export const PUBLISHING_VERSION = '2211.32.0';
diff --git a/tools/schematics/testing.ts b/tools/schematics/testing.ts
index cfe645cfbbd..8432e027a82 100644
--- a/tools/schematics/testing.ts
+++ b/tools/schematics/testing.ts
@@ -173,13 +173,13 @@ function buildSchematicsAndPublish(buildCmd: string): void {
 
 function testAllSchematics(): void {
   try {
-    execSync('npm --prefix projects/schematics run test --coverage', {
+    execSync('npm --prefix projects/schematics run test --coverage -- -u', {
       stdio: 'inherit',
     });
 
     featureLibsFolders.forEach((lib) =>
       execSync(
-        `npm --prefix feature-libs/${lib} run test:schematics --coverage`,
+        `npm --prefix feature-libs/${lib} run test:schematics --coverage -- -u`,
         {
           stdio: 'inherit',
         }
@@ -187,7 +187,7 @@ function testAllSchematics(): void {
     );
     integrationLibsFolders.forEach((lib) =>
       execSync(
-        `npm --prefix integration-libs/${lib} run test:schematics --coverage`,
+        `npm --prefix integration-libs/${lib} run test:schematics --coverage -- -u`,
         {
           stdio: 'inherit',
         }