diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index 28050ac5ff9..3bbeff9d328 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -16,7 +16,7 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular/core": "^17.0.5",
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index a3adec7047c..99a4a4d0cd6 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index 1894dca7f02..acf37b6bbde 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -26,7 +26,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index 2c2012d1c5b..4f7b8aeae55 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 884f8c21539..a287d0dbd06 100644
--- a/feature-libs/customer-ticketing/package.json
+++ b/feature-libs/customer-ticketing/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
index 492678c3eb2..2f79086b816 100644
--- a/feature-libs/estimated-delivery-date/package.json
+++ b/feature-libs/estimated-delivery-date/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index adabb20df18..1aec0b7cbae 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index 5641e905651..8f3f6988fec 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index d1b77312900..05c78c132d0 100644
--- a/feature-libs/pdf-invoices/package.json
+++ b/feature-libs/pdf-invoices/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index f985cdb2501..9ea973a40d9 100644
--- a/feature-libs/pickup-in-store/package.json
+++ b/feature-libs/pickup-in-store/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/pickup-in-store/styles/_set-preferred-store.scss b/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
index a016eccd775..94294d63e3b 100644
--- a/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
+++ b/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
@@ -16,6 +16,7 @@
       text-decoration: underline;
       border: none;
       background: none;
+      color: inherit;
 
       @include forFeature('a11yVisibleFocusOverflows') {
         padding-inline-start: 0;
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index 2c5b59334d8..35b96629919 100644
--- a/feature-libs/product-configurator/package.json
+++ b/feature-libs/product-configurator/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/product-multi-dimensional/package.json b/feature-libs/product-multi-dimensional/package.json
index f8ce019d4c5..a3a7aa7e8ae 100644
--- a/feature-libs/product-multi-dimensional/package.json
+++ b/feature-libs/product-multi-dimensional/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index e3f242b1f76..13d75444ffa 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index 02ddaaf68aa..37e00ba5ee9 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -24,7 +24,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/quote/package.json b/feature-libs/quote/package.json
index 5a3c124ce78..05a5bf478b4 100644
--- a/feature-libs/quote/package.json
+++ b/feature-libs/quote/package.json
@@ -24,7 +24,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index 764d2b0b04e..613519dfd5b 100644
--- a/feature-libs/requested-delivery-date/package.json
+++ b/feature-libs/requested-delivery-date/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index cc177d85bf7..394ca62ac8d 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -17,7 +17,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index e13e53354ab..5a1bd9fe49d 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index 030eb0561c7..4cfef31c6fa 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -21,7 +21,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index 5b076846d85..ae5db048f77 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index c4094b9711a..f14bbaa3398 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -19,7 +19,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/cdp/package.json b/integration-libs/cdp/package.json
index 63c6f2c971d..1659b2b7b03 100644
--- a/integration-libs/cdp/package.json
+++ b/integration-libs/cdp/package.json
@@ -19,7 +19,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index 55623ec6790..eb4d0861e9e 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -20,7 +20,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/cpq-quote/package.json b/integration-libs/cpq-quote/package.json
index 95a5ee48ecf..33dd2a55cc8 100644
--- a/integration-libs/cpq-quote/package.json
+++ b/integration-libs/cpq-quote/package.json
@@ -17,7 +17,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index 905d10915f7..14bacb40f70 100644
--- a/integration-libs/digital-payments/package.json
+++ b/integration-libs/digital-payments/package.json
@@ -18,7 +18,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 2fc726e7679..1c82aeec3f9 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -29,7 +29,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/omf/package.json b/integration-libs/omf/package.json
index 56f8b1a6643..75a4aabb5f1 100644
--- a/integration-libs/omf/package.json
+++ b/integration-libs/omf/package.json
@@ -17,7 +17,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/opf/package.json b/integration-libs/opf/package.json
index 7d930659c27..fef60d57926 100644
--- a/integration-libs/opf/package.json
+++ b/integration-libs/opf/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/opps/package.json b/integration-libs/opps/package.json
index 82af3eba95e..e513fb43654 100644
--- a/integration-libs/opps/package.json
+++ b/integration-libs/opps/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/s4-service/package.json b/integration-libs/s4-service/package.json
index 07c5fa7f03e..3afb501b8b2 100644
--- a/integration-libs/s4-service/package.json
+++ b/integration-libs/s4-service/package.json
@@ -22,7 +22,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 770c75593ea..f010b3ebd77 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -17,7 +17,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index ee72f40a8c4..f23eacbb4f4 100644
--- a/integration-libs/segment-refs/package.json
+++ b/integration-libs/segment-refs/package.json
@@ -17,7 +17,7 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
diff --git a/package-lock.json b/package-lock.json
index 2aeacd5aaba..f291b341bbc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@angular/router": "^17.0.5",
         "@angular/service-worker": "^17.0.5",
         "@angular/ssr": "^17.0.5",
-        "@fontsource/open-sans": "^4.5.14",
+        "@fontsource/open-sans": "^5.1.0",
         "@fortawesome/fontawesome-free": "6.5.1",
         "@ng-select/ng-select": "^12.0.4",
         "@ngrx/effects": "^17.0.1",
@@ -40,7 +40,7 @@
         "i18next-resources-to-backend": "^1.2.0",
         "ngx-infinite-scroll": "^17.0.0",
         "rxjs": "^7.8.0",
-        "tslib": "^2.6.2",
+        "tslib": "^2.8.1",
         "zone.js": "0.14.2"
       },
       "devDependencies": {
@@ -103,7 +103,7 @@
         "jest-circus": "^29.0.0",
         "jest-environment-node": "^29.0.0",
         "jest-preset-angular": "13.1.6",
-        "jsonc-parser": "~3.2.1",
+        "jsonc-parser": "^3.3.1",
         "karma": "~6.4.1",
         "karma-chrome-launcher": "~3.2.0",
         "karma-cli": "^2.0.0",
@@ -226,6 +226,12 @@
         }
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/jsonc-parser": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "devOptional": true
+    },
     "node_modules/@angular-devkit/architect/node_modules/picomatch": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
