diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index 84a5eeffcdf..4ae815b9507 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -21,10 +21,10 @@
   "peerDependencies": {
     "@angular/core": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/user": "2211.29.1"
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/user": "2211.30.0"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index 9574a9aa1e4..4c4baa7b85a 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/asm/styles/components/_asm-main-ui.component.scss b/feature-libs/asm/styles/components/_asm-main-ui.component.scss
index 0a7904be848..665cf0b3922 100644
--- a/feature-libs/asm/styles/components/_asm-main-ui.component.scss
+++ b/feature-libs/asm/styles/components/_asm-main-ui.component.scss
@@ -89,8 +89,6 @@
 
   // Top Bar
   .asm-bar {
-    color: #fff;
-    background-color: #354a5f;
     height: 48px;
     display: flex;
     padding: 0 2rem;
diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
index 32c3a4ce8fc..13736b488c1 100644
--- a/feature-libs/asm/styles/components/_customer-selection.component.scss
+++ b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -41,7 +41,6 @@
 
       @media (min-width: 575px) {
         margin-inline-end: 15px;
-        min-width: 20rem;
         margin-bottom: 0;
         min-width: 25rem;
       }
diff --git a/feature-libs/cart/base/styles/components/_item-counter.scss b/feature-libs/cart/base/styles/components/_item-counter.scss
index f6cf1219c9c..bb6057d907a 100644
--- a/feature-libs/cart/base/styles/components/_item-counter.scss
+++ b/feature-libs/cart/base/styles/components/_item-counter.scss
@@ -13,6 +13,7 @@
       -moz-appearance: textfield;
     }
   }
+
   &.readonly {
     button {
       display: none;
@@ -77,8 +78,17 @@
       font-weight: var(--cx-font-weight-bold);
     }
 
+    // TODO: The styles for ":disabled" selector should be deleted when "a11yItemCounterFocus" feature flag has been removed
     &:disabled {
       color: var(--cx-color-light);
+      cursor: not-allowed;
+    }
+
+    @include forFeature('a11yItemCounterFocus') {
+      &[aria-disabled='true'] {
+        color: var(--cx-color-light);
+        cursor: not-allowed;
+      }
     }
 
     @include forFeature('a11yImproveContrast') {
@@ -90,9 +100,15 @@
       &:focus {
         box-shadow: 0 0 0 0;
       }
+      // TODO: The styles for ":disabled" selector should be deleted when "a11yItemCounterFocus" feature flag has been removed
       &:disabled {
         color: var(--cx-color-dark);
       }
+      @include forFeature('a11yItemCounterFocus') {
+        &[aria-disabled='true'] {
+          color: var(--cx-color-dark);
+        }
+      }
     }
   }
 
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index 7412f1aa97d..ded55aa678a 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index 9daf3db9284..4635d3d663f 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,13 +32,13 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
index 961a71778f7..0229a6cd409 100644
--- a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
@@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -514,7 +514,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 33e486a7fb7..d81d93ac357 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.29.1",
+  "version": "2211.30.0",
   "description": "Customer-Ticketing library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,11 +30,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
index e18895481f0..371912a56b9 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.29.1",
+  "version": "2211.30.0",
   "description": "Estimated Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index 8798cb04477..d182eeb9661 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Order feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/pdf-invoices": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/pdf-invoices": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index 7387a6f25f7..01977428897 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Organization library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
index b8925bd05a0..8b4cfc1d92d 100644
--- a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -270,7 +270,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -489,7 +489,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -708,7 +708,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -927,7 +927,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index c944f8991a0..ea58c701722 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.29.1",
+  "version": "2211.30.0",
   "description": "Invoices library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index 38d9a4f5de3..4d72dc25bc7 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.29.1",
+  "version": "2211.30.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index 08be7486e2b..87b3717aded 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.29.1",
+  "version": "2211.30.0",
   "description": "Product configurator feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.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.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.spec.ts
index ec6728bd71d..11512ee1324 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.spec.ts
@@ -241,6 +241,7 @@ describe('ConfiguratorAttributeMultiSelectionImageComponent', () => {
     expect(description.nativeElement.innerText).toBe(
       (component.attribute.values ?? [{ description: '' }])[1]?.description
     );
+    infoButton.click(); // hide popover after test again
   });
 
   it('should mark two values as selected', () => {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
index 47746608851..fb1a21c26d0 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
@@ -222,6 +222,7 @@ describe('ConfiguratorAttributeSingleSelectionImageComponent', () => {
     expect(description.nativeElement.innerText).toBe(
       (component.attribute.values ?? [{}])[1].description
     );
+    infoButton.click(); // hide popover after test again
   });
 
   it('should init with val3', () => {
diff --git a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts
index d1bb77eaa51..37efa156106 100644
--- a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts
@@ -31,6 +31,7 @@ import { productConfiguration } from '../../testing/configurator-test-data';
 import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
 import { ConfiguratorAttributeHeaderComponent } from '../attribute/header/configurator-attribute-header.component';
 import { ConfiguratorFormComponent } from './configurator-form.component';
+import { KeyboardFocusService } from '@spartacus/storefront';
 
 @Component({
   selector: 'cx-configurator-group',
@@ -258,6 +259,7 @@ let component: ConfiguratorFormComponent;
 let htmlElem: HTMLElement;
 let configExpertModeService: ConfiguratorExpertModeService;
 let hasConfigurationConflictsObservable: Observable<boolean> = EMPTY;
+let keyboardFocusService: KeyboardFocusService;
 
 describe('ConfigurationFormComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -347,6 +349,10 @@ describe('ConfigurationFormComponent', () => {
       LaunchDialogService as Type<LaunchDialogService>
     );
     spyOn(launchDialogService, 'openDialogAndSubscribe').and.callThrough();
+    keyboardFocusService = TestBed.inject(
+      KeyboardFocusService as Type<KeyboardFocusService>
+    );
+    spyOn(keyboardFocusService, 'clear').and.callThrough();
   });
 
   describe('resolve issues navigation', () => {
@@ -421,6 +427,14 @@ describe('ConfigurationFormComponent', () => {
     });
   });
 
+  it('should reset persisted focus when UI is opened without resolve issue mode', () => {
+    routerStateObservable = mockRouterStateWithQueryParams({
+      resolveIssues: 'false',
+    });
+    createComponentWithData();
+    expect(keyboardFocusService.clear).toHaveBeenCalledTimes(1);
+  });
+
   describe('Rendering', () => {
     it('should render ghost view if no data is present', () => {
       createComponentWithoutData();
diff --git a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
index 580b92349af..fbc0a2a2ee6 100644
--- a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
@@ -9,13 +9,18 @@ import {
   Component,
   OnDestroy,
   OnInit,
+  inject,
 } from '@angular/core';
 import { GlobalMessageService, GlobalMessageType } from '@spartacus/core';
 import {
   ConfiguratorRouter,
   ConfiguratorRouterExtractorService,
 } from '@spartacus/product-configurator/common';
-import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
+import {
+  LAUNCH_CALLER,
+  LaunchDialogService,
+  KeyboardFocusService,
+} from '@spartacus/storefront';
 import { Observable, Subscription } from 'rxjs';
 import {
   delay,
@@ -38,6 +43,7 @@ import { ConfiguratorExpertModeService } from '../../core/services/configurator-
 export class ConfiguratorFormComponent implements OnInit, OnDestroy {
   protected subscription = new Subscription();
 
+  protected keyboardFocusService = inject(KeyboardFocusService);
   routerData$: Observable<ConfiguratorRouter.Data> =
     this.configRouterExtractorService.extractRouterData();
 
@@ -157,6 +163,9 @@ export class ConfiguratorFormComponent implements OnInit, OnDestroy {
               );
             }
           });
+      } else {
+        // Clear persisted focus before entering the configurator UI
+        this.keyboardFocusService.clear();
       }
 
       if (routingData.expMode) {
diff --git a/feature-libs/product-configurator/rulebased/components/overview-menu/configurator-overview-menu.component.spec.ts b/feature-libs/product-configurator/rulebased/components/overview-menu/configurator-overview-menu.component.spec.ts
index 704f18c8073..f9f4ef3483a 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-menu/configurator-overview-menu.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-menu/configurator-overview-menu.component.spec.ts
@@ -124,10 +124,6 @@ describe('ConfigurationOverviewMenuComponent', () => {
     }).compileComponents();
   }));
 
-  afterEach(() => {
-    document.body.removeChild(htmlElem);
-  });
-
   it('should create component', () => {
     initialize();
     expect(component).toBeDefined();
@@ -417,12 +413,6 @@ describe('ConfigurationOverviewMenuComponent', () => {
       initialize();
     });
 
-    afterEach(() => {
-      groups?.forEach((group: any) => {
-        ConfiguratorTestUtils.remove(group);
-      });
-    });
-
     it('should not get menu item to highlight because getElements method return undefined', () => {
       spyOn(configuratorStorefrontUtilsService, 'getElements').and.returnValue(
         undefined
@@ -435,10 +425,7 @@ describe('ConfigurationOverviewMenuComponent', () => {
     it('should not get menu item to highlight because getScrollY method return undefined', () => {
       groups = createElements('div');
 
-      document.querySelectorAll = jasmine
-        .createSpy('div.cx-group')
-        .and.returnValue(groups);
-
+      spyOn(document, 'querySelectorAll').and.returnValue(groups);
       spyOn(configuratorStorefrontUtilsService, 'getElements').and.returnValue(
         groups
       );
@@ -456,10 +443,7 @@ describe('ConfigurationOverviewMenuComponent', () => {
     it('should get menu item to highlight', () => {
       groups = createElements('div');
 
-      document.querySelectorAll = jasmine
-        .createSpy('div.cx-group')
-        .and.returnValue(groups);
-
+      spyOn(document, 'querySelectorAll').and.returnValue(groups);
       spyOn(configuratorStorefrontUtilsService, 'getElements').and.returnValue(
         groups
       );
diff --git a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
index c70316bcab7..2afd3a44e70 100644
--- a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.spec.ts
@@ -21,6 +21,23 @@ import { Configurator } from '../../core/model/configurator.model';
 import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
 import { ConfiguratorStorefrontUtilsService } from './configurator-storefront-utils.service';
 
+let mockedWindow: {
+  innerWidth?: number;
+  innerHeight?: number;
+  scrollY?: number;
+  scroll(): void;
+} = {
+  innerWidth: 1000,
+  innerHeight: 1000,
+  scrollY: 1000,
+  scroll() {},
+};
+class MockedWindowRef extends WindowRef {
+  get nativeWindow(): Window | undefined {
+    return this.isBrowser() ? <any>mockedWindow : undefined;
+  }
+}
+
 let isGroupVisited: Observable<boolean> = of(false);
 const testSelector = 'test-configurator-overview-menu';
 
@@ -119,7 +136,6 @@ describe('ConfiguratorStorefrontUtilsService', () => {
   );
   let windowRef: WindowRef;
   let keyboardFocusService: KeyboardFocusService;
-  let querySelectorOriginal: any;
 
   beforeEach(() => {
     mockRouterState.state.params.displayOnly = false;
@@ -148,22 +164,26 @@ describe('ConfiguratorStorefrontUtilsService', () => {
           provide: ProductConnector,
           useValue: MockProductConnector,
         },
+        { provide: WindowRef, useClass: MockedWindowRef },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
     classUnderTest = TestBed.inject(ConfiguratorStorefrontUtilsService);
     fixture = TestBed.createComponent(MockComponent);
     htmlElem = fixture.nativeElement;
-    windowRef = TestBed.inject(WindowRef as Type<WindowRef>);
+    windowRef = TestBed.inject(WindowRef);
+    mockedWindow.innerHeight = 1000;
+    mockedWindow.innerWidth = 1000;
+    mockedWindow.scrollY = 1000;
     keyboardFocusService = TestBed.inject(
       KeyboardFocusService as Type<KeyboardFocusService>
     );
-    querySelectorOriginal = document.querySelector;
   });
 
   afterEach(() => {
-    document.querySelector = querySelectorOriginal;
-    document.body.removeChild(htmlElem);
+    if (htmlElem) {
+      document.body.removeChild(htmlElem);
+    }
   });
 
   it('should be created', () => {
@@ -181,9 +201,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
 
   it('should scroll to element', () => {
     const theElement = document.createElement('div');
-    document.querySelector = jasmine
-      .createSpy('HTML Element')
-      .and.returnValue(theElement);
+    spyOn(windowRef.document, 'querySelector').and.returnValue(theElement);
     spyOn(theElement, 'getBoundingClientRect').and.returnValue(
       new DOMRect(100, 2000, 100, 100)
     );
@@ -315,9 +333,9 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       it('should delegate to keyboard focus service', () => {
         spyOn(windowRef, 'isBrowser').and.returnValue(true);
         const focusedElements = createFocusedElements('ATTR', 2, 3);
-        document.querySelector = jasmine
-          .createSpy('HTML Element')
-          .and.returnValue(focusedElements);
+        spyOn(windowRef.document, 'querySelector').and.returnValue(
+          focusedElements[0]
+        );
         spyOn(keyboardFocusService, 'findFocusable').and.returnValue(
           focusedElements
         );
@@ -327,9 +345,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
 
       it('should not delegate to keyboard focus service because form is undefined', () => {
         spyOn(windowRef, 'isBrowser').and.returnValue(true);
-        document.querySelector = jasmine
-          .createSpy('HTML Element')
-          .and.returnValue(undefined);
+        spyOn(windowRef.document, 'querySelector').and.returnValue(undefined);
         spyOn(keyboardFocusService, 'findFocusable').and.returnValue([]);
         classUnderTest.focusFirstActiveElement('elementSelector');
         expect(keyboardFocusService.findFocusable).toHaveBeenCalledTimes(0);
@@ -345,9 +361,9 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       it('should not delegate to keyboard focus service because keyboard focus service returns no focusable elements', () => {
         spyOn(windowRef, 'isBrowser').and.returnValue(true);
         const focusedElements = createFocusedElements('ATTR', 2, 3);
-        document.querySelector = jasmine
-          .createSpy('HTML Element')
-          .and.returnValue(focusedElements);
+        spyOn(windowRef.document, 'querySelector').and.returnValue(
+          focusedElements[0]
+        );
         spyOn(keyboardFocusService, 'findFocusable').and.returnValue([]);
         classUnderTest.focusFirstActiveElement('elementSelector');
         expect(keyboardFocusService.findFocusable).toHaveBeenCalledTimes(1);
@@ -401,9 +417,9 @@ describe('ConfiguratorStorefrontUtilsService', () => {
           .queryAll(By.css('label'))
           .map((el) => el.nativeNode);
 
-        document.querySelector = jasmine
-          .createSpy('HTML Element')
-          .and.returnValue(focusedElements);
+        spyOn(windowRef.document, 'querySelector').and.returnValue(
+          focusedElements
+        );
       });
 
       it('should not set focus because attribute does not contain any values', () => {
@@ -465,9 +481,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
         spyOn(keyboardFocusService, 'findFocusable').and.returnValue(
           focusedElements
         );
-        document.querySelector = jasmine
-          .createSpy('HTML Element')
-          .and.returnValue(undefined);
+        asSpy(windowRef.document.querySelector).and.returnValue(undefined);
 
         verify(focusedElements);
       });
@@ -533,9 +547,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
     it('should get HTML element based on query selector', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const theElement = document.createElement('elementMock');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(theElement);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(theElement);
 
       expect(classUnderTest.getElement('elementMock')).toEqual(theElement);
     });
@@ -544,9 +556,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
   describe('changeStyling', () => {
     it('should change styling of HTML element', () => {
       const theElement = document.createElement('elementMock');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(undefined);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(undefined);
 
       classUnderTest.changeStyling('elementMock', 'position', 'sticky');
       expect(theElement.style.position).not.toEqual('sticky');
@@ -554,9 +564,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
 
     it('should change styling of HTML element', () => {
       const theElement = document.createElement('elementMock');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(theElement);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(theElement);
 
       classUnderTest.changeStyling('elementMock', 'position', 'sticky');
       expect(theElement.style.position).toEqual('sticky');
@@ -568,9 +576,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const theElement = document.createElement('elementMock');
       theElement.style.position = 'sticky';
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(undefined);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(undefined);
 
       classUnderTest.removeStyling('elementMock', 'position');
       expect(theElement.style.position).toEqual('sticky');
@@ -580,9 +586,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const theElement = document.createElement('elementMock');
       theElement.style.position = 'sticky';
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(theElement);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(theElement);
 
       classUnderTest.removeStyling('elementMock', 'position');
       expect(theElement.style.position).toBe('');
@@ -612,9 +616,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const elements: Array<HTMLElement> = createElements('section', 10);
 
-      document.querySelectorAll = jasmine
-        .createSpy('section')
-        .and.returnValue(elements);
+      spyOn(document, 'querySelectorAll').and.returnValue(<any>elements);
 
       const htmlElements = classUnderTest.getElements('section');
 
@@ -634,7 +636,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
 
     it('should return number of pixels that the document is currently scrolled vertically', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
-      spyOnProperty(window, 'scrollY').and.returnValue(250);
+      mockedWindow.scrollY = 250;
       const nativeWindow = windowRef.nativeWindow;
       if (nativeWindow) {
         expect(classUnderTest.getVerticallyScrolledPixels()).toBe(250);
@@ -644,9 +646,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
 
   describe('hasScrollbar', () => {
     it('should return false because element is undefined', () => {
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(undefined);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(undefined);
 
       expect(classUnderTest.hasScrollbar('elementMock')).toBe(false);
     });
@@ -718,27 +718,25 @@ describe('ConfiguratorStorefrontUtilsService', () => {
         label.style.height = '10px';
       });
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(100);
+      mockedWindow.innerWidth = 100;
 
       expect(classUnderTest['isInViewport'](form)).toBe(false);
     });
 
-    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
-    xit("should return true because window's innerWith is known", () => {
+    it("should return true because window's innerWith is known", () => {
       form.style.display = 'flex';
       form.style.flexDirection = 'column';
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(1000);
+      mockedWindow.innerWidth = 1000;
 
       expect(classUnderTest['isInViewport'](form)).toBe(true);
     });
 
-    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
-    xit('should return true because clientWidth of element is known and its right is less than its width', () => {
+    it('should return true because clientWidth of element is known and its right is less than its width', () => {
       form.style.display = 'flex';
       form.style.flexDirection = 'column';
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(undefined);
+      mockedWindow.innerWidth = undefined;
 
       expect(classUnderTest['isInViewport'](form)).toBe(true);
     });
@@ -748,7 +746,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       form.style.flexDirection = 'column';
       form.style.height = '1000px';
 
-      spyOnProperty(window, 'innerHeight').and.returnValue(undefined);
+      mockedWindow.innerHeight = undefined;
 
       expect(classUnderTest['isInViewport'](form)).toBe(true);
     });
@@ -772,15 +770,14 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       expect(classUnderTest['getHeight']('unknown-query')).toBe(0);
     });
 
-    it('should return zero because form is not im viewport', () => {
-      spyOnProperty(window, 'innerWidth').and.returnValue(100);
+    it('should return zero because form is not in viewport', () => {
+      mockedWindow.innerWidth = 100;
 
       expect(classUnderTest['getHeight']('cx-configurator-form')).toBe(0);
     });
 
-    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
-    xit('should return offsetHeight of the element because form is not im viewport', () => {
-      spyOnProperty(window, 'innerWidth').and.returnValue(1000);
+    it('should return offsetHeight of the element because form is not in viewport', () => {
+      mockedWindow.innerWidth = 1000;
 
       expect(
         classUnderTest['getHeight']('cx-configurator-form')
@@ -811,7 +808,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       addToCart = document.createElement('cx-configurator-add-to-cart-button');
       document.body.append(addToCart);
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(1000);
+      mockedWindow.innerWidth = 1000;
     }
 
     it('should return zero because isBrowser is undefined', () => {
@@ -884,9 +881,7 @@ describe('ConfiguratorStorefrontUtilsService', () => {
     it('should not ensure visibility of the element', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(false);
       ovMenu = document.createElement('cx-configurator-overview-menu');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(ovMenu);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(ovMenu);
       classUnderTest.ensureElementVisible(
         'cx-configurator-overview-menu',
         undefined
@@ -995,4 +990,8 @@ describe('ConfiguratorStorefrontUtilsService', () => {
       expect(classUnderTest.isLastSelected('name', 'code')).toBe(false);
     });
   });
+
+  function asSpy(f: any) {
+    return <jasmine.Spy>f;
+  }
 });
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-suggestion.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-suggestion.scss
index 47e7ac84bc7..2437661eab5 100644
--- a/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-suggestion.scss
+++ b/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-suggestion.scss
@@ -28,7 +28,6 @@
 
   .cx-title {
     font-weight: bold;
-    padding-inline-start: 5px;
     padding-inline-end: 5px;
     padding-inline-start: 0px;
   }
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-group-menu.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-group-menu.scss
index 4871da8de53..1f7d30e7ae5 100644
--- a/feature-libs/product-configurator/rulebased/styles/_configurator-group-menu.scss
+++ b/feature-libs/product-configurator/rulebased/styles/_configurator-group-menu.scss
@@ -151,7 +151,6 @@
         text-decoration: none;
         color: var(--cx-color-text);
         border: none;
-        background-color: transparent;
         outline-offset: 0px;
         width: 100%;
 
diff --git a/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap b/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
index ab5c5789869..e5c6ebe52f0 100644
--- a/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
@@ -58,7 +58,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -307,7 +307,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -542,7 +542,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   })]
 })
diff --git a/feature-libs/product-multi-dimensional/package.json b/feature-libs/product-multi-dimensional/package.json
index 5dc40ed7785..7681f1c4d0d 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.29.1",
+  "version": "2211.30.0",
   "description": "Product Multi-Dimensional library for Spartacus",
   "keywords": [
     "spartacus",
@@ -31,10 +31,10 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index 70305724696..5ce0f22e7da 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Product library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap b/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
index 955ea4a76a1..cf9c46834c9 100644
--- a/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -270,7 +270,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index a90c743abd5..7d2f045fd0f 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/qualtrics",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Qualtrics library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,9 +30,9 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts b/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts
index f58273d61e7..dbeb4c399ba 100644
--- a/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts
+++ b/feature-libs/quote/core/services/quote-storefront-utils.service.spec.ts
@@ -1,8 +1,20 @@
 import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { WindowRef } from '@spartacus/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { WindowRef } from '@spartacus/core';
 import { QuoteStorefrontUtilsService } from './quote-storefront-utils.service';
 
+const mockedWindowTemplate: { innerWidth?: number; innerHeight?: number } = {
+  innerWidth: 1000,
+  innerHeight: 1000,
+};
+
+let mockedWindow = mockedWindowTemplate;
+class MockedWindowRef extends WindowRef {
+  get nativeWindow(): Window | undefined {
+    return this.isBrowser() ? <any>mockedWindow : undefined;
+  }
+}
+
 @Component({
   selector: 'cx-quote',
   template: `
@@ -20,24 +32,23 @@ describe('QuoteStorefrontUtilsService', () => {
   let fixture: ComponentFixture<MockQuoteComponent>;
   let htmlElem: HTMLElement;
   let windowRef: WindowRef;
-  let querySelectorOriginal: any;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [MockQuoteComponent],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      providers: [{ provide: WindowRef, useClass: MockedWindowRef }],
     }).compileComponents();
 
     classUnderTest = TestBed.inject(QuoteStorefrontUtilsService);
     fixture = TestBed.createComponent(MockQuoteComponent);
     htmlElem = fixture.nativeElement;
     windowRef = TestBed.inject(WindowRef);
+    mockedWindow = structuredClone(mockedWindowTemplate);
     fixture.detectChanges();
-    querySelectorOriginal = document.querySelector;
   });
 
   afterEach(() => {
-    document.querySelector = querySelectorOriginal;
     if (htmlElem) {
       document.body.removeChild(htmlElem);
     }
@@ -52,17 +63,13 @@ describe('QuoteStorefrontUtilsService', () => {
     it('should get HTML element based on query selector when running in browser and element exists', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const theElement = document.createElement('elementMock');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(theElement);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(theElement);
       expect(classUnderTest.getElement('elementMock')).toEqual(theElement);
     });
 
     it('should get null if element does not exist', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(null);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(null);
       expect(classUnderTest.getElement('unknownElement')).toEqual(null);
     });
   });
@@ -71,9 +78,7 @@ describe('QuoteStorefrontUtilsService', () => {
     it('should not change styling of HTML element if element does not exist', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const element = document.createElement('notExistingElement');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(undefined);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(undefined);
 
       classUnderTest.changeStyling('notExistingElement', 'position', 'sticky');
       expect(element.style.position).not.toEqual('sticky');
@@ -82,9 +87,7 @@ describe('QuoteStorefrontUtilsService', () => {
     it('should change styling of HTML element', () => {
       spyOn(windowRef, 'isBrowser').and.returnValue(true);
       const theElement = document.createElement('elementMock');
-      document.querySelector = jasmine
-        .createSpy('HTML Element')
-        .and.returnValue(theElement);
+      spyOn(windowRef.document, 'querySelector').and.returnValue(theElement);
       classUnderTest.changeStyling('elementMock', 'position', 'sticky');
       expect(theElement.style.position).toEqual('sticky');
     });
@@ -121,27 +124,25 @@ describe('QuoteStorefrontUtilsService', () => {
         label.style.height = '10px';
       });
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(100);
+      mockedWindow.innerWidth = 100;
 
       expect(classUnderTest['isInViewport'](list)).toBe(false);
     });
 
-    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
-    xit("should return 'true' because window's innerWith is known", () => {
+    it("should return 'true' because window's innerWith is known", () => {
       list.style.display = 'flex';
       list.style.flexDirection = 'column';
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(1000);
+      mockedWindow.innerWidth = 1000;
 
       expect(classUnderTest['isInViewport'](list)).toBe(true);
     });
 
-    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
-    xit("should return 'true' because clientWidth of element is known and its right is less than its width", () => {
+    it("should return 'true' because clientWidth of element is known and its right is less than its width", () => {
       list.style.display = 'flex';
       list.style.flexDirection = 'column';
 
-      spyOnProperty(window, 'innerWidth').and.returnValue(undefined);
+      mockedWindow.innerWidth = undefined;
 
       expect(classUnderTest['isInViewport'](list)).toBe(true);
     });
@@ -151,7 +152,7 @@ describe('QuoteStorefrontUtilsService', () => {
       list.style.flexDirection = 'column';
       list.style.height = '1000px';
 
-      spyOnProperty(window, 'innerHeight').and.returnValue(undefined);
+      mockedWindow.innerHeight = undefined;
 
       expect(classUnderTest['isInViewport'](list)).toBe(true);
     });
@@ -176,14 +177,13 @@ describe('QuoteStorefrontUtilsService', () => {
     });
 
     it('should return zero because component is not in viewport', () => {
-      spyOnProperty(window, 'innerWidth').and.returnValue(100);
+      mockedWindow.innerWidth = 100;
 
       expect(classUnderTest['getHeight']('cx-quote-list')).toBe(0);
     });
 
-    // TODO: CXSPA-8270 - fix failing tests on Azure & GiHub
-    xit('should return offsetHeight of the element because component is not in viewport', () => {
-      spyOnProperty(window, 'innerWidth').and.returnValue(1000);
+    it('should return offsetHeight of the element because component is in viewport', () => {
+      mockedWindow.innerWidth = 1000;
 
       expect(classUnderTest['getHeight']('cx-quote-list')).toBeGreaterThan(0);
     });
diff --git a/feature-libs/quote/package.json b/feature-libs/quote/package.json
index 5725d7cbc0c..1fa7ce52107 100644
--- a/feature-libs/quote/package.json
+++ b/feature-libs/quote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/quote",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -32,11 +32,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap b/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap
index e3935a70ee6..4ee71ab70f4 100644
--- a/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap
@@ -55,7 +55,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index 3e2fd60c675..8871c736c54 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.29.1",
+  "version": "2211.30.0",
   "description": "Requested Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,13 +29,13 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index 700b3d7e530..d0e8fcedee6 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/smartedit",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Smart Edit feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index 5bdb1a11614..031e149b287 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefinder",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Store finder feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index 49ce9e3e51b..088ee471dc0 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/tracking",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Spartacus tracking and personalization library",
   "keywords": [
     "spartacus",
@@ -27,8 +27,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/account/components/login/login.component.html b/feature-libs/user/account/components/login/login.component.html
index 8bbdd9a1bfa..4a56e93ac62 100644
--- a/feature-libs/user/account/components/login/login.component.html
+++ b/feature-libs/user/account/components/login/login.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="user$ | async as user; else login">
-  <div class="cx-login-greet">
+  <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>
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index aa226b3215c..fd92ceacd5c 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/user",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "User feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/profile/components/register/register.component.html b/feature-libs/user/profile/components/register/register.component.html
index f331fe73b62..0600e93305a 100644
--- a/feature-libs/user/profile/components/register/register.component.html
+++ b/feature-libs/user/profile/components/register/register.component.html
@@ -29,9 +29,7 @@
                 bindValue="code"
                 formControlName="titleCode"
                 id="title-select"
-                [cxNgSelectA11y]="{
-                  ariaLabel: 'register.title' | cxTranslate,
-                }"
+                [cxNgSelectA11y]="{}"
               >
               </ng-select>
             </label>
diff --git a/feature-libs/user/profile/components/register/register.module.ts b/feature-libs/user/profile/components/register/register.module.ts
index fc33bfca386..a310e15fc93 100644
--- a/feature-libs/user/profile/components/register/register.module.ts
+++ b/feature-libs/user/profile/components/register/register.module.ts
@@ -39,8 +39,8 @@ import { RegisterComponent } from './register.component';
     I18nModule,
     SpinnerModule,
     FormErrorsModule,
-    NgSelectModule,
     NgSelectA11yModule,
+    NgSelectModule,
     PasswordVisibilityToggleModule,
     FeaturesConfigModule,
   ],
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index 92139f86605..6ea09a7f95c 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdc",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Customer Data Cloud Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,12 +30,12 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/asm": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/organization": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/asm": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/organization": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdp/package.json b/integration-libs/cdp/package.json
index 2102d08b5e8..8bb19ae194a 100644
--- a/integration-libs/cdp/package.json
+++ b/integration-libs/cdp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdp",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Customer Data Platform Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -24,8 +24,8 @@
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/customer-ticketing": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/customer-ticketing": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index cc49d52b7ea..544cbc30d53 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cds",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Context Driven Service library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/tracking": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/tracking": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cpq-quote/package.json b/integration-libs/cpq-quote/package.json
index c628fcd0b1a..ecf3bc68628 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.29.1",
+  "version": "2211.30.0",
   "description": "cpq-quote library for Spartacus",
   "keywords": [
     "spartacus",
@@ -23,10 +23,10 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index 8c1bd91d4b0..6cd3cf04531 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.29.1",
+  "version": "2211.30.0",
   "description": "Digital Payments Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -27,11 +27,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 51124069129..efdeebc36a0 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.29.1",
+  "version": "2211.30.0",
   "description": "SAP Enterprise Product Development Visualization integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -38,11 +38,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@sapui5/ts-types-esm": "1.120.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/integration-libs/omf/package.json b/integration-libs/omf/package.json
index e4cae34f97e..8fb86b27d9f 100644
--- a/integration-libs/omf/package.json
+++ b/integration-libs/omf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/omf",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "SAP Order Management Foundation Integration",
   "keywords": [
     "spartacus",
@@ -25,9 +25,9 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/opps/package.json b/integration-libs/opps/package.json
index d19199d912b..92ae8e2c67d 100644
--- a/integration-libs/opps/package.json
+++ b/integration-libs/opps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/opps",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "OPPS (Omni-Channel Personalization and Promotions Services) library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,9 +29,9 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4-service/package.json b/integration-libs/s4-service/package.json
index 376c375248f..849fac98720 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.29.1",
+  "version": "2211.30.0",
   "description": "S/4HANA Service Integration Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,12 +30,12 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 5e01beb5e25..2553d8daee7 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4om",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "S/4HANA Order Management (b2b feature)",
   "keywords": [
     "spartacus",
@@ -23,13 +23,13 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/pdf-invoices": "2211.29.1",
-    "@spartacus/requested-delivery-date": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/pdf-invoices": "2211.30.0",
+    "@spartacus/requested-delivery-date": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index be446060655..be7763928f9 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.29.1",
+  "version": "2211.30.0",
   "description": "segment-refs",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/projects/assets/package.json b/projects/assets/package.json
index f305c9b8a34..47a5447b16a 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/assets",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "homepage": "https://github.com/SAP/spartacus",
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/assets",
   "scripts": {
diff --git a/projects/core/package.json b/projects/core/package.json
index 06a8bb87bf1..1d9af8b4fb3 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/core",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Spartacus - the core framework",
   "keywords": [
     "spartacus",
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 d6af6289219..a0d25f65d4e 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
@@ -582,6 +582,17 @@ export interface FeatureTogglesInterface {
    */
   a11ySearchBoxFocusOnEscape?: boolean;
 
+  /**
+   * In `ItemCounterComponenet`, Remove button no longer lose focus after activating when count is 2.
+   * Add button no longer lose focus after activating when count is `max - 1`.
+   */
+  a11yItemCounterFocus?: boolean;
+
+  /**
+   * `ProductIntroComponent` should now scroll to the Review tab on the first click of the 'Show Review' button.
+   */
+  a11yScrollToReviewByShowReview?: boolean;
+
   /**
    * `StoreComponent and MyPreferredStoreComponent` an icon in a button that triggers showing
    * store's opening hours has an acceptable contrast ratio in a default theme
@@ -766,6 +777,8 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yDialogTriggerRefocus: false,
   a11yAddToWishlistFocus: false,
   a11ySearchBoxFocusOnEscape: false,
+  a11yItemCounterFocus: false,
+  a11yScrollToReviewByShowReview: false,
   a11yViewHoursButtonIconContrast: false,
   occCartNameAndDescriptionInHttpRequestBody: false,
   cmsBottomHeaderSlotUsingFlexStyles: false,
diff --git a/projects/core/src/model/image.model.ts b/projects/core/src/model/image.model.ts
index 161e4936639..e143bf5a26b 100644
--- a/projects/core/src/model/image.model.ts
+++ b/projects/core/src/model/image.model.ts
@@ -15,6 +15,22 @@ export interface Image {
   galleryIndex?: number;
   imageType?: ImageType;
   url?: string;
+  /**
+   * Represents width for an image in the MediaComponent.
+   *
+   * This property do not originate from the CMS but was added
+   * to allow for the manual setting of the width of
+   * images displayed by the MediaComponent.
+   */
+  width?: number;
+  /**
+   * Represents height for an image in the MediaComponent.
+   *
+   * This property do not originate from the CMS but was added
+   * to allow for the manual setting of the height of
+   * images displayed by the MediaComponent.
+   */
+  height?: number;
 }
 
 export enum ImageType {
diff --git a/projects/core/src/util/glob-utils.ts b/projects/core/src/util/glob-utils.ts
index c10e844b394..309c4b468f0 100644
--- a/projects/core/src/util/glob-utils.ts
+++ b/projects/core/src/util/glob-utils.ts
@@ -50,7 +50,7 @@ export function globToRegex(glob: string, literalQuestionMark = false): string {
       }
     } else {
       const processed = toEscape.reduce(
-        (seg, escape) => seg?.replace(escape.replace, escape.with),
+        (seg, escapeRule) => seg?.replace(escapeRule.replace, escapeRule.with),
         segment
       );
       regex += processed;
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index 0e095f1c407..d58b125852e 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/schematics",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Spartacus schematics",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/src/add-spartacus/spartacus-features.ts b/projects/schematics/src/add-spartacus/spartacus-features.ts
index 38849bba7f2..38b76831280 100644
--- a/projects/schematics/src/add-spartacus/spartacus-features.ts
+++ b/projects/schematics/src/add-spartacus/spartacus-features.ts
@@ -95,6 +95,7 @@ function configureSpartacusModules(
         'PageTitleModule',
         'VideoModule',
         'PDFModule',
+        'SiteThemeSwitcherModule',
       ].forEach((content) => {
         addModuleImport(sourceFile, {
           import: [
@@ -116,6 +117,7 @@ function configureSpartacusModules(
                 'PageTitleModule',
                 'VideoModule',
                 'PDFModule',
+                'SiteThemeSwitcherModule',
               ],
             },
           ],
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 90997cfb3be..d4179ee4742 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -24,7 +24,7 @@
     "typescript": "^5.2.2"
   },
   "ssr-tests": {
-    "@spartacus/core": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
     "http-proxy": "^1.18.1",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0"
@@ -41,7 +41,7 @@
     "@ngrx/effects": "^17.0.1",
     "@ngrx/router-store": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0"
   },
@@ -54,10 +54,10 @@
   "@spartacus/setup": {
     "@angular/core": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/user": "2211.29.1"
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/user": "2211.30.0"
   },
   "@spartacus/asm": {
     "@angular-devkit/schematics": "^17.0.5",
@@ -67,14 +67,14 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cart": {
@@ -86,11 +86,11 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -102,13 +102,13 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -118,23 +118,23 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/estimated-delivery-date": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/order": {
@@ -146,13 +146,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/pdf-invoices": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/pdf-invoices": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/organization": {
@@ -164,13 +164,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -179,10 +179,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/pickup-in-store": {
@@ -193,14 +193,14 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -209,10 +209,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -225,13 +225,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/product-multi-dimensional": {
@@ -241,10 +241,10 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -252,9 +252,9 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -264,11 +264,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -277,21 +277,21 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/smartedit": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/storefinder": {
@@ -302,10 +302,10 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -313,8 +313,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/user": {
@@ -325,10 +325,10 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdc": {
@@ -340,19 +340,19 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/asm": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/organization": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/asm": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/organization": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdp": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/customer-ticketing": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/customer-ticketing": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cds": {
@@ -361,22 +361,22 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/tracking": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/tracking": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cpq-quote": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/digital-payments": {
@@ -386,11 +386,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/epd-visualization": {
@@ -400,11 +400,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@sapui5/ts-types-esm": "1.120.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -414,9 +414,9 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/opps": {
@@ -424,9 +424,9 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/s4-service": {
@@ -435,33 +435,33 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/checkout": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/checkout": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/s4om": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/pdf-invoices": "2211.29.1",
-    "@spartacus/requested-delivery-date": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/pdf-invoices": "2211.30.0",
+    "@spartacus/requested-delivery-date": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/segment-refs": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "storefrontapp": {
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 27109b3faf1..5c4944555e1 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -61,11 +61,11 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@ngrx/effects": "^17.0.1",
     "@ngrx/router-store": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/assets": "~2211.29.1",
-    "@spartacus/core": "~2211.29.1",
-    "@spartacus/setup": "~2211.29.1",
-    "@spartacus/storefront": "~2211.29.1",
-    "@spartacus/styles": "~2211.29.1",
+    "@spartacus/assets": "~2211.30.0",
+    "@spartacus/core": "~2211.30.0",
+    "@spartacus/setup": "~2211.30.0",
+    "@spartacus/storefront": "~2211.30.0",
+    "@spartacus/styles": "~2211.30.0",
     "angular-oauth2-oidc": "^17.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.18.2",
diff --git a/projects/ssr-tests/package.json b/projects/ssr-tests/package.json
index 2ae4e1825d2..461c1fbeec6 100644
--- a/projects/ssr-tests/package.json
+++ b/projects/ssr-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssr-tests",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "private": true,
   "description": "Spartacus SSR Tests",
   "keywords": [
@@ -17,7 +17,7 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@spartacus/core": "2211.29.1",
+    "@spartacus/core": "2211.30.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/regression/cart/added-to-cart-modal.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/added-to-cart-modal.e2e.cy.ts
index 90e805b890e..fedaa659149 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/added-to-cart-modal.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/added-to-cart-modal.e2e.cy.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { removeCartItem } from '../../../helpers/cart';
 import { viewportContext } from '../../../helpers/viewport-context';
 import { interceptGet, interceptPost } from '../../../support/utils/intercept';
-import { removeCartItem } from '../../../helpers/cart';
 
 const productId = '266685';
 const productId2 = '2006139';
@@ -36,7 +36,9 @@ describe('Added to cart modal - Anonymous user', () => {
             .blur()
             .should('have.value', stock);
 
-          cy.get('button').contains('+').should('be.disabled');
+          cy.get('button')
+            .contains('+')
+            .should('have.attr', 'aria-disabled', 'true');
 
           // Value should change to minimum, '-' button disabled
           cy.get('input')
@@ -44,7 +46,9 @@ describe('Added to cart modal - Anonymous user', () => {
             .blur()
             .should('have.value', '1');
 
-          cy.get('button').contains('-').should('be.disabled');
+          cy.get('button')
+            .contains('-')
+            .should('have.attr', 'aria-disabled', 'true');
         });
       });
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_details/product-details.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_details/product-details.core-e2e.cy.ts
index 183ed6333cd..a432802a16d 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_details/product-details.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_details/product-details.core-e2e.cy.ts
@@ -12,6 +12,15 @@ context('Product details', { testIsolation: false }, () => {
   isolateTests();
   describe('Electronics', () => {
     before(productDetails.configureDefaultProduct);
+    beforeEach(() => {
+      cy.cxConfig({
+        // TODO: No longer needed to toggle a11yTabComponent feature when set to true
+        // by default.
+        features: {
+          a11yTabComponent: true,
+        },
+      });
+    });
 
     productDetails.productDetailsTest();
     productDetails.verifyTabKeyboardNavigation();
@@ -19,6 +28,15 @@ context('Product details', { testIsolation: false }, () => {
 
   describe('Apparel', () => {
     before(productDetails.configureApparelProduct);
+    beforeEach(() => {
+      cy.cxConfig({
+        // TODO: No longer needed to toggle a11yTabComponent feature when set to true
+        // by default.
+        features: {
+          a11yTabComponent: true,
+        },
+      });
+    });
 
     productDetails.apparelProductDetailsTest();
     productDetails.verifyTabKeyboardNavigation();
@@ -40,6 +58,15 @@ context(
 
     describe('Electronics', () => {
       before(productDetails.configureDefaultProduct);
+      beforeEach(() => {
+        cy.cxConfig({
+          // TODO: No longer needed to toggle a11yTabComponent feature when set to true
+          // by default.
+          features: {
+            a11yTabComponent: true,
+          },
+        });
+      });
 
       productDetails.productDetailsTest();
       productDetails.verifyTabKeyboardNavigation(true);
@@ -47,6 +74,15 @@ context(
 
     describe('Apparel', () => {
       before(productDetails.configureApparelProduct);
+      beforeEach(() => {
+        cy.cxConfig({
+          // TODO: No longer needed to toggle a11yTabComponent feature when set to true
+          // by default.
+          features: {
+            a11yTabComponent: true,
+          },
+        });
+      });
 
       productDetails.apparelProductDetailsTest();
       productDetails.verifyTabKeyboardNavigation(true);
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/epd-visualization/visualization-lookup/visualization-lookup.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/epd-visualization/visualization-lookup/visualization-lookup.e2e.cy.ts
index 76f6ddf8428..4ed64f0a377 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/epd-visualization/visualization-lookup/visualization-lookup.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/epd-visualization/visualization-lookup/visualization-lookup.e2e.cy.ts
@@ -11,6 +11,11 @@ describe('in Spare Parts Tab', () => {
     });
 
     beforeEach(() => {
+      cy.cxConfig({
+        features: {
+          a11yTabComponent: false,
+        },
+      } as any);
       cy.intercept(
         'GET',
         `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/notification.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/notification.ts
index ed0946dbd88..efd877f4e85 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/notification.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/notification.ts
@@ -127,7 +127,7 @@ export function updateEmail(): String {
 }
 
 export function updateEmailV2(): String {
-  const password = 'Password123.';
+  const password = 'Pas!sword123.';
   const newUid = generateMail(randomString(), true);
 
   navigateToUpdateEmailPage();
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-details.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-details.ts
index 5f35f20666d..edb18aa002d 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-details.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-details.ts
@@ -231,6 +231,11 @@ export function configureDefaultProduct() {
       baseSite: ['electronics-spa'],
       currency: ['USD'],
     },
+    // TODO: No longer needed to toggle a11yTabComponent feature when set to true
+    // by default.
+    features: {
+      a11yTabComponent: true,
+    },
   });
 
   cy.intercept({
@@ -252,6 +257,11 @@ export function configureApparelProduct() {
       baseSite: ['apparel-uk-spa'],
       currency: ['GBP'],
     },
+    // TODO: No longer needed to toggle a11yTabComponent feature when set to true
+    // by default.
+    features: {
+      a11yTabComponent: true,
+    },
   });
   cy.visit('/product/100191');
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/epd-visualization/visual-picking-tab.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/epd-visualization/visual-picking-tab.ts
index 46962e0a855..8c79da097a2 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/epd-visualization/visual-picking-tab.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/epd-visualization/visual-picking-tab.ts
@@ -10,6 +10,12 @@ export function configureDefaultProduct() {
   // We need to ensure we use control the screen width, since the animation controls are removed at lower breakpoints.
   cy.viewport(1200, 800); // Bootstrap 4 XL breakpoint
 
+  cy.cxConfig({
+    features: {
+      a11yTabComponent: false,
+    },
+  } as any);
+
   cy.intercept(
     'GET',
     `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 6f19ea840ca..b9c65b2a8dc 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -351,7 +351,7 @@ if (environment.cpq) {
         a11yEmptyWishlistHeading: true,
         a11yScreenReaderBloatFix: true,
         a11yUseButtonsForBtnLinks: true,
-        a11yTabComponent: true,
+        a11yTabComponent: false,
         a11yCarouselArrowKeysNavigation: true,
         a11yNotificationsOnConsentChange: true,
         a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields:
@@ -376,6 +376,8 @@ if (environment.cpq) {
         a11yDialogTriggerRefocus: true,
         a11yAddToWishlistFocus: true,
         a11ySearchBoxFocusOnEscape: true,
+        a11yItemCounterFocus: true,
+        a11yScrollToReviewByShowReview: true,
         a11yViewHoursButtonIconContrast: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,
         useSiteThemeService: false,
diff --git a/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts b/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts
index 73a1b2f919c..cc93449502d 100644
--- a/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts
+++ b/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts
@@ -72,6 +72,7 @@ class MockSemanticPathService {
 })
 class MockMediaComponent {
   @Input() container: any;
+  @Input() elementType: 'img' | 'picture' = 'img';
 }
 
 describe('BannerComponent', () => {
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 56972097b38..2069e4a945f 100644
--- a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
+++ b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
@@ -106,8 +106,8 @@
             [attr.role]="(isDesktop$ | async) && depth ? 'heading' : 'button'"
             [attr.aria-haspopup]="true"
             [attr.aria-expanded]="false"
-            [attr.aria-label]="node.title"
             [attr.aria-controls]="node.title"
+            [attr.aria-describedby]="'greeting'"
             (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 3bfd3fbcf5a..9c4d543d3ac 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
@@ -145,6 +145,7 @@ describe('Navigation UI Component', () => {
       ],
     }).compileComponents();
   });
+
   beforeEach(() => {
     fixture = TestBed.createComponent(NavigationUIComponent);
     hamburgerMenuService = TestBed.inject(HamburgerMenuService);
@@ -315,10 +316,10 @@ describe('Navigation UI Component', () => {
         .query(By.css('nav > ul > li:nth-child(2) > button'))
         .nativeElement.click();
       element
-        .query(By.css('button[aria-label="Child 1"]'))
+        .query(By.css('button[aria-controls="Child 1"]'))
         .nativeElement.click();
       element
-        .query(By.css('button[aria-label="Sub child 1"]'))
+        .query(By.css('button[aria-controls="Sub child 1"]'))
         .nativeElement.click();
 
       expect(element.queryAll(By.css('li.is-open:not(.back)')).length).toBe(1);
@@ -363,10 +364,10 @@ describe('Navigation UI Component', () => {
     it('should apply role="heading" to nested dropdown trigger button while on desktop', () => {
       fixture.detectChanges();
       const nestedTriggerButton = fixture.debugElement.query(
-        By.css('button[aria-label="Child 1"]')
+        By.css('button[aria-controls="Child 1"]')
       ).nativeElement;
       const rootTriggerButton = fixture.debugElement.query(
-        By.css('button[aria-label="Root 1"]')
+        By.css('button[aria-controls="Root 1"]')
       ).nativeElement;
 
       expect(nestedTriggerButton.getAttribute('role')).toEqual('heading');
@@ -383,7 +384,7 @@ describe('Navigation UI Component', () => {
       const spy = spyOn(navigationComponent, 'toggleOpen');
       const spaceEvent = new KeyboardEvent('keydown', { code: 'Space' });
       const dropDownButton = element.query(
-        By.css('button[aria-label="Sub child 1"]')
+        By.css('button[aria-controls="Sub child 1"]')
       ).nativeElement;
       Object.defineProperty(spaceEvent, 'target', { value: dropDownButton });
 
@@ -397,7 +398,7 @@ describe('Navigation UI Component', () => {
       const spy = spyOn(firstChild.nativeElement, 'focus');
       const spaceEvent = new KeyboardEvent('keydown', { code: 'Space' });
       const dropDownButton = element.query(
-        By.css('button[aria-label="Sub child 1"]')
+        By.css('button[aria-controls="Sub child 1"]')
       ).nativeElement;
       Object.defineProperty(spaceEvent, 'target', { value: dropDownButton });
 
@@ -418,7 +419,7 @@ describe('Navigation UI Component', () => {
       });
       const spaceEvent = new KeyboardEvent('keydown', { code: 'Space' });
       const dropDownButton = element.query(
-        By.css('button[aria-label="Sub child 1"]')
+        By.css('button[aria-controls="Sub child 1"]')
       ).nativeElement;
       Object.defineProperty(spaceEvent, 'target', { value: dropDownButton });
       Object.defineProperty(arrowDownEvent, 'target', {
diff --git a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts
index d723a2e289c..3e9a9bc93df 100644
--- a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts
+++ b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts
@@ -17,8 +17,8 @@ import { ProductIntroComponent } from './product-intro.component';
   template: '',
 })
 class MockStarRatingComponent {
-  @Input() rating;
-  @Input() disabled;
+  @Input() rating: number;
+  @Input() disabled: boolean;
 }
 
 class MockCurrentProductService {
diff --git a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.ts b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.ts
index d16457e5102..b70edb7f585 100644
--- a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.ts
+++ b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.ts
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import {
   EventService,
+  FeatureConfigService,
   Product,
   TranslationService,
   WindowRef,
 } from '@spartacus/core';
-import { defer, merge, Observable, of } from 'rxjs';
+import { Observable, defer, merge, of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import {
   ComponentCreateEvent,
@@ -28,6 +29,8 @@ export class ProductIntroComponent {
   product$: Observable<Product | null> =
     this.currentProductService.getProduct();
 
+  private featureConfigService = inject(FeatureConfigService);
+
   /**
    * Observable that checks the reviews component availability on the page.
    *
@@ -72,12 +75,25 @@ export class ProductIntroComponent {
         const tabsComponent = this.getTabsComponent();
         const reviewsTab =
           tabsComponent && this.getTabByLabel(reviewsTabLabel, tabsComponent);
-
         if (reviewsTab) {
           this.clickTabIfInactive(reviewsTab);
           setTimeout(() => {
-            reviewsTab.scrollIntoView({ behavior: 'smooth' });
-            reviewsTab.focus({ preventScroll: true });
+            if (
+              this.featureConfigService?.isEnabled(
+                'a11yScrollToReviewByShowReview'
+              )
+            ) {
+              requestAnimationFrame(() => {
+                reviewsTab.scrollIntoView({
+                  behavior: 'smooth',
+                  block: 'start',
+                });
+                reviewsTab.focus({ preventScroll: true });
+              });
+            } else {
+              reviewsTab.scrollIntoView({ behavior: 'smooth', block: 'start' });
+              reviewsTab.focus({ preventScroll: true });
+            }
           });
         }
       })
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index 0e0bd6cd460..0a84b8b5528 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefront",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "keywords": [
     "spartacus",
     "storefront",
@@ -23,7 +23,7 @@
     "@ngrx/effects": "^17.0.1",
     "@ngrx/router-store": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0"
   },
diff --git a/projects/storefrontlib/recipes/config/default-media.config.ts b/projects/storefrontlib/recipes/config/default-media.config.ts
index eb64a90671f..9ebb7c1ed67 100644
--- a/projects/storefrontlib/recipes/config/default-media.config.ts
+++ b/projects/storefrontlib/recipes/config/default-media.config.ts
@@ -18,19 +18,21 @@ export const mediaConfig: MediaConfig = {
     product: { width: 284 },
     zoom: { width: 515 },
   },
-  pictureElementFormats: {
-    mobile: {
-      mediaQueries: '(max-width: 767px)',
-    },
-    tablet: {
-      mediaQueries: '(min-width: 768px) and (max-width: 1024px)',
-    },
-    desktop: {
-      mediaQueries: '(min-width: 1025px) and (max-width: 1439px)',
-    },
-    widescreen: {
-      mediaQueries: '(min-width: 1440px)',
+  media: {
+    pictureElementFormats: {
+      mobile: {
+        mediaQueries: '(max-width: 480px)',
+      },
+      tablet: {
+        mediaQueries: '(max-width: 770px)',
+      },
+      desktop: {
+        mediaQueries: '(max-width: 960px)',
+      },
+      widescreen: {
+        mediaQueries: '(min-width: 961px)',
+      },
     },
+    pictureFormatsOrder: ['mobile', 'tablet', 'desktop', 'widescreen'],
   },
-  pictureFormatsOrder: ['widescreen', 'desktop', 'tablet', 'mobile'],
 };
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.ts b/projects/storefrontlib/shared/components/carousel/carousel.component.ts
index f4b6d126de9..0b4addc67f5 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.ts
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.ts
@@ -102,7 +102,6 @@ export class CarouselComponent implements OnInit, OnChanges {
       this.logger.error(
         'No template reference provided to render the carousel items for the `cx-carousel`'
       );
-      return;
     }
   }
   ngOnChanges() {
diff --git a/projects/storefrontlib/shared/components/item-counter/item-counter.component.html b/projects/storefrontlib/shared/components/item-counter/item-counter.component.html
index 6a3fd29b2a1..277bbcdeb7c 100644
--- a/projects/storefrontlib/shared/components/item-counter/item-counter.component.html
+++ b/projects/storefrontlib/shared/components/item-counter/item-counter.component.html
@@ -1,4 +1,17 @@
 <button
+  *cxFeature="'a11yItemCounterFocus'"
+  type="button"
+  (click)="decrement()"
+  [attr.aria-disabled]="control.disabled || control.value <= min"
+  [tabindex]="control.disabled || control.value <= min ? -1 : 0"
+  [cxFocus]="{ key: 'decrement' }"
+  attr.aria-label="{{ 'itemCounter.removeOne' | cxTranslate }}"
+  title="{{ 'itemCounter.removeOne' | cxTranslate }}"
+>
+  -
+</button>
+<button
+  *cxFeature="'!a11yItemCounterFocus'"
   type="button"
   (click)="decrement()"
   [disabled]="control.disabled || control.value <= min"
@@ -24,6 +37,18 @@
   [attr.aria-describedby]="ariaDescribedById"
 />
 <button
+  *cxFeature="'a11yItemCounterFocus'"
+  type="button"
+  (click)="increment()"
+  [attr.aria-disabled]="control.disabled || control.value >= max"
+  [cxFocus]="{ key: 'increment' }"
+  attr.aria-label="{{ 'itemCounter.addOneMore' | cxTranslate }}"
+  title="{{ 'itemCounter.addOneMore' | cxTranslate }}"
+>
+  +
+</button>
+<button
+  *cxFeature="'!a11yItemCounterFocus'"
   type="button"
   (click)="increment()"
   [disabled]="control.disabled || control.value >= max"
diff --git a/projects/storefrontlib/shared/components/item-counter/item-counter.component.spec.ts b/projects/storefrontlib/shared/components/item-counter/item-counter.component.spec.ts
index ef1b5d87c3e..2498fad47d5 100644
--- a/projects/storefrontlib/shared/components/item-counter/item-counter.component.spec.ts
+++ b/projects/storefrontlib/shared/components/item-counter/item-counter.component.spec.ts
@@ -8,6 +8,8 @@ import {
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { I18nTestingModule } from '@spartacus/core';
+import { MockKeyboardFocusDirective } from '@spartacus/storefront';
+import { MockFeatureDirective } from '../../test/mock-feature-directive';
 import { ItemCounterComponent } from './item-counter.component';
 
 const form = new UntypedFormGroup({
@@ -21,7 +23,11 @@ describe('ItemCounterComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule, ReactiveFormsModule, I18nTestingModule],
-      declarations: [ItemCounterComponent],
+      declarations: [
+        ItemCounterComponent,
+        MockFeatureDirective,
+        MockKeyboardFocusDirective,
+      ],
     }).compileComponents();
   }));
 
@@ -154,7 +160,11 @@ describe('ItemCounterComponent', () => {
       const button: DebugElement[] = fixture.debugElement.queryAll(
         By.css('button')
       );
-      expect((<HTMLButtonElement>button[1].nativeElement).disabled).toBeFalsy();
+      expect(
+        (<HTMLButtonElement>button[1].nativeElement).getAttribute(
+          'aria-disabled'
+        )
+      ).toBe('false');
     });
 
     it('should disable increase button if max number is reached', () => {
@@ -165,8 +175,10 @@ describe('ItemCounterComponent', () => {
         By.css('button')
       );
       expect(
-        (<HTMLButtonElement>button[1].nativeElement).disabled
-      ).toBeTruthy();
+        (<HTMLButtonElement>button[1].nativeElement).getAttribute(
+          'aria-disabled'
+        )
+      ).toBe('true');
     });
   });
 
@@ -201,7 +213,11 @@ describe('ItemCounterComponent', () => {
       const button: DebugElement[] = fixture.debugElement.queryAll(
         By.css('button')
       );
-      expect((<HTMLButtonElement>button[0].nativeElement).disabled).toBeFalsy();
+      expect(
+        (<HTMLButtonElement>button[0].nativeElement).getAttribute(
+          'aria-disabled'
+        )
+      ).toBe('false');
     });
 
     it('should disable decrease button if min number is reached', () => {
@@ -212,8 +228,10 @@ describe('ItemCounterComponent', () => {
         By.css('button')
       );
       expect(
-        (<HTMLButtonElement>button[0].nativeElement).disabled
-      ).toBeTruthy();
+        (<HTMLButtonElement>button[0].nativeElement).getAttribute(
+          'aria-disabled'
+        )
+      ).toBe('true');
     });
   });
 
diff --git a/projects/storefrontlib/shared/components/item-counter/item-counter.component.ts b/projects/storefrontlib/shared/components/item-counter/item-counter.component.ts
index 52979e21310..a1753845542 100644
--- a/projects/storefrontlib/shared/components/item-counter/item-counter.component.ts
+++ b/projects/storefrontlib/shared/components/item-counter/item-counter.component.ts
@@ -91,6 +91,7 @@ export class ItemCounterComponent implements OnInit, OnDestroy {
 
   constructor() {
     useFeatureStyles('a11yVisibleFocusOverflows');
+    useFeatureStyles('a11yItemCounterFocus');
   }
 
   // TODO: (CXSPA-6034) Remove HostListener next major release
diff --git a/projects/storefrontlib/shared/components/item-counter/item-counter.module.ts b/projects/storefrontlib/shared/components/item-counter/item-counter.module.ts
index f5e7259ecbf..ed1add6b42e 100644
--- a/projects/storefrontlib/shared/components/item-counter/item-counter.module.ts
+++ b/projects/storefrontlib/shared/components/item-counter/item-counter.module.ts
@@ -7,12 +7,18 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { I18nModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule } from '@spartacus/core';
 import { KeyboardFocusModule } from '../../../layout/a11y/keyboard-focus/keyboard-focus.module';
 import { ItemCounterComponent } from './item-counter.component';
 
 @NgModule({
-  imports: [CommonModule, ReactiveFormsModule, I18nModule, KeyboardFocusModule],
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    I18nModule,
+    KeyboardFocusModule,
+    FeaturesConfigModule,
+  ],
   declarations: [ItemCounterComponent],
   exports: [ItemCounterComponent],
 })
diff --git a/projects/storefrontlib/shared/components/media/media.component.html b/projects/storefrontlib/shared/components/media/media.component.html
index e4bcac48030..06035f9ab5e 100644
--- a/projects/storefrontlib/shared/components/media/media.component.html
+++ b/projects/storefrontlib/shared/components/media/media.component.html
@@ -20,9 +20,8 @@
         [title]="media.alt"
         [src]="media.src"
         [attr.role]="media.role"
-        [attr.width]="width"
-        [attr.height]="height"
-        [attr.sizes]="sizes"
+        [attr.width]="media.width"
+        [attr.height]="media.height"
         (load)="loadHandler()"
         (error)="errorHandler()"
       />
@@ -37,9 +36,9 @@
         [src]="media.src"
         [srcset]="media.srcset || media.src"
         [attr.role]="media.role"
-        [attr.width]="width"
-        [attr.height]="height"
-        [attr.sizes]="sizes"
+        [attr.width]="media.width"
+        [attr.height]="media.height"
+        [attr.sizes]="sizesForImgElement"
         (load)="loadHandler()"
         (error)="errorHandler()"
       />
diff --git a/projects/storefrontlib/shared/components/media/media.component.ts b/projects/storefrontlib/shared/components/media/media.component.ts
index 7f549a3509d..b8156d30e97 100644
--- a/projects/storefrontlib/shared/components/media/media.component.ts
+++ b/projects/storefrontlib/shared/components/media/media.component.ts
@@ -20,6 +20,28 @@ import { ImageLoadingStrategy, Media, MediaContainer } from './media.model';
 import { MediaService } from './media.service';
 import { USE_LEGACY_MEDIA_COMPONENT } from './media.token';
 
+/**
+ * The HTML element rendered in the template can be either `<img>` or `<picture>`,
+ * depending on the input value of `elementType`, which defaults to `'img'`.
+ *
+ * In the case of a `<picture>` element, each `<source>` element will contain `srcset` attribute with exactly one URL.
+ *
+ * If you need multiple URLs per `<source>` (e.g. for different pixel densities),
+ * split it into multiple media queries (e.g. with `min-device-pixel-ratio`). See the following example:
+ *
+ * Instead of:
+ *
+ * ```html
+ * <source media="(min-width: 960px)" srcset="image-1400.jpg 1x, image-2800.jpg 2x">
+ * ```
+ *
+ * Use additional formats and additional media queries, such as:
+ *
+ * ```html
+ * <source media="(min-width: 960px) and (-webkit-min-device-pixel-ratio: 2)" srcset="image-2800.jpg">
+ * <source media="(min-width: 960px)" srcset="image-1400.jpg">
+ * ```
+ */
 @Component({
   selector: 'cx-media',
   templateUrl: './media.component.html',
@@ -69,32 +91,21 @@ export class MediaComponent implements OnChanges {
   @Input() elementType: 'img' | 'picture' = 'img';
 
   /**
-   * The intrinsic width of the image, in pixels
-   *
-   * Works only when `useExtendedMediaComponentConfiguration` toggle is true
-   */
-  @Input() width: number;
-
-  /**
-   * The intrinsic height of the image, in pixels
-   *
-   * Works only when `useExtendedMediaComponentConfiguration` toggle is true
-   */
-  @Input() height: number;
-
-  /**
-   * Specifies the sizes attribute for responsive images.
+   * Specifies the `sizes` attribute for responsive images.
    *
    * The `sizes` attribute describes the layout width of the image for various viewport sizes.
    * It helps the browser determine which image to download from the `srcset` attribute.
    *
-   * - The sizes attribute is defined using media queries.
+   * - The `sizes` attribute is defined using media queries.
    * - It allows specifying different sizes for various screen widths or other conditions (e.g., device orientation).
    * - The browser uses the value to pick the most appropriate image source from the `srcset`.
    *
-   * Works only when `useExtendedMediaComponentConfiguration` toggle is true
+   * This input is applicable only when the `elementType` input is set to `'img'`, as the `sizes` attribute
+   * is currently added only to the `<img>` HTML element.
+   *
+   * Works only when the `useExtendedMediaComponentConfiguration` toggle is set to `true`.
    */
-  @Input() sizes: string;
+  @Input() sizesForImgElement: string;
 
   /**
    * Once the media is loaded, we emit an event.
@@ -131,7 +142,7 @@ export class MediaComponent implements OnChanges {
     item.media;
 
   /**
-   * @deprecated since 2211.30. It will be eventually removed in the future
+   * @deprecated since 2211.31. It will be eventually removed in the future
    *
    * To use `img` HTML element instead of `picture`
    * use `useExtendedMediaComponentConfiguration` feature flag
diff --git a/projects/storefrontlib/shared/components/media/media.config.ts b/projects/storefrontlib/shared/components/media/media.config.ts
index 6b899b8264e..791f0869dd7 100644
--- a/projects/storefrontlib/shared/components/media/media.config.ts
+++ b/projects/storefrontlib/shared/components/media/media.config.ts
@@ -21,6 +21,36 @@ import {
   useExisting: Config,
 })
 export abstract class MediaConfig {
+  /**
+   * Config properties related to media component
+   */
+  media?: {
+    /**
+     * Picture element configuration holds the media queries assigned to
+     * a format.
+     * The order of formats matters.
+     * <source> elements in <picture> will be sorted based on this order.
+     * This is necessary because the browser evaluates each
+     * <source> element in order and uses the first one that matches.
+     */
+    pictureElementFormats?: {
+      [format: string]: {
+        mediaQueries?: PictureElementQueries;
+      };
+    };
+
+    /**
+     * Used to specify the order of formats.
+     * <source> elements in <picture> will be sorted based on this order.
+     * This is necessary because the browser evaluates each
+     * <source> element in order and uses the first one that matches.
+     *
+     * @example
+     * ['mobile', 'tablet', 'desktop']
+     */
+    pictureFormatsOrder?: string[];
+  };
+
   /**
    * Media _format_ configuration holds the size of the media's assigned to
    * a format.
@@ -33,33 +63,6 @@ export abstract class MediaConfig {
     [format: string]: MediaFormatSize;
   };
 
-  /**
-   * Picture element configuration holds the media queries assigned to
-   * a format.
-   * The order of formats matters.
-   * <source> elements in <picture> will be sorted based on this order.
-   * This is necessary because the browser evaluates each
-   * <source> element in order and uses the first one that matches.
-   */
-  pictureElementFormats?: {
-    [format: string]: {
-      mediaQueries?: PictureElementQueries;
-      width?: number;
-      height?: number;
-    };
-  };
-
-  /**
-   * Used to specify the order of formats.
-   * <source> elements in <picture> will be sorted based on this order.
-   * This is necessary because the browser evaluates each
-   * <source> element in order and uses the first one that matches.
-   *
-   * @example
-   * ['mobile', 'tablet', 'desktop']
-   */
-  pictureFormatsOrder?: string[];
-
   /**
    * Indicates how the browser should load the image. There's only one
    * global strategy for all media cross media in Spartacus.
@@ -73,7 +76,7 @@ export abstract class MediaConfig {
   imageLoadingStrategy?: ImageLoadingStrategy;
 
   /**
-   * @deprecated since 2211.30. It will be eventually removed in the future
+   * @deprecated since 2211.31. It will be eventually removed in the future
    * As of v7.0, Spartacus started using the <picture> element by default when a srcset is available.
    *
    * See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/picture for more
diff --git a/projects/storefrontlib/shared/components/media/media.model.ts b/projects/storefrontlib/shared/components/media/media.model.ts
index a4a0d04402f..f265d392a6a 100644
--- a/projects/storefrontlib/shared/components/media/media.model.ts
+++ b/projects/storefrontlib/shared/components/media/media.model.ts
@@ -33,7 +33,7 @@ export interface Media {
   /**
    * The sources holds a list of source element for picture html element
    */
-  sources?: PictureHTMLElementSources[];
+  sources?: PictureHTMLElementSource[];
 
   /**
    * Specifies the intrinsic width of the image in pixels. Allowed if the parent of `<source>` is a `<picture>`
@@ -75,11 +75,11 @@ export interface MediaFormatSize {
  */
 export type PictureElementQueries = string;
 
-export interface PictureHTMLElementSources {
+export interface PictureHTMLElementSource {
   srcset: string;
   media: string;
-  width: number | undefined;
-  height: number | undefined;
+  width?: number;
+  height?: number;
 }
 
 /**
diff --git a/projects/storefrontlib/shared/components/media/media.service.spec.ts b/projects/storefrontlib/shared/components/media/media.service.spec.ts
index 8b9dc5d2b14..ebed037d5bf 100644
--- a/projects/storefrontlib/shared/components/media/media.service.spec.ts
+++ b/projects/storefrontlib/shared/components/media/media.service.spec.ts
@@ -24,22 +24,24 @@ const MockStorefrontConfig: Config = {
       width: 1,
     },
   },
-  pictureElementFormats: {
-    format400: {
-      mediaQueries:
-        '(max-width: 768px) and (-webkit-min-device-pixel-ratio: 3)',
-    },
-    format200: {
-      mediaQueries: '(min-width: 768px) and (max-width: 1024px)',
-    },
-    format600: {
-      mediaQueries: '(min-width: 1025px) and (max-width: 1439px)',
-    },
-    format1: {
-      mediaQueries: '(min-width: 1440px)',
+  media: {
+    pictureElementFormats: {
+      format400: {
+        mediaQueries:
+          '(max-width: 768px) and (-webkit-min-device-pixel-ratio: 3)',
+      },
+      format200: {
+        mediaQueries: '(min-width: 768px) and (max-width: 1024px)',
+      },
+      format600: {
+        mediaQueries: '(min-width: 1025px) and (max-width: 1439px)',
+      },
+      format1: {
+        mediaQueries: '(min-width: 1440px)',
+      },
     },
+    pictureFormatsOrder: ['format1', 'format200', 'format400', 'format600'],
   },
-  pictureFormatsOrder: ['format1', 'format200', 'format400', 'format600'],
 };
 
 const mockUnknownMediaContainer = {
@@ -90,6 +92,41 @@ const mockBestFormatMediaContainer: MediaContainer = {
   },
 };
 
+const mockContainerWithWidthAndHeight: MediaContainer = {
+  format1: {
+    url: 'format-1.url',
+    format: 'format1',
+    altText: 'alt text for format-1',
+    role: 'presentation',
+    width: 1400,
+    height: 500,
+  },
+  format2: {
+    url: 'format-2.url',
+    format: 'format2',
+    altText: 'alt text for format-2',
+    role: 'presentation',
+    width: 200,
+    height: 100,
+  },
+  format400: {
+    url: 'format-400.url',
+    format: 'format400',
+    altText: 'alt text for format-400',
+    role: 'presentation',
+    width: 400,
+    height: 300,
+  },
+  format600: {
+    url: 'format-600.url',
+    format: 'format600',
+    altText: 'alt text for format-600',
+    role: 'presentation',
+    width: 600,
+    height: 400,
+  },
+};
+
 const mockUrlContainer = {
   absolute: {
     url: 'http://absolute.jpg',
@@ -576,7 +613,10 @@ describe('MediaService', () => {
     it('should be sorted based on provided config', () => {
       const config = {
         ...MockStorefrontConfig,
-        pictureFormatsOrder: ['format600', 'format1', 'format400'],
+        media: {
+          ...MockStorefrontConfig.media,
+          pictureFormatsOrder: ['format600', 'format1', 'format400'],
+        },
       };
       configureTestingModule(config);
       const mediaService = TestBed.inject(MediaService);
@@ -597,7 +637,10 @@ describe('MediaService', () => {
     it('should be sorted in natural order if the order was not provided in config', () => {
       const config = {
         ...MockStorefrontConfig,
-        pictureFormatsOrder: [],
+        media: {
+          ...MockStorefrontConfig.media,
+          pictureFormatsOrder: [],
+        },
       };
       configureTestingModule(config);
       const mediaService = TestBed.inject(MediaService);
@@ -616,63 +659,69 @@ describe('MediaService', () => {
     });
   });
 
-  describe('width and height attributes for picture sources', () => {
-    it('should return all images with proper width and height properties based on values from config', () => {
-      const config = {
-        ...MockStorefrontConfig,
-        pictureElementFormats: {
-          format400: {
-            mediaQueries:
-              '(max-width: 768px) and (-webkit-min-device-pixel-ratio: 3)',
-            width: 200,
-            height: 300,
-          },
-          format200: {
-            mediaQueries: '(min-width: 768px) and (max-width: 1024px)',
-            width: 700,
-            height: 1000,
-          },
-          format600: {
-            mediaQueries: '(min-width: 1025px) and (max-width: 1439px)',
-            width: 1000,
-            height: 800,
-          },
-          format1: {
-            mediaQueries: '(min-width: 1440px)',
-            width: 1440,
-            height: 1000,
-          },
-        },
-      };
-      configureTestingModule(config);
+  describe('width and height attributes', () => {
+    it('should return all images with proper width and height properties based on values passed to container', () => {
+      configureTestingModule(MockStorefrontConfig);
       const service = TestBed.inject(MediaService);
-
       const expectedResult = [
         {
           srcset: 'base:format-1.url',
           media: '(min-width: 1440px)',
-          width: 1440,
-          height: 1000,
+          width: 1400,
+          height: 500,
         },
         {
           srcset: 'base:format-400.url',
           media: '(max-width: 768px) and (-webkit-min-device-pixel-ratio: 3)',
-          width: 200,
+          width: 400,
           height: 300,
         },
         {
           srcset: 'base:format-600.url',
           media: '(min-width: 1025px) and (max-width: 1439px)',
-          width: 1000,
-          height: 800,
+          width: 600,
+          height: 400,
         },
       ];
-
       const result = service.getMediaForPictureElement(
-        mockBestFormatMediaContainer
-      )?.sources;
+        mockContainerWithWidthAndHeight
+      );
+
+      // Width & Height of the best format image
+      expect(result?.width).toBe(600);
+      expect(result?.height).toBe(400);
+
+      expect(result?.sources).toEqual(expectedResult);
+    });
+
+    it('should return media for <img> HTML element with proper width and height properties based on values passed to container', () => {
+      configureTestingModule(MockStorefrontConfig);
+      const service = TestBed.inject(MediaService);
+
+      const result = service.getMedia(mockContainerWithWidthAndHeight);
+
+      // Width & Height of the best format image
+      expect(result?.width).toBe(600);
+      expect(result?.height).toBe(400);
+    });
+
+    it('should return media for <img> HTML element with proper width and height if container is type of Image', () => {
+      configureTestingModule(MockStorefrontConfig);
+      const service = TestBed.inject(MediaService);
+      const image = {
+        url: 'format-1.url',
+        format: 'format1',
+        altText: 'alt text for format-1',
+        role: 'presentation',
+        width: 1400,
+        height: 500,
+      };
+      const result = service.getMedia(image);
+
+      console.log(JSON.stringify(result));
 
-      expect(result).toEqual(expectedResult);
+      expect(result?.width).toBe(image.width);
+      expect(result?.height).toBe(image.height);
     });
   });
 
diff --git a/projects/storefrontlib/shared/components/media/media.service.ts b/projects/storefrontlib/shared/components/media/media.service.ts
index 4d2a258d71b..0542b9d1ff4 100644
--- a/projects/storefrontlib/shared/components/media/media.service.ts
+++ b/projects/storefrontlib/shared/components/media/media.service.ts
@@ -12,7 +12,7 @@ import {
   Media,
   MediaContainer,
   MediaFormatSize,
-  PictureHTMLElementSources,
+  PictureHTMLElementSource,
 } from './media.model';
 
 /**
@@ -133,6 +133,27 @@ export class MediaService {
       src: this.resolveAbsoluteUrl(mainMedia?.url ?? ''),
       alt: alt ?? mainMedia?.altText,
       role: role ?? mainMedia?.role,
+      ...this.getWidthAndHeight(mediaContainer, format),
+    };
+  }
+
+  /**
+   * Returns width and height for Image.
+   *
+   * Width and height are not coming from CMS so it should be
+   * manually added to the Container | Image object
+   */
+  protected getWidthAndHeight(
+    mediaContainer: MediaContainer | Image,
+    format?: string
+  ) {
+    const mainMedia: Image = mediaContainer.url
+      ? mediaContainer
+      : this.resolveMedia(mediaContainer as MediaContainer, format);
+
+    return {
+      width: mainMedia?.width,
+      height: mainMedia?.height,
     };
   }
 
@@ -179,8 +200,9 @@ export class MediaService {
     code: string;
     mediaQuery: string;
   }[] {
-    const pictureElementMediaFormats = this.config?.pictureElementFormats;
-    const pictureFormatsOrder = this.config?.pictureFormatsOrder;
+    const pictureElementMediaFormats =
+      this.config?.media?.pictureElementFormats;
+    const pictureFormatsOrder = this.config?.media?.pictureFormatsOrder;
 
     if (!pictureElementMediaFormats) {
       return [];
@@ -301,7 +323,7 @@ export class MediaService {
   protected resolveSources(
     media: MediaContainer | Image,
     maxFormat?: string
-  ): PictureHTMLElementSources[] | undefined {
+  ): PictureHTMLElementSource[] | undefined {
     if (!media) {
       return undefined;
     }
@@ -310,28 +332,22 @@ export class MediaService {
       this.sortedPictureFormats,
       maxFormat
     );
-    const pictureElementMediaFormats = this.config?.pictureElementFormats;
-
-    return pictureFormats.reduce<
-      {
-        srcset: string;
-        media: string;
-        width: number | undefined;
-        height: number | undefined;
-      }[]
-    >((sources, format) => {
-      const image = (media as MediaContainer)[format.code];
 
-      if (image?.url) {
-        sources.push({
-          srcset: this.resolveAbsoluteUrl(image.url),
-          media: format.mediaQuery,
-          width: pictureElementMediaFormats?.[format?.code]?.width,
-          height: pictureElementMediaFormats?.[format?.code]?.height,
-        });
-      }
-      return sources;
-    }, []);
+    return pictureFormats.reduce<PictureHTMLElementSource[]>(
+      (sources, format) => {
+        const image = (media as MediaContainer)[format.code];
+
+        if (image?.url) {
+          sources.push({
+            srcset: this.resolveAbsoluteUrl(image.url),
+            media: format.mediaQuery,
+            ...this.getWidthAndHeight(image, maxFormat),
+          });
+        }
+        return sources;
+      },
+      []
+    );
   }
 
   /**
diff --git a/projects/storefrontlib/shared/components/media/media.token.ts b/projects/storefrontlib/shared/components/media/media.token.ts
index 0673c7cacc8..255d46da8f1 100644
--- a/projects/storefrontlib/shared/components/media/media.token.ts
+++ b/projects/storefrontlib/shared/components/media/media.token.ts
@@ -7,7 +7,7 @@
 import { InjectionToken } from '@angular/core';
 
 /**
- * @deprecated since 2211.30. It will be eventually removed in the future
+ * @deprecated since 2211.31. It will be eventually removed in the future
  */
 export const USE_LEGACY_MEDIA_COMPONENT = new InjectionToken<boolean>(
   'USE_LEGACY_MEDIA_COMPONENT'
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index ab53c29ae76..0c5a0182f17 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/styles",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Style library containing global styles",
   "keywords": [
     "spartacus",
diff --git a/projects/storefrontstyles/scss/_versioning.scss b/projects/storefrontstyles/scss/_versioning.scss
index 87b74298064..8209771bc07 100644
--- a/projects/storefrontstyles/scss/_versioning.scss
+++ b/projects/storefrontstyles/scss/_versioning.scss
@@ -28,8 +28,8 @@
 // or `$styleVersion` are enabled.
 $_fullVersion: (
   major: 2211,
-  minor: 29,
-  patch: 1,
+  minor: 30,
+  patch: 0,
 );
 
 // The _global_ major version. Any (left over) styles from previous stable versions
diff --git a/projects/storefrontstyles/scss/components/content/navigation/_link.scss b/projects/storefrontstyles/scss/components/content/navigation/_link.scss
index b866cb457a2..7d9e7529c6f 100644
--- a/projects/storefrontstyles/scss/components/content/navigation/_link.scss
+++ b/projects/storefrontstyles/scss/components/content/navigation/_link.scss
@@ -1,6 +1,5 @@
 %cx-link {
   a {
-    display: inline;
     padding: var(--cx-padding, 0);
     margin: var(--cx-margin, 0);
     color: currentColor;
diff --git a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
index 4f9d39387f0..a9e1df61366 100644
--- a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
+++ b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
@@ -713,14 +713,6 @@
       padding-top: 16px;
       padding-bottom: 5px;
     }
-
-    .message {
-      border-bottom: solid 1px var(--cx-color-medium);
-      font-size: var(--cx-font-small, 0.9rem);
-      font-weight: 600;
-      padding-top: 16px;
-      padding-bottom: 5px;
-    }
   }
 
   @include cx-highContrastTheme {
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/modal.scss b/projects/storefrontstyles/scss/cxbase/blocks/modal.scss
index 8abc0778a14..061f3ca16c0 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/modal.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/modal.scss
@@ -75,7 +75,6 @@ $modal-min-width-asm: 95% !important;
     margin: $modal-dialog-margin-sm;
     min-width: $modal-max-width-sm;
     max-width: $modal-min-width-sm;
-    overflow-y: initial;
 
     height: 100%;
     overflow-y: auto;
diff --git a/tools/config/const.ts b/tools/config/const.ts
index ccb27e30206..878bf888afe 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.29.1';
+export const PUBLISHING_VERSION = '2211.30.0';