@@ -896,6 +902,12 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/magic-string": {
       "version": "0.30.8",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
@@ -963,6 +975,12 @@
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
       "version": "5.90.3",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
@@ -1071,6 +1089,12 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-webpack/node_modules/jsonc-parser": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-webpack/node_modules/picomatch": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
@@ -2389,6 +2413,12 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular/cli/node_modules/jsonc-parser": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "devOptional": true
+    },
     "node_modules/@angular/cli/node_modules/magic-string": {
       "version": "0.30.8",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
@@ -5347,9 +5377,9 @@
       }
     },
     "node_modules/@fontsource/open-sans": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.14.tgz",
-      "integrity": "sha512-mBXIIETBlW8q/ocuUN0hyGow2iuf75hQEHQt8R/RJ/HcphVbLg8KB7pHYGbFGDqs75W+SWvTC7JkVeAjT65BuQ=="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
+      "integrity": "sha512-g+mjF8gWUDwck9DrRCkhmFeEj7fskjtKZJKAQguVzSg93lc6ThakTHMRgs0dZfe5qBbktrV839tDrb4bIDyZSA=="
     },
     "node_modules/@fortawesome/fontawesome-free": {
       "version": "6.5.1",
@@ -16882,10 +16912,10 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "devOptional": true
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
@@ -23003,9 +23033,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "node_modules/tuf-js": {
       "version": "2.2.1",
@@ -24359,6 +24389,12 @@
             "source-map": "0.7.4"
           }
         },
+        "jsonc-parser": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+          "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+          "devOptional": true
+        },
         "picomatch": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
@@ -24718,6 +24754,12 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
+        "jsonc-parser": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+          "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+          "dev": true
+        },
         "magic-string": {
           "version": "0.30.8",
           "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
@@ -24765,6 +24807,12 @@
             }
           }
         },
+        "tslib": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+          "dev": true
+        },
         "webpack": {
           "version": "5.90.3",
           "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
@@ -24833,6 +24881,12 @@
             "source-map": "0.7.4"
           }
         },
+        "jsonc-parser": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+          "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+          "dev": true
+        },
         "picomatch": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
@@ -25678,6 +25732,12 @@
             "jsonc-parser": "3.2.1"
           }
         },
+        "jsonc-parser": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+          "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+          "devOptional": true
+        },
         "magic-string": {
           "version": "0.30.8",
           "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
@@ -27595,9 +27655,9 @@
       "dev": true
     },
     "@fontsource/open-sans": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.14.tgz",
-      "integrity": "sha512-mBXIIETBlW8q/ocuUN0hyGow2iuf75hQEHQt8R/RJ/HcphVbLg8KB7pHYGbFGDqs75W+SWvTC7JkVeAjT65BuQ=="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
+      "integrity": "sha512-g+mjF8gWUDwck9DrRCkhmFeEj7fskjtKZJKAQguVzSg93lc6ThakTHMRgs0dZfe5qBbktrV839tDrb4bIDyZSA=="
     },
     "@fortawesome/fontawesome-free": {
       "version": "6.5.1",
@@ -36038,10 +36098,10 @@
       }
     },
     "jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "devOptional": true
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true
     },
     "jsonfile": {
       "version": "6.1.0",
@@ -40455,9 +40515,9 @@
       }
     },
     "tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "tuf-js": {
       "version": "2.2.1",
diff --git a/package.json b/package.json
index ae9c425f7e6..51a2d088468 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "@angular/router": "^17.0.5",
     "@angular/service-worker": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.5.1",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
@@ -156,7 +156,7 @@
     "i18next-resources-to-backend": "^1.2.0",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.8.1",
     "zone.js": "0.14.2"
   },
   "devDependencies": {
@@ -219,7 +219,7 @@
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0",
     "jest-preset-angular": "13.1.6",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "karma": "~6.4.1",
     "karma-chrome-launcher": "~3.2.0",
     "karma-cli": "^2.0.0",
diff --git a/projects/assets/package.json b/projects/assets/package.json
index c7ace06a806..9a17317c65d 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -10,7 +10,7 @@
     "generate:translations:ts-2-properties": "ts-node ./generate-translations-ts-2-properties"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/projects/core/package.json b/projects/core/package.json
index c0d47a97bbe..9b05fec9de0 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -12,7 +12,7 @@
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/core",
   "license": "Apache-2.0",
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular/common": "^17.0.5",
diff --git a/projects/core/src/state/config/state-config.ts b/projects/core/src/state/config/state-config.ts
index 63667b067ff..830a233c1d0 100644
--- a/projects/core/src/state/config/state-config.ts
+++ b/projects/core/src/state/config/state-config.ts
@@ -28,7 +28,7 @@ export abstract class StateConfig {
         /**
          * A set of state keys that should be transferred from server.
          */
-        [key: string]: StateTransferType;
+        [key: string]: StateTransferType | undefined;
       };
     };
   };
diff --git a/projects/core/src/state/reducers/transfer-state.reducer.ts b/projects/core/src/state/reducers/transfer-state.reducer.ts
index c61d80ff100..c31fe548cef 100644
--- a/projects/core/src/state/reducers/transfer-state.reducer.ts
+++ b/projects/core/src/state/reducers/transfer-state.reducer.ts
@@ -41,7 +41,7 @@ export function getTransferStateReducer(
 
 export function getServerTransferStateReducer(
   transferState: TransferState,
-  keys: { [key: string]: StateTransferType }
+  keys: { [key: string]: StateTransferType | undefined }
 ) {
   const transferStateKeys = filterKeysByType(
     keys,
@@ -63,7 +63,7 @@ export function getServerTransferStateReducer(
 
 export function getBrowserTransferStateReducer(
   transferState: TransferState,
-  keys: { [key: string]: StateTransferType },
+  keys: { [key: string]: StateTransferType | undefined },
   isLoggedIn: boolean
 ) {
   const transferStateKeys = filterKeysByType(
diff --git a/projects/core/src/state/utils/get-state-slice.ts b/projects/core/src/state/utils/get-state-slice.ts
index 1c0dab8dc59..32604b6a5fe 100644
--- a/projects/core/src/state/utils/get-state-slice.ts
+++ b/projects/core/src/state/utils/get-state-slice.ts
@@ -102,7 +102,7 @@ export function getExclusionKeys(key: string, excludeKeys: string[]): string[] {
 }
 
 export function filterKeysByType(
-  keys: { [key: string]: StorageSyncType | StateTransferType },
+  keys: { [key: string]: StorageSyncType | StateTransferType | undefined },
   type: StorageSyncType | StateTransferType
 ): string[] {
   if (!keys) {
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index 64c03d57871..8a73cf5d8e9 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -21,14 +21,14 @@
     "@angular/ssr": "^17.0.5",
     "semver": "^7.5.2",
     "ts-morph": "^23.0.0",
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular-devkit/core": "^17.0.5",
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/compiler": "^17.0.5",
     "@schematics/angular": "^17.0.5",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "parse5": "^7.1.2",
     "typescript": "^5.2.2"
   },
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 6b539cd4894..0f3894598dd 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -19,7 +19,7 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/compiler": "^17.0.5",
     "@schematics/angular": "^17.0.5",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "parse5": "^7.1.2",
     "typescript": "^5.2.2"
   },
@@ -46,7 +46,7 @@
     "rxjs": "^7.8.0"
   },
   "@spartacus/styles": {
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.5.1",
     "@ng-select/ng-select": "^12.0.4",
     "bootstrap": "^4.6.2"
@@ -496,7 +496,7 @@
     "@angular/router": "^17.0.5",
     "@angular/service-worker": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.5.1",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
@@ -515,7 +515,7 @@
     "i18next-resources-to-backend": "^1.2.0",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0",
-    "tslib": "^2.6.2",
+    "tslib": "^2.8.1",
     "zone.js": "0.14.2"
   }
 }
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 6f9e759bb1a..31ed84e3b2b 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -55,7 +55,7 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@angular/router": "^17.0.0",
     "@angular/service-worker": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.5.1",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
@@ -89,7 +89,7 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",
     "jasmine-core": "~5.1.0",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "^3.3.1",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
diff --git a/projects/ssr-tests/package.json b/projects/ssr-tests/package.json
index 4f413b05b92..a1d3c1edd03 100644
--- a/projects/ssr-tests/package.json
+++ b/projects/ssr-tests/package.json
@@ -14,7 +14,7 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@spartacus/core": "2211.32.0",
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index f12511d7081..a0a04571398 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -419,7 +419,7 @@ if (environment.cpq) {
         a11yAddPaddingToCarouselPanel: true,
         a11yHideConsentButtonWhenBannerVisible: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,
-        useSiteThemeService: false,
+        useSiteThemeService: true,
         enableConsecutiveCharactersPasswordRequirement: true,
         enablePasswordsCannotMatchInPasswordUpdateForm: true,
         allPageMetaResolversEnabledInCsr: true,
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index 59f52418844..52fb0950f54 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -10,7 +10,7 @@
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/storefrontlib",
   "license": "Apache-2.0",
   "dependencies": {
-    "tslib": "^2.6.2"
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
     "@angular/common": "^17.0.5",
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index be15bd90848..7cbfb073911 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@fontsource/open-sans": "^4.5.14",
+    "@fontsource/open-sans": "^5.1.0",
     "@fortawesome/fontawesome-free": "6.5.1",
     "@ng-select/ng-select": "^12.0.4",
     "bootstrap": "^4.6.2"
diff --git a/projects/storefrontstyles/scss/components/content/tab/_tab.scss b/projects/storefrontstyles/scss/components/content/tab/_tab.scss
index f6cad2b2917..64a176b4774 100644
--- a/projects/storefrontstyles/scss/components/content/tab/_tab.scss
+++ b/projects/storefrontstyles/scss/components/content/tab/_tab.scss
@@ -104,6 +104,7 @@
       background-color: var(--cx-tab-btn-bg-color);
       border: var(--cx-tab-btn-border);
       border-radius: var(--cx-tab-btn-border-radius);
+      color: inherit;
     }
   }
 
@@ -119,6 +120,7 @@
       text-align: start;
       height: 63px;
       position: relative;
+      color: inherit;
 
       &:before {
         margin: 0px 15px;
diff --git a/projects/storefrontstyles/scss/components/product/_star-rating.scss b/projects/storefrontstyles/scss/components/product/_star-rating.scss
index 28638f69f02..8db7d2975be 100644
--- a/projects/storefrontstyles/scss/components/product/_star-rating.scss
+++ b/projects/storefrontstyles/scss/components/product/_star-rating.scss
@@ -24,7 +24,7 @@
           var(--cx-color-primary) 0%,
           var(--cx-color-primary)
             calc((var(--star-fill, 0) - #{$i} + 1) * 100%),
-          var(--cx-color-medium) calc((var(--star-fill, 0) - #{$i} + 1) * 100%)
+          var(--cx-color-dark) calc((var(--star-fill, 0) - #{$i} + 1) * 100%)
         );
         // somehow we cannot move the text related clip and fill color outside this loop.
         // most likely they cannot come before the definition of the background.