diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2d9f8d7d3a..4bb551acbbd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -230,7 +230,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
       - name: Cache node_modules
         id: cache-node-modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: | 
             node_modules
@@ -277,7 +277,7 @@ jobs:
       - name: Notify the slack channel of when build conclusion failed
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        uses: slackapi/slack-github-action@v1.26.0
+        uses: slackapi/slack-github-action@v1.27.0
         with:
           channel-id: ${{ secrets.SLACK_NOTIFICATION_CHANNEL }}
           payload: |
diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index de48148ca93..84a5eeffcdf 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/user": "2211.29.0"
+    "@spartacus/cart": "2211.29.1",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/order": "2211.29.1",
+    "@spartacus/user": "2211.29.1"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
index 26fb3c402cd..18c25b9c4c9 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
@@ -36,14 +36,14 @@ class MockExpressServerLogger implements Partial<ExpressServerLogger> {
  * Usage:
  * 1. Instantiate the class with desired options
  * 2. Call request() to run request through engine
- * 3. Examine renders property for the renders
+ * 3. Examine responses property
  */
 class TestEngineRunner {
   /** Accumulates html output for engine runs */
-  renders: (string | Error)[] = [];
+  responses: (string | Error)[] = [];
 
-  /** Accumulates response parameters for engine runs */
-  responseParams: object[] = [];
+  /** Accumulates responses' headers for engine runs */
+  responsesHeaders: object[] = [];
 
   renderCount = 0;
   optimizedSsrEngine: OptimizedSsrEngine;
@@ -86,7 +86,7 @@ class TestEngineRunner {
     return new TestEngineRunner(options, renderTime, { withError: true });
   }
 
-  /** Run request against the engine. The result will be stored in rendering property. */
+  /** Run request against the engine. The result will be stored in `responses` property. */
   request(
     url: string,
     params?: {
@@ -94,8 +94,8 @@ class TestEngineRunner {
       httpHeaders?: IncomingHttpHeaders;
     }
   ): TestEngineRunner {
-    const response: { [key: string]: string } = {};
-    const headers = params?.httpHeaders ?? { host };
+    const responseHeaders: { [key: string]: string } = {};
+    const requestHeaders = params?.httpHeaders ?? { host };
     /** used when resolving getRequestUrl() and getRequestOrigin() */
     const app = <Partial<Application>>{
       get:
@@ -108,22 +108,22 @@ class TestEngineRunner {
       req: <Partial<Request>>{
         protocol: 'https',
         originalUrl: url,
-        headers,
+        headers: requestHeaders,
         get: (header: string): string | string[] | null | undefined => {
-          return headers[header];
+          return requestHeaders[header];
         },
         app,
         connection: <Partial<Socket>>{},
         res: <Partial<Response>>{
-          set: (key: string, value: any) => (response[key] = value),
+          set: (key: string, value: any) => (responseHeaders[key] = value),
           locals: {},
         },
       },
     };
 
     this.engineInstance(url, optionsMock, (error, html): void => {
-      this.renders.push(html ?? error ?? '');
-      this.responseParams.push(response);
+      this.responses.push(html ?? error ?? '');
+      this.responsesHeaders.push(responseHeaders);
     });
 
     return this;
@@ -188,7 +188,9 @@ describe('OptimizedSsrEngine', () => {
   context: {
     timestamp: '2023-01-01T00:00:00.000Z',
     options: {
+      cache: false,
       cacheSize: 3000,
+      ttl: undefined,
       concurrency: 10,
       timeout: 50,
       forcedSsrTimeout: 60000,
@@ -198,6 +200,9 @@ describe('OptimizedSsrEngine', () => {
       logger: 'DefaultExpressServerLogger',
       shouldCacheRenderingResult: '({ options, entry }) => !(options.ssrFeatureToggles?.avoidCachingErrors === true &&\\n' +
         '        Boolean(entry.err))',
+      renderKeyResolver: 'function getRequestUrl(req) {\\n' +
+        '    return (0, express_request_origin_1.getRequestOrigin)(req) + req.originalUrl;\\n' +
+        '}',
       ssrFeatureToggles: { avoidCachingErrors: false }
     }
   }
@@ -208,12 +213,12 @@ describe('OptimizedSsrEngine', () => {
   });
 
   describe('rendering', () => {
-    it('should return rendered output if no errors', fakeAsync(() => {
+    it('should return rendered HTML if no errors', fakeAsync(() => {
       const originalUrl = 'a';
       const engineRunner = new TestEngineRunner({}).request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0']);
+      expect(engineRunner.responses).toEqual(['a-0']);
       expect(consoleLogSpy).toHaveBeenCalledWith(
         expect.stringContaining(
           `Request is resolved with the SSR rendering result (${originalUrl})`
@@ -226,7 +231,7 @@ describe('OptimizedSsrEngine', () => {
       const engineRunner = TestEngineRunner.withError({}).request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual([new Error('a-0')]);
+      expect(engineRunner.responses).toEqual([new Error('a-0')]);
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         expect.stringContaining(
           `Request is resolved with the SSR rendering error (${originalUrl})`
@@ -260,39 +265,39 @@ describe('OptimizedSsrEngine', () => {
   });
 
   describe('timeout option', () => {
-    it('should fallback to CSR if rendering exceeds timeout', fakeAsync(() => {
+    it('should fallback to CSR if rendering exceeds a request timeout', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({ timeout: 50 }).request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
     }));
 
-    it('should return timed out render in the followup request', fakeAsync(() => {
+    it('should reuse HTML meant for a previous timeouted request, if the new request is for the same url', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({ timeout: 50 }).request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
 
       engineRunner.request('a');
-      expect(engineRunner.renders[1]).toEqual('a-0');
+      expect(engineRunner.responses[1]).toEqual('a-0');
     }));
 
-    it('should return render if rendering meets timeout', fakeAsync(() => {
+    it('should return HTML if rendering meets timeout', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({ timeout: 150 }).request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0']);
+      expect(engineRunner.responses).toEqual(['a-0']);
     }));
 
     it('should fallback instantly if is set to 0', () => {
       const engineRunner = new TestEngineRunner({ timeout: 0 }).request('a');
 
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
     });
 
-    it('should return timed out render in the followup request, also when timeout is set to 0', fakeAsync(() => {
+    it('should return HTML meant for a previous timeouted request if the new request is for the same url, even if `timeout` is configured to 0', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({ timeout: 0 }).request('a');
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
       expect(getCurrentConcurrency(engineRunner)).toEqual({
         currentConcurrency: 1,
       });
@@ -303,37 +308,38 @@ describe('OptimizedSsrEngine', () => {
       });
 
       engineRunner.request('a');
-      expect(engineRunner.renders[1]).toEqual('a-0');
+      expect(engineRunner.responses[1]).toEqual('a-0');
       expect(getCurrentConcurrency(engineRunner)).toEqual({
         currentConcurrency: 0,
       });
     }));
   });
 
-  describe('no-store cache control header', () => {
-    it('should be applied for a fallback', () => {
+  describe('no-store cache control header in response', () => {
+    it('should be applied if a request times out ', () => {
       const engineRunner = new TestEngineRunner({ timeout: 0 }).request('a');
 
-      expect(engineRunner.renders).toEqual(['']);
-      expect(engineRunner.responseParams).toEqual([
+      expect(engineRunner.responses).toEqual(['']);
+      expect(engineRunner.responsesHeaders).toEqual([
         { 'Cache-Control': 'no-store' },
       ]);
     });
 
-    it('should not be applied for a render within time limit', fakeAsync(() => {
+    it('should not be applied if rendering finishes before request times out', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({ timeout: 200 }).request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0']);
-      expect(engineRunner.responseParams).toEqual([{}]);
+      expect(engineRunner.responses).toEqual(['a-0']);
+      expect(engineRunner.responsesHeaders).toEqual([{}]);
     }));
-    it('should not be applied for a render served with next response', fakeAsync(() => {
+
+    it('should not be applied for subsequent requests to the same url, when reusing a HTML meant for a previous timed out request', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({ timeout: 50 }).request('a');
 
       tick(200);
       engineRunner.request('a');
-      expect(engineRunner.renders).toEqual(['', 'a-0']);
-      expect(engineRunner.responseParams).toEqual([
+      expect(engineRunner.responses).toEqual(['', 'a-0']);
+      expect(engineRunner.responsesHeaders).toEqual([
         { 'Cache-Control': 'no-store' },
         {},
       ]);
@@ -341,7 +347,7 @@ describe('OptimizedSsrEngine', () => {
   });
 
   describe('cache option', () => {
-    it('should not cache requests if disabled', fakeAsync(() => {
+    it('should not cache HTML if `cache` is disabled', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({
         cache: false,
         timeout: 200,
@@ -352,9 +358,10 @@ describe('OptimizedSsrEngine', () => {
       tick(200);
       engineRunner.request('a');
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0', 'a-1', 'a-2']);
+      expect(engineRunner.responses).toEqual(['a-0', 'a-1', 'a-2']);
     }));
-    it('should cache requests if enabled', fakeAsync(() => {
+
+    it('should cache HTML if `cache` is enabled', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({
         cache: true,
         timeout: 200,
@@ -379,7 +386,7 @@ describe('OptimizedSsrEngine', () => {
 
       tick(200);
 
-      expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-0']);
+      expect(engineRunner.responses).toEqual(['a-0', 'a-0', 'a-0']);
     }));
   });
 
@@ -398,7 +405,7 @@ describe('OptimizedSsrEngine', () => {
         tick(200);
         engineRunner.request('a');
         tick(200);
-        expect(engineRunner.renders).toEqual([
+        expect(engineRunner.responses).toEqual([
           new Error('a-0'),
           new Error('a-1'),
           new Error('a-2'),
@@ -418,7 +425,7 @@ describe('OptimizedSsrEngine', () => {
         tick(200);
         engineRunner.request('a');
         tick(200);
-        expect(engineRunner.renders).toEqual([
+        expect(engineRunner.responses).toEqual([
           new Error('a-0'),
           new Error('a-0'),
           new Error('a-0'),
@@ -438,7 +445,7 @@ describe('OptimizedSsrEngine', () => {
         tick(200);
         engineRunner.request('a');
         tick(200);
-        expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-0']);
+        expect(engineRunner.responses).toEqual(['a-0', 'a-0', 'a-0']);
       }));
 
       it('should cache HTML if `avoidCachingErrors` is set to false', fakeAsync(() => {
@@ -454,7 +461,7 @@ describe('OptimizedSsrEngine', () => {
         tick(200);
         engineRunner.request('a');
         tick(200);
-        expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-0']);
+        expect(engineRunner.responses).toEqual(['a-0', 'a-0', 'a-0']);
       }));
     });
   });
@@ -471,7 +478,7 @@ describe('OptimizedSsrEngine', () => {
       tick(200);
       engineRunner.request('a');
       tick(200);
-      expect(engineRunner.renders).toEqual([
+      expect(engineRunner.responses).toEqual([
         new Error('a-0'),
         new Error('a-1'),
         new Error('a-2'),
@@ -489,7 +496,7 @@ describe('OptimizedSsrEngine', () => {
       tick(200);
       engineRunner.request('a');
       tick(200);
-      expect(engineRunner.renders).toEqual([
+      expect(engineRunner.responses).toEqual([
         new Error('a-0'),
         new Error('a-0'),
         new Error('a-0'),
@@ -507,7 +514,7 @@ describe('OptimizedSsrEngine', () => {
       tick(200);
       engineRunner.request('a');
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0', 'a-1', 'a-2']);
+      expect(engineRunner.responses).toEqual(['a-0', 'a-1', 'a-2']);
     }));
 
     it('should cache HTML if `shouldCacheRenderingResult` returns true', fakeAsync(() => {
@@ -521,7 +528,7 @@ describe('OptimizedSsrEngine', () => {
       tick(200);
       engineRunner.request('a');
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-0']);
+      expect(engineRunner.responses).toEqual(['a-0', 'a-0', 'a-0']);
     }));
   });
 
@@ -538,7 +545,7 @@ describe('OptimizedSsrEngine', () => {
         .request('e');
 
       tick(200);
-      expect(engineRunner.renders).toEqual([
+      expect(engineRunner.responses).toEqual([
         '', // CSR fallback for 'd'
         '', // CSR fallback for 'e'
         'a-0',
@@ -561,7 +568,7 @@ describe('OptimizedSsrEngine', () => {
       engineRunner.request('f').request('g');
       tick(200);
 
-      expect(engineRunner.renders).toEqual([
+      expect(engineRunner.responses).toEqual([
         '', // CSR fallback for 'c'
         'a-0',
         '', // CSR fallback for 'e'
@@ -574,7 +581,7 @@ describe('OptimizedSsrEngine', () => {
   });
 
   describe('ttl option', () => {
-    it('should invalidate expired renders', fakeAsync(() => {
+    it('should invalidate expired cache entries', fakeAsync(() => {
       let currentDate = 100;
       jest.spyOn(Date, 'now').mockImplementation(() => currentDate);
 
@@ -593,10 +600,10 @@ describe('OptimizedSsrEngine', () => {
       engineRunner.request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-1']);
+      expect(engineRunner.responses).toEqual(['a-0', 'a-0', 'a-1']);
     }));
 
-    it('should not invalidate renders if ttl is not defined', fakeAsync(() => {
+    it('should not invalidate cache entries if `ttl` is not defined', fakeAsync(() => {
       let currentDate = 100;
       jest.spyOn(Date, 'now').mockImplementation(() => currentDate);
 
@@ -614,7 +621,7 @@ describe('OptimizedSsrEngine', () => {
       engineRunner.request('a');
 
       tick(200);
-      expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-0']);
+      expect(engineRunner.responses).toEqual(['a-0', 'a-0', 'a-0']);
     }));
   });
 
@@ -679,7 +686,7 @@ describe('OptimizedSsrEngine', () => {
       tick(200);
       engineRunner.request('elu');
       tick(200);
-      expect(engineRunner.renders).toEqual([
+      expect(engineRunner.responses).toEqual([
         'ala-0',
         'ala-0',
         'ela-1',
@@ -699,7 +706,7 @@ describe('OptimizedSsrEngine', () => {
         }).request('a');
 
         tick(200);
-        expect(engineRunner.renders).toEqual(['a-0']);
+        expect(engineRunner.responses).toEqual(['a-0']);
       }));
 
       it('should ignore timeout also when it is set to 0', fakeAsync(() => {
@@ -712,10 +719,10 @@ describe('OptimizedSsrEngine', () => {
         engineRunner.request('a');
 
         tick(200);
-        expect(engineRunner.renders).toEqual(['a-0']);
+        expect(engineRunner.responses).toEqual(['a-0']);
       }));
 
-      it('when reuseCurrentRendering is false, it should render each request separately, even if there is already a pending render for the same rendering key', fakeAsync(() => {
+      it('when reuseCurrentRendering is false, it should render for each request separately, even if there is already a pending render for the same rendering key', fakeAsync(() => {
         const engineRunner = new TestEngineRunner({
           renderingStrategyResolver: () => RenderingStrategy.ALWAYS_SSR,
           timeout: 200,
@@ -736,10 +743,10 @@ describe('OptimizedSsrEngine', () => {
         expect(getCurrentConcurrency(engineRunner)).toEqual({
           currentConcurrency: 2,
         });
-        expect(engineRunner.renders).toEqual([]);
+        expect(engineRunner.responses).toEqual([]);
 
         tick(100);
-        expect(engineRunner.renders).toEqual(['a-0', 'a-1']);
+        expect(engineRunner.responses).toEqual(['a-0', 'a-1']);
         expect(
           engineRunner.optimizedSsrEngine['expressEngine']
         ).toHaveBeenCalledTimes(2);
@@ -762,7 +769,7 @@ describe('OptimizedSsrEngine', () => {
         tick(200);
         engineRunner.request('a');
         tick(200);
-        expect(engineRunner.renders).toEqual(['', '']);
+        expect(engineRunner.responses).toEqual(['', '']);
       }));
 
       it('should not start the actual render in the background', fakeAsync(() => {
@@ -777,7 +784,7 @@ describe('OptimizedSsrEngine', () => {
         );
 
         engineRunner.request('a');
-        expect(engineRunner.renders).toEqual(['']);
+        expect(engineRunner.responses).toEqual(['']);
 
         expect(
           engineRunner.optimizedSsrEngine['expressEngine']
@@ -796,10 +803,10 @@ describe('OptimizedSsrEngine', () => {
 
         tick(200);
         engineRunner.request('a');
-        expect(engineRunner.renders).toEqual(['', 'a-0']);
+        expect(engineRunner.responses).toEqual(['', 'a-0']);
       }));
 
-      it('when reuseCurrentRendering is false, it should fallback to CSR when there is already pending a render for the same rendering key', fakeAsync(() => {
+      it('when reuseCurrentRendering is false, it should fallback to CSR when there is already a pending render for the same rendering key', fakeAsync(() => {
         const engineRunner = new TestEngineRunner({
           renderingStrategyResolver: () => RenderingStrategy.DEFAULT,
           timeout: 200,
@@ -815,10 +822,10 @@ describe('OptimizedSsrEngine', () => {
           currentConcurrency: 1,
         });
 
-        expect(engineRunner.renders).toEqual(['']); // immediate fallback to CSR for the 2nd request for the same key
+        expect(engineRunner.responses).toEqual(['']); // immediate fallback to CSR for the 2nd request for the same key
 
         tick(100);
-        expect(engineRunner.renders).toEqual(['', 'a-0']);
+        expect(engineRunner.responses).toEqual(['', 'a-0']);
         expect(getCurrentConcurrency(engineRunner)).toEqual({
           currentConcurrency: 0,
         });
@@ -839,13 +846,13 @@ describe('OptimizedSsrEngine', () => {
         engineRunner.request('a', { httpHeaders: { 'User-Agent': 'bot' } });
         tick(200);
 
-        expect(engineRunner.renders).toEqual(['', 'a-1']);
+        expect(engineRunner.responses).toEqual(['', 'a-1']);
       }));
     });
   });
 
   describe('forcedSsrTimeout option', () => {
-    it('should fallback to CSR when forcedSsrTimeout timeout is exceeded for ALWAYS_SSR rendering strategy, and return the timed out render in the followup request', fakeAsync(() => {
+    it('should fallback to CSR when forcedSsrTimeout timeout is exceeded for ALWAYS_SSR rendering strategy, and after that rendering ends, its HTML should be reused in the next request for the same url', fakeAsync(() => {
       const engineRunner = new TestEngineRunner({
         renderingStrategyResolver: () => RenderingStrategy.ALWAYS_SSR,
         timeout: 50,
@@ -858,15 +865,15 @@ describe('OptimizedSsrEngine', () => {
       });
 
       tick(60);
-      expect(engineRunner.renders).toEqual([]);
+      expect(engineRunner.responses).toEqual([]);
       tick(50);
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
       expect(getCurrentConcurrency(engineRunner)).toEqual({
         currentConcurrency: 0,
       });
 
       engineRunner.request('a');
-      expect(engineRunner.renders).toEqual(['', 'a-0']);
+      expect(engineRunner.responses).toEqual(['', 'a-0']);
       expect(getCurrentConcurrency(engineRunner)).toEqual({
         currentConcurrency: 0,
       });
@@ -881,11 +888,11 @@ describe('OptimizedSsrEngine', () => {
       engineRunner.request('a');
 
       tick(60);
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
 
       tick(50);
       engineRunner.request('a');
-      expect(engineRunner.renders).toEqual(['', 'a-0']);
+      expect(engineRunner.responses).toEqual(['', 'a-0']);
     }));
   });
   describe('maxRenderTime option', () => {
@@ -1017,7 +1024,7 @@ describe('OptimizedSsrEngine', () => {
         renderTime
       ).request(requestUrl);
       jest.spyOn(engineRunner.optimizedSsrEngine as any, 'log');
-      expect(engineRunner.renders).toEqual([]);
+      expect(engineRunner.responses).toEqual([]);
 
       tick(fiveMinutes + 101);
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
@@ -1025,10 +1032,10 @@ describe('OptimizedSsrEngine', () => {
         false,
         { request: expect.objectContaining({ originalUrl: requestUrl }) }
       );
-      expect(engineRunner.renders).toEqual(['']);
+      expect(engineRunner.responses).toEqual(['']);
 
       engineRunner.request(requestUrl);
-      expect(engineRunner.renders).toEqual(['']); // if the result was cached, the 2nd request would get immediately 'a-0'
+      expect(engineRunner.responses).toEqual(['']); // if the result was cached, the 2nd request would get immediately 'a-0'
       flush();
     }));
   });
@@ -1083,14 +1090,14 @@ describe('OptimizedSsrEngine', () => {
           false,
           { request: expect.objectContaining({ originalUrl: requestUrl }) }
         );
-        expect(engineRunner.renders).toEqual(['', '']);
+        expect(engineRunner.responses).toEqual(['', '']);
 
         flush();
       }));
     });
 
     describe('when enabled', () => {
-      describe('multiple subsequent requests for the same rendering key should reuse the same render', () => {
+      describe('multiple subsequent requests for the same rendering key should await for the result of the same pending rendering, and all get the same HTML response', () => {
         it('and the first request should timeout', fakeAsync(() => {
           const timeout = 300;
           const engineRunner = new TestEngineRunner(
@@ -1113,7 +1120,7 @@ describe('OptimizedSsrEngine', () => {
 
           tick(100);
           expect(engineRunner.renderCount).toEqual(1);
-          expect(engineRunner.renders).toEqual(['', `${requestUrl}-0`]);
+          expect(engineRunner.responses).toEqual(['', `${requestUrl}-0`]);
           flush();
         }));
 
@@ -1151,7 +1158,7 @@ describe('OptimizedSsrEngine', () => {
 
           expect(renderExceedMessageCount).toBe(2);
           expect(engineRunner.renderCount).toEqual(0);
-          expect(engineRunner.renders).toEqual(['', '']);
+          expect(engineRunner.responses).toEqual(['', '']);
 
           flush();
         }));
@@ -1187,7 +1194,7 @@ describe('OptimizedSsrEngine', () => {
           tick(200);
 
           expect(engineRunner.renderCount).toEqual(1);
-          expect(engineRunner.renders).toEqual([
+          expect(engineRunner.responses).toEqual([
             `${requestUrl}-0`,
             `${requestUrl}-0`,
           ]);
@@ -1237,7 +1244,7 @@ describe('OptimizedSsrEngine', () => {
             false,
             { request: expect.objectContaining({ originalUrl: requestUrl }) }
           );
-          expect(engineRunner.renders).toEqual(['']); // the first request fallback to CSR due to timeout
+          expect(engineRunner.responses).toEqual(['']); // the first request fallback to CSR due to timeout
           expect(getCurrentConcurrency(engineRunner)).toEqual({
             currentConcurrency: 1,
           }); // the render still continues in the background
@@ -1245,7 +1252,7 @@ describe('OptimizedSsrEngine', () => {
           // eventually the render succeeds and 2 remaining requests get the same response:
           tick(100);
           expect(engineRunner.renderCount).toEqual(1);
-          expect(engineRunner.renders).toEqual([
+          expect(engineRunner.responses).toEqual([
             '', // CSR fallback of the 1st request due to it timed out
             `${requestUrl}-0`,
             `${requestUrl}-0`,
@@ -1260,7 +1267,7 @@ describe('OptimizedSsrEngine', () => {
           flush();
         }));
 
-        it('and concurrency limit should NOT fallback to CSR, when the request is for a pending render', fakeAsync(() => {
+        it('and concurrency limit should NOT fallback to CSR, when there is a pending rendering for the same rendering key', fakeAsync(() => {
           const engineRunner = new TestEngineRunner({
             reuseCurrentRendering: true,
             timeout: 200,
@@ -1277,7 +1284,7 @@ describe('OptimizedSsrEngine', () => {
           ).not.toHaveBeenCalledWith(
             `CSR fallback: Concurrency limit exceeded (1)`
           );
-          expect(engineRunner.renders).toEqual(['a-0', 'a-0']);
+          expect(engineRunner.responses).toEqual(['a-0', 'a-0']);
         }));
 
         it('combined with a different request should take up two concurrency slots', fakeAsync(() => {
@@ -1312,7 +1319,7 @@ describe('OptimizedSsrEngine', () => {
           });
 
           tick(250);
-          expect(engineRunner.renders).toEqual([
+          expect(engineRunner.responses).toEqual([
             'a-0',
             'a-0',
             'a-0',
@@ -1429,7 +1436,7 @@ describe('OptimizedSsrEngine', () => {
         );
 
         expect(engineRunner.renderCount).toEqual(1);
-        expect(engineRunner.renders).toEqual(['', '']);
+        expect(engineRunner.responses).toEqual(['', '']);
 
         flush();
       }));
@@ -1459,34 +1466,39 @@ describe('OptimizedSsrEngine', () => {
         logger: new MockExpressServerLogger() as ExpressServerLogger,
       });
       expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
-        [
-          "[spartacus] SSR optimization engine initialized",
-          {
-            "options": {
-              "cacheSize": 3000,
-              "concurrency": 10,
-              "forcedSsrTimeout": 60000,
-              "logger": "MockExpressServerLogger",
-              "maxRenderTime": 300000,
-              "renderingStrategyResolver": "(request) => {
-            if (hasExcludedUrl(request, defaultAlwaysCsrOptions.excludedUrls)) {
-                return ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR;
-            }
-            return shouldFallbackToCsr(request, options)
-                ? ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR
-                : ssr_optimization_options_1.RenderingStrategy.DEFAULT;
-        }",
-              "reuseCurrentRendering": true,
-              "shouldCacheRenderingResult": "({ options, entry }) => !(options.ssrFeatureToggles?.avoidCachingErrors === true &&
-                Boolean(entry.err))",
-              "ssrFeatureToggles": {
-                "avoidCachingErrors": false,
-              },
-              "timeout": 3000,
-            },
-          },
-        ]
-      `);
+[
+  "[spartacus] SSR optimization engine initialized",
+  {
+    "options": {
+      "cache": false,
+      "cacheSize": 3000,
+      "concurrency": 10,
+      "forcedSsrTimeout": 60000,
+      "logger": "MockExpressServerLogger",
+      "maxRenderTime": 300000,
+      "renderKeyResolver": "function getRequestUrl(req) {
+    return (0, express_request_origin_1.getRequestOrigin)(req) + req.originalUrl;
+}",
+      "renderingStrategyResolver": "(request) => {
+    if (hasExcludedUrl(request, defaultAlwaysCsrOptions.excludedUrls)) {
+        return ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR;
+    }
+    return shouldFallbackToCsr(request, options)
+        ? ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR
+        : ssr_optimization_options_1.RenderingStrategy.DEFAULT;
+}",
+      "reuseCurrentRendering": true,
+      "shouldCacheRenderingResult": "({ options, entry }) => !(options.ssrFeatureToggles?.avoidCachingErrors === true &&
+        Boolean(entry.err))",
+      "ssrFeatureToggles": {
+        "avoidCachingErrors": false,
+      },
+      "timeout": 3000,
+      "ttl": undefined,
+    },
+  },
+]
+`);
     });
   });
 });
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
index 148373f0313..66d14fe1896 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
@@ -8,7 +8,6 @@
 import { Request, Response } from 'express';
 import * as fs from 'fs';
 import { NgExpressEngineInstance } from '../engine-decorator/ng-express-engine-decorator';
-import { getRequestUrl } from '../express-utils/express-request-url';
 import {
   EXPRESS_SERVER_LOGGER,
   ExpressServerLogger,
@@ -21,13 +20,9 @@ import {
   RenderingStrategy,
   SsrOptimizationOptions,
   defaultSsrOptimizationOptions,
+  getDefaultRenderKey,
 } from './ssr-optimization-options';
 
-/**
- * Returns the full url for the given SSR Request.
- */
-export const getDefaultRenderKey = getRequestUrl;
-
 export type SsrCallbackFn = (
   /**
    * Error that might've occurred while rendering.
diff --git a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
index 9f3610ef5da..6508f5044f0 100644
--- a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
+++ b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
@@ -5,6 +5,7 @@
  */
 
 import { Request } from 'express';
+import { getRequestUrl } from '../express-utils/express-request-url';
 import { DefaultExpressServerLogger, ExpressServerLogger } from '../logger';
 import { RenderingEntry } from './rendering-cache.model';
 import { defaultRenderingStrategyResolver } from './rendering-strategy-resolver';
@@ -48,7 +49,7 @@ export interface SsrOptimizationOptions {
    * Time in milliseconds after prerendered page is becoming stale and should
    * be rendered again.
    */
-  ttl?: number;
+  ttl?: number | undefined;
 
   /**
    * Allows overriding default key generator for custom differentiating
@@ -188,10 +189,34 @@ type DeepRequired<T> = {
   [P in keyof T]-?: DeepRequired<T[P]>;
 };
 
-export const defaultSsrOptimizationOptions: SsrOptimizationOptions &
-  // To not forget adding default values, when adding new feature toggles in the type in the future
-  DeepRequired<Pick<SsrOptimizationOptions, 'ssrFeatureToggles'>> = {
+/**
+ * Returns the full url for the given SSR Request.
+ */
+export const getDefaultRenderKey = getRequestUrl;
+
+/**
+ * The type of `defaultSsrOptimizationOptions` ensures that all properties are set to a default value.
+ * Thanks to this, all options are well-defined and can be printed to logs on the SSR server start.
+ */
+type DefaultSsrOptimizationOptions = Omit<
+  Required<SsrOptimizationOptions>,
+  | 'debug' // debug is deprecated and not used anymore
+  | 'ttl' // ttl is required but its default value is `undefined`
+> & {
+  ttl: number | undefined; // needed, otherwise we could not set the value `ttl: undefined` value (due to the Required<...>)
+} & DeepRequired<
+    // all nested properties of `ssrFeatureToggles` are required too
+    Pick<
+      SsrOptimizationOptions,
+      //
+      'ssrFeatureToggles'
+    >
+  >;
+
+export const defaultSsrOptimizationOptions: DefaultSsrOptimizationOptions = {
+  cache: false,
   cacheSize: 3000,
+  ttl: undefined,
   concurrency: 10,
   timeout: 3_000,
   forcedSsrTimeout: 60_000,
@@ -206,6 +231,7 @@ export const defaultSsrOptimizationOptions: SsrOptimizationOptions &
       options.ssrFeatureToggles?.avoidCachingErrors === true &&
       Boolean(entry.err)
     ),
+  renderKeyResolver: getDefaultRenderKey,
   ssrFeatureToggles: {
     avoidCachingErrors: false,
   },
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index 605268eff92..9574a9aa1e4 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefinder": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/cart/base/assets/translations/en/cart.json b/feature-libs/cart/base/assets/translations/en/cart.json
index 1ce81e55787..8abe49131bc 100644
--- a/feature-libs/cart/base/assets/translations/en/cart.json
+++ b/feature-libs/cart/base/assets/translations/en/cart.json
@@ -34,6 +34,7 @@
     "coupon": "Have a coupon?",
     "coupon_other": "Coupon codes",
     "couponLabel": "Enter a promo code here",
+    "addCoupon": "Add a coupon",
     "apply": "Apply",
     "placeholder": "Promo code",
     "applyVoucherSuccess": "{{voucherCode}} has been applied.",
diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
index 01ace1fa6ba..d5cf777ba5f 100644
--- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
+++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
@@ -12,8 +12,8 @@
     </ng-container>
 
     <form (ngSubmit)="applyVoucher()" [formGroup]="couponForm">
-      <label class="cx-cart-coupon-title">
-        {{ 'voucher.coupon' | cxTranslate }}
+      <label id="card-coupon-input-label" class="cx-cart-coupon-title">
+        {{ 'voucher.addCoupon' | cxTranslate }}
         <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
         <ng-container
           *cxFeature="
@@ -37,7 +37,7 @@
           "
         >
           <input
-            [attr.aria-label]="'voucher.couponLabel' | cxTranslate"
+            [attr.aria-labelledby]="'card-coupon-input-label'"
             type="text"
             class="form-control input-coupon-code"
             formControlName="couponCode"
@@ -62,7 +62,7 @@
         >
           <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
           <input
-            [attr.aria-label]="'voucher.couponLabel' | cxTranslate"
+            [attr.aria-labelledby]="'card-coupon-input-label'"
             required="true"
             type="text"
             class="form-control input-coupon-code"
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index 8e5caa530c0..7412f1aa97d 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.ts b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.ts
index 7908b0b7bef..62b51da4a90 100644
--- a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.ts
+++ b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.ts
@@ -7,6 +7,7 @@
 import { Component } from '@angular/core';
 import { Cart, OrderEntry } from '@spartacus/cart/base/root';
 import { WishListFacade } from '@spartacus/cart/wish-list/root';
+import { useFeatureStyles } from '@spartacus/core';
 import { Observable } from 'rxjs';
 
 @Component({
@@ -17,7 +18,9 @@ export class WishListComponent {
   wishList$: Observable<Cart> = this.wishListFacade.getWishList();
   loading$: Observable<boolean> = this.wishListFacade.getWishListLoading();
 
-  constructor(protected wishListFacade: WishListFacade) {}
+  constructor(protected wishListFacade: WishListFacade) {
+    useFeatureStyles('a11yVisibleFocusOverflows');
+  }
 
   removeEntry(item: OrderEntry) {
     this.wishListFacade.removeEntry(item);
diff --git a/feature-libs/cart/wish-list/styles/_wish-list.scss b/feature-libs/cart/wish-list/styles/_wish-list.scss
index 3114b8fdfce..217aefd6b61 100644
--- a/feature-libs/cart/wish-list/styles/_wish-list.scss
+++ b/feature-libs/cart/wish-list/styles/_wish-list.scss
@@ -19,6 +19,12 @@
         }
       }
     }
+
+    @include forFeature('a11yVisibleFocusOverflows') {
+      .cx-remove-btn {
+        margin-top: 0.5rem;
+      }
+    }
   }
 
   .cx-empty-wish-list {
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index 01d6895b6f4..9daf3db9284 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 4acd04b0509..33e486a7fb7 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
index e919c30b847..e18895481f0 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/order/assets/translations/en/order.json b/feature-libs/order/assets/translations/en/order.json
index 1a41cf0c822..4674637a531 100644
--- a/feature-libs/order/assets/translations/en/order.json
+++ b/feature-libs/order/assets/translations/en/order.json
@@ -130,7 +130,8 @@
       "AccountOrderHistoryComponent": "ALL ORDERS ({{param}})",
       "OrderReturnRequestListComponent": "RETURNS ({{param}})"
     },
-    "tabPanelContainerRegion": "Group with order history details"
+    "tabPanelContainerRegion": "Group with order history details",
+    "tabPanelContainerRegionGroup": "Group with order history details"
   },
   "returnRequestList": {
     "returnRequestId": "Return #",
diff --git a/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.html b/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.html
index c91e3835569..203a3e58fbb 100644
--- a/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.html
+++ b/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.html
@@ -1,5 +1,6 @@
 <div class="col-xs-12 col-md-4 col-lg-3">
   <a
+    role="button"
     [routerLink]="
       {
         cxRoute: backRoute,
diff --git a/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.html b/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.html
index 4129ba7b135..fbe98d5694f 100644
--- a/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.html
+++ b/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.html
@@ -11,6 +11,7 @@
 
     <div class="col-xs-12 col-md-4 col-lg-3">
       <a
+        role="button"
         *ngIf="order.cancellable"
         [routerLink]="
           {
@@ -24,6 +25,7 @@
       </a>
 
       <a
+        role="button"
         *ngIf="order.returnable"
         [routerLink]="
           {
diff --git a/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.html b/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.html
index 53a699d7992..ccdad0926f2 100644
--- a/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.html
+++ b/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.html
@@ -1,6 +1,7 @@
 <div class="cx-cancel-replenishment-btns row">
   <div class="col-xs-12 col-md-5 col-lg-4">
     <a
+      role="button"
       class="btn btn-block btn-secondary"
       [routerLink]="
         {
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index 945f2a3defa..8798cb04477 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/pdf-invoices": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html b/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html
index b510c0b7f59..3efcaa29cbc 100644
--- a/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html
+++ b/feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html
@@ -85,6 +85,7 @@
       <div class="form-group row">
         <div class="col-lg-4 col-md-12">
           <a
+            role="button"
             [routerLink]="{ cxRoute: 'orderApprovals' } | cxUrl"
             class="btn btn-block btn-secondary"
             >{{ 'orderApprovalDetails.back' | cxTranslate }}</a
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index f2cccd5641a..7387a6f25f7 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index ba47f3dd487..c944f8991a0 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.html b/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.html
index ce154665b90..a04b8963cc5 100644
--- a/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.html
+++ b/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.html
@@ -10,6 +10,6 @@
     [displayPickupLocation]="(storeDetails$ | async)?.displayName"
     [selectedOption]="pickupOption$ | async"
     (pickupOptionChange)="onPickupOptionChange($event)"
-    (pickupLocationChange)="openDialog()"
+    (pickupLocationChange)="openDialog($event)"
   ></cx-pickup-options>
 </ng-container>
diff --git a/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.spec.ts b/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.spec.ts
index d2b4b220687..4a2d0d22a95 100644
--- a/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.spec.ts
@@ -1,4 +1,5 @@
 import { CommonModule } from '@angular/common';
+import { ElementRef } from '@angular/core';
 import {
   ComponentFixture,
   TestBed,
@@ -6,7 +7,12 @@ import {
   tick,
 } from '@angular/core/testing';
 import { ActiveCartFacade, Cart, OrderEntry } from '@spartacus/cart/base/root';
-import { CmsService, I18nTestingModule, Page } from '@spartacus/core';
+import {
+  CmsService,
+  FeatureConfigService,
+  I18nTestingModule,
+  Page,
+} from '@spartacus/core';
 import {
   AugmentedPointOfService,
   IntendedPickupLocationFacade,
@@ -16,8 +22,8 @@ import {
   PreferredStoreFacade,
 } from '@spartacus/pickup-in-store/root';
 import {
-  LaunchDialogService,
   LAUNCH_CALLER,
+  LaunchDialogService,
   OutletContextData,
 } from '@spartacus/storefront';
 import { cold } from 'jasmine-marbles';
@@ -109,6 +115,12 @@ const mockOutletContext: { item: OrderEntry; cartType: string } = {
   cartType: 'cart',
 };
 
+class MockFeatureConfigService {
+  isEnabled() {
+    return true;
+  }
+}
+
 const context$ = of(mockOutletContext);
 
 class MockIntendedPickupLocationFacade {
@@ -167,6 +179,10 @@ describe('CartPickupOptionsContainerComponent', () => {
           provide: IntendedPickupLocationFacade,
           useClass: MockIntendedPickupLocationFacade,
         },
+        {
+          provide: FeatureConfigService,
+          useClass: MockFeatureConfigService,
+        },
       ],
     });
 
@@ -198,10 +214,11 @@ describe('CartPickupOptionsContainerComponent', () => {
     });
 
     it('should trigger and open dialog', () => {
-      component.openDialog();
+      const triggerElement = new ElementRef({});
+      component.openDialog(triggerElement);
       expect(launchDialogService.openDialog).toHaveBeenCalledWith(
         LAUNCH_CALLER.PICKUP_IN_STORE,
-        component.element,
+        triggerElement,
         component['vcr'],
         { productCode: 'productCode1', entryNumber: 1, quantity: 1 }
       );
@@ -210,7 +227,12 @@ describe('CartPickupOptionsContainerComponent', () => {
     it('should not openDialog if display name is not set and ship it is selected', () => {
       spyOn(component, 'openDialog');
       component['displayNameIsSet'] = false;
-      component.onPickupOptionChange('delivery');
+      const pickupOption: PickupOption = 'delivery';
+      const event = {
+        option: pickupOption,
+        triggerElement: new ElementRef({}),
+      };
+      component.onPickupOptionChange(event);
       expect(component.openDialog).not.toHaveBeenCalled();
     });
 
@@ -218,6 +240,10 @@ describe('CartPickupOptionsContainerComponent', () => {
       const entryNumber = 2;
       const pickupOption: PickupOption = 'pickup';
       const quantity = 3;
+      const event = {
+        option: pickupOption,
+        triggerElement: new ElementRef({}),
+      };
 
       component.entryNumber = entryNumber;
       component.quantity = quantity;
@@ -226,7 +252,7 @@ describe('CartPickupOptionsContainerComponent', () => {
       spyOn(pickupOptionService, 'setPickupOption');
       spyOn(activeCartService, 'updateEntry');
 
-      component.onPickupOptionChange(pickupOption);
+      component.onPickupOptionChange(event);
       expect(pickupOptionService.setPickupOption).toHaveBeenCalledWith(
         entryNumber,
         pickupOption
diff --git a/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.ts b/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.ts
index ecfdee85fed..5abd5ec2cfc 100644
--- a/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.ts
+++ b/feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.ts
@@ -7,6 +7,7 @@
 import {
   Component,
   ElementRef,
+  inject,
   OnDestroy,
   OnInit,
   Optional,
@@ -18,7 +19,7 @@ import {
   CartType,
   OrderEntry,
 } from '@spartacus/cart/base/root';
-import { CmsService, Page } from '@spartacus/core';
+import { CmsService, FeatureConfigService, Page } from '@spartacus/core';
 import {
   cartWithIdAndUserId,
   getProperty,
@@ -30,8 +31,8 @@ import {
   RequiredDeepPath,
 } from '@spartacus/pickup-in-store/root';
 import {
-  LaunchDialogService,
   LAUNCH_CALLER,
+  LaunchDialogService,
   OutletContextData,
 } from '@spartacus/storefront';
 import { EMPTY, iif, Observable, of, Subscription } from 'rxjs';
@@ -79,6 +80,12 @@ export function orderEntryWithRequiredFields(
   templateUrl: 'cart-pickup-options-container.component.html',
 })
 export class CartPickupOptionsContainerComponent implements OnInit, OnDestroy {
+  // TODO: Remove element reference once 'a11yDialogTriggerRefocus' feature flag is removed.
+  /**
+   * @deprecated since 2211.28.0
+   * This reference does not point to any element and will be removed at earliest convinience.
+   * The 'triggerElement' is passed through 'PickupOptionChange' event instead.
+   */
   @ViewChild('open') element: ElementRef;
 
   pickupOption$: Observable<PickupOption | undefined>;
@@ -98,6 +105,7 @@ export class CartPickupOptionsContainerComponent implements OnInit, OnDestroy {
   private displayNameIsSet = false;
   page?: string;
   readonly CartType = CartType;
+  private featureConfigService = inject(FeatureConfigService);
   constructor(
     protected activeCartFacade: ActiveCartFacade,
     protected launchDialogService: LaunchDialogService,
@@ -253,40 +261,92 @@ export class CartPickupOptionsContainerComponent implements OnInit, OnDestroy {
       tap((_) => (this.displayNameIsSet = true))
     );
   }
-
-  onPickupOptionChange(pickupOption: PickupOption): void {
-    this.pickupOptionFacade.setPickupOption(this.entryNumber, pickupOption);
-    if (pickupOption === 'delivery') {
-      this.activeCartFacade.updateEntry(
-        this.entryNumber,
-        this.quantity,
-        undefined,
-        true
-      );
-      return;
-    }
-    [pickupOption]
-      .filter((option) => option === 'pickup')
-      .forEach(() => {
-        this.subscription.add(
-          this.storeDetails$
-            .pipe(
-              filter(({ name }) => !!name),
-              tap(({ name }) =>
-                this.activeCartFacade.updateEntry(
-                  this.entryNumber,
-                  this.quantity,
-                  name,
-                  true
+  // TODO: Remove 'PickupOption' argument type once 'a11yDialogTriggerRefocus' feature flag is removed.
+  /**
+   * @deprecated since 2211.28.0 - Use event param instead of option.
+   * @param event - Object containing the selected option and the element that triggered the change.
+   */
+  onPickupOptionChange(pickupOption: PickupOption): void;
+  // eslint-disable-next-line @typescript-eslint/unified-signatures
+  onPickupOptionChange(event: {
+    option: PickupOption;
+    triggerElement: ElementRef;
+  }): void;
+  onPickupOptionChange(
+    event: { option: PickupOption; triggerElement: ElementRef } | PickupOption
+  ): void {
+    /* istanbul ignore else */
+    if (
+      this.featureConfigService.isEnabled('a11yDialogTriggerRefocus') &&
+      typeof event === 'object'
+    ) {
+      this.pickupOptionFacade.setPickupOption(this.entryNumber, event.option);
+      if (event.option === 'delivery') {
+        this.activeCartFacade.updateEntry(
+          this.entryNumber,
+          this.quantity,
+          undefined,
+          true
+        );
+        return;
+      }
+      [event.option]
+        .filter((option) => option === 'pickup')
+        .forEach(() => {
+          this.subscription.add(
+            this.storeDetails$
+              .pipe(
+                filter(({ name }) => !!name),
+                tap(({ name }) =>
+                  this.activeCartFacade.updateEntry(
+                    this.entryNumber,
+                    this.quantity,
+                    name,
+                    true
+                  )
                 )
               )
-            )
-            .subscribe()
+              .subscribe()
+          );
+        });
+
+      if (!this.displayNameIsSet) {
+        this.openDialog(event.triggerElement);
+      }
+    } else if (typeof event === 'string') {
+      this.pickupOptionFacade.setPickupOption(this.entryNumber, event);
+      if (event === 'delivery') {
+        this.activeCartFacade.updateEntry(
+          this.entryNumber,
+          this.quantity,
+          undefined,
+          true
         );
-      });
+        return;
+      }
+      [event]
+        .filter((option) => option === 'pickup')
+        .forEach(() => {
+          this.subscription.add(
+            this.storeDetails$
+              .pipe(
+                filter(({ name }) => !!name),
+                tap(({ name }) =>
+                  this.activeCartFacade.updateEntry(
+                    this.entryNumber,
+                    this.quantity,
+                    name,
+                    true
+                  )
+                )
+              )
+              .subscribe()
+          );
+        });
 
-    if (!this.displayNameIsSet) {
-      this.openDialog();
+      if (!this.displayNameIsSet) {
+        this.openDialog();
+      }
     }
   }
 
@@ -294,10 +354,15 @@ export class CartPickupOptionsContainerComponent implements OnInit, OnDestroy {
     this.subscription.unsubscribe();
   }
 
-  openDialog(): void {
+  // TODO: Make argument required once 'a11yDialogTriggerRefocus' feature flag is removed.
+  /**
+   * @deprecated since 2211.28.0 - The use of TriggerElement param will become mandatory.
+   * @param triggerElement - The reference of element that triggered the dialog. Used to refocus on it after the dialog is closed.
+   */
+  openDialog(triggerElement?: ElementRef): void {
     const dialog = this.launchDialogService.openDialog(
       LAUNCH_CALLER.PICKUP_IN_STORE,
-      this.element,
+      triggerElement ? triggerElement : this.element,
       this.vcr,
       {
         productCode: this.productCode,
diff --git a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts
index fd6821a2cf4..658d781ab8a 100644
--- a/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts
+++ b/feature-libs/pickup-in-store/components/container/set-preferred-store/set-preferred-store.component.ts
@@ -5,6 +5,7 @@
  */
 
 import { Component, Input, OnDestroy, OnInit, Optional } from '@angular/core';
+import { useFeatureStyles } from '@spartacus/core';
 
 import {
   PointOfServiceNames,
@@ -28,7 +29,9 @@ export class SetPreferredStoreComponent implements OnInit, OnDestroy {
   constructor(
     protected preferredStoreFacade: PreferredStoreFacade,
     @Optional() protected outlet: OutletContextData<PointOfServiceNames>
-  ) {}
+  ) {
+    useFeatureStyles('a11yVisibleFocusOverflows');
+  }
 
   ngOnInit() {
     this.subscription.add(
diff --git a/feature-libs/pickup-in-store/components/presentational/store/store.component.html b/feature-libs/pickup-in-store/components/presentational/store/store.component.html
index 92178a8f2bd..08a40fd8acf 100644
--- a/feature-libs/pickup-in-store/components/presentational/store/store.component.html
+++ b/feature-libs/pickup-in-store/components/presentational/store/store.component.html
@@ -7,6 +7,7 @@
         <div>
           <button
             (click)="toggleOpenHours()"
+            [attr.aria-expanded]="openHoursOpen"
             class="cx-store-opening-hours-toggle"
           >
             {{ 'store.viewHours' | cxTranslate }}
diff --git a/feature-libs/pickup-in-store/components/presentational/store/store.component.ts b/feature-libs/pickup-in-store/components/presentational/store/store.component.ts
index 8f5c9073fea..337d2acd768 100644
--- a/feature-libs/pickup-in-store/components/presentational/store/store.component.ts
+++ b/feature-libs/pickup-in-store/components/presentational/store/store.component.ts
@@ -5,7 +5,7 @@
  */
 
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { PointOfServiceStock } from '@spartacus/core';
+import { PointOfServiceStock, useFeatureStyles } from '@spartacus/core';
 import { storeHasStock } from '@spartacus/pickup-in-store/core';
 import { ICON_TYPE } from '@spartacus/storefront';
 
@@ -29,6 +29,10 @@ export class StoreComponent implements OnInit {
   openHoursOpen = false;
   readonly ICON_TYPE = ICON_TYPE;
 
+  constructor() {
+    useFeatureStyles('a11yVisibleFocusOverflows');
+  }
+
   ngOnInit(): void {
     this.isInStock = storeHasStock(this.storeDetails);
   }
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index 59da5814b13..38d9a4f5de3 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefinder": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
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 45f36136d57..a016eccd775 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,11 @@
       text-decoration: underline;
       border: none;
       background: none;
+
+      @include forFeature('a11yVisibleFocusOverflows') {
+        padding-inline-start: 0;
+        margin-inline-start: 0.5rem;
+      }
     }
   }
 }
diff --git a/feature-libs/pickup-in-store/styles/_store.scss b/feature-libs/pickup-in-store/styles/_store.scss
index f62e15dc4be..a1dccd4a573 100644
--- a/feature-libs/pickup-in-store/styles/_store.scss
+++ b/feature-libs/pickup-in-store/styles/_store.scss
@@ -38,6 +38,11 @@
     padding-top: 0.5rem;
     border: none;
     background: none;
+
+    @include forFeature('a11yVisibleFocusOverflows') {
+      padding-top: 0;
+      margin-top: 0.5rem;
+    }
   }
 
   .cx-stock-level {
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index 0d38d0e9a38..08be7486e2b 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.html b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html
index 2dfc0c4655c..d960dcfa684 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html
@@ -43,7 +43,6 @@
             createAttributeValueIdForConfigurator(attribute, value.valueCode) +
               '-input'
           }}"
-          aria-hidden="true"
           class="form-check-label"
         >
           <img
@@ -116,7 +115,6 @@
                 value.valueCode
               ) + '-input'
             }}"
-            aria-hidden="true"
             class="form-check-label"
             [style.cursor]="!isReadOnly(attribute) ? 'pointer' : 'default'"
             title="{{ getLabel(expMode, value.valueDisplay, value.valueCode) }}"
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 237d059a6f7..ec6728bd71d 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
@@ -376,18 +376,6 @@ describe('ConfiguratorAttributeMultiSelectionImageComponent', () => {
       );
     });
 
-    it("should contain label elements with class name 'form-check-label' and 'aria-hidden' attribute attribute that removes label from the accessibility tree", () => {
-      CommonConfiguratorTestUtilsService.expectElementContainsA11y(
-        expect,
-        htmlElem,
-        'label',
-        'form-check-label',
-        2,
-        'aria-hidden',
-        'true'
-      );
-    });
-
     it("should contain button elements with 'aria-label' attribute that point out that there is a description for the current value", () => {
       (config.features ?? {}).productConfiguratorAttributeTypesV2 = true;
       fixture.detectChanges();
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
index e63bf8a7ce3..8265eaae4b4 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
@@ -166,22 +166,22 @@ export class ConfiguratorAttributeNumericInputFieldService {
     if (valueName.includes('>')) {
       minVal = valueName;
       interval.minValueIncluded = false;
-      minVal = minVal.replace('>', '');
+      minVal = minVal.replace(/>/g, '');
     }
     if (valueName.includes('<')) {
       maxVal = valueName;
       interval.maxValueIncluded = false;
-      maxVal = maxVal.replace('<', '');
+      maxVal = maxVal.replace(/</g, '');
     }
     if (valueName.includes('≥')) {
       minVal = valueName;
       interval.minValueIncluded = true;
-      minVal = minVal.replace('≥', '');
+      minVal = minVal.replace(/≥/g, '');
     }
     if (valueName.includes('≤')) {
       maxVal = valueName;
       interval.maxValueIncluded = true;
-      maxVal = maxVal.replace('≤', '');
+      maxVal = maxVal.replace(/≤/g, '');
     }
     if (
       !valueName.includes('>') &&
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html
index 716fc198177..9858635f4ce 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html
@@ -60,7 +60,6 @@
             createAttributeValueIdForConfigurator(attribute, value.valueCode) +
               '-input'
           }}"
-          aria-hidden="true"
           class="form-check-label form-radio-label"
         >
           <img
@@ -150,7 +149,6 @@
                 value.valueCode
               ) + '-input'
             }}"
-            aria-hidden="true"
             class="form-check-label form-radio-label"
             [style.cursor]="!isReadOnly(attribute) ? 'pointer' : 'default'"
             title="{{ getLabel(expMode, value.valueDisplay, value.valueCode) }}"
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 5d217325911..47746608851 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
@@ -359,18 +359,6 @@ describe('ConfiguratorAttributeSingleSelectionImageComponent', () => {
       );
     });
 
-    it("should contain label element with class name 'form-check-label' and 'aria-hidden' attribute that removes an element from the accessibility tree", () => {
-      CommonConfiguratorTestUtilsService.expectElementContainsA11y(
-        expect,
-        htmlElem,
-        'label',
-        'form-check-label',
-        1,
-        'aria-hidden',
-        'true'
-      );
-    });
-
     it("should contain button elements with 'aria-label' attribute that point out that there is a description for the current value", () => {
       (config.features ?? {}).productConfiguratorAttributeTypesV2 = true;
       fixture.detectChanges();
diff --git a/feature-libs/product-multi-dimensional/package.json b/feature-libs/product-multi-dimensional/package.json
index 259a73d89ba..5dc40ed7785 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index 368e16cdfcb..70305724696 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index 29824ad93b4..a90c743abd5 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/qualtrics",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/quote/package.json b/feature-libs/quote/package.json
index 4977955d6c9..5725d7cbc0c 100644
--- a/feature-libs/quote/package.json
+++ b/feature-libs/quote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/quote",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index 650dd95c562..3e2fd60c675 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index 9c1c3fd7962..700b3d7e530 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/smartedit",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index 63d716548f2..5bdb1a11614 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefinder",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index e69a9742256..49ce9e3e51b 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/tracking",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/account/components/login-register/login-register.component.html b/feature-libs/user/account/components/login-register/login-register.component.html
index 5d197e4718c..a397c5d48c0 100644
--- a/feature-libs/user/account/components/login-register/login-register.component.html
+++ b/feature-libs/user/account/components/login-register/login-register.component.html
@@ -20,6 +20,7 @@
   <ng-container *cxFeature="'!a11yUseButtonsForBtnLinks'">
     <ng-container *ngIf="!loginAsGuest">
       <a
+        role="button"
         [routerLink]="{ cxRoute: 'register' } | cxUrl"
         class="btn btn-block btn-secondary btn-register"
         >{{ 'loginForm.register' | cxTranslate }}</a
@@ -28,6 +29,7 @@
 
     <ng-container *ngIf="loginAsGuest">
       <a
+        role="button"
         [routerLink]="{ cxRoute: 'checkoutLogin' } | cxUrl"
         class="btn btn-block btn-secondary btn-guest"
         >{{ 'loginForm.guestCheckout' | cxTranslate }}</a
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index 476e93b9030..aa226b3215c 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/user",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/profile/components/close-account/components/close-account/close-account.component.html b/feature-libs/user/profile/components/close-account/components/close-account/close-account.component.html
index 3dd2def35d1..c47bb8e922d 100644
--- a/feature-libs/user/profile/components/close-account/components/close-account/close-account.component.html
+++ b/feature-libs/user/profile/components/close-account/components/close-account/close-account.component.html
@@ -12,6 +12,7 @@
       </ng-container>
       <ng-container *cxFeature="'!a11yUseButtonsForBtnLinks'">
         <a
+          role="button"
           [routerLink]="{ cxRoute: 'home' } | cxUrl"
           class="btn btn-block btn-secondary"
           >{{ 'common.cancel' | cxTranslate }}</a
diff --git a/feature-libs/user/profile/components/forgot-password/forgot-password.component.html b/feature-libs/user/profile/components/forgot-password/forgot-password.component.html
index 7c02b7c8dd3..40f7317aabd 100644
--- a/feature-libs/user/profile/components/forgot-password/forgot-password.component.html
+++ b/feature-libs/user/profile/components/forgot-password/forgot-password.component.html
@@ -38,6 +38,7 @@
   </ng-container>
   <ng-container *cxFeature="'!a11yUseButtonsForBtnLinks'">
     <a
+      role="button"
       class="btn btn-block btn-secondary"
       [routerLink]="{ cxRoute: 'login' } | cxUrl"
       >{{ 'common.cancel' | cxTranslate }}</a
diff --git a/feature-libs/user/profile/components/update-email/update-email.component.html b/feature-libs/user/profile/components/update-email/update-email.component.html
index 30cec44b315..d382b11af40 100644
--- a/feature-libs/user/profile/components/update-email/update-email.component.html
+++ b/feature-libs/user/profile/components/update-email/update-email.component.html
@@ -99,6 +99,7 @@
   </label>
 
   <a
+    role="button"
     class="btn btn-block btn-secondary"
     [routerLink]="{ cxRoute: 'home' } | cxUrl"
   >
diff --git a/feature-libs/user/profile/components/update-password/update-password.component.html b/feature-libs/user/profile/components/update-password/update-password.component.html
index e5b238805b7..839ffd387aa 100644
--- a/feature-libs/user/profile/components/update-password/update-password.component.html
+++ b/feature-libs/user/profile/components/update-password/update-password.component.html
@@ -118,6 +118,7 @@
   </ng-container>
   <ng-container *cxFeature="'!a11yUseButtonsForBtnLinks'">
     <a
+      role="button"
       [routerLink]="{ cxRoute: 'home' } | cxUrl"
       class="btn btn-block btn-secondary"
       >{{ 'common.cancel' | cxTranslate }}</a
diff --git a/feature-libs/user/profile/components/update-profile/update-profile.component.html b/feature-libs/user/profile/components/update-profile/update-profile.component.html
index 1ad197ea1e4..077922e9c96 100644
--- a/feature-libs/user/profile/components/update-profile/update-profile.component.html
+++ b/feature-libs/user/profile/components/update-profile/update-profile.component.html
@@ -118,6 +118,7 @@
   </ng-container>
   <ng-container *cxFeature="'!a11yUseButtonsForBtnLinks'">
     <a
+      role="button"
       [routerLink]="{ cxRoute: 'home' } | cxUrl"
       class="btn btn-block btn-secondary"
       >{{ 'common.cancel' | cxTranslate }}</a
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index 02e5319b625..92139f86605 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdc",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/organization": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdp/package.json b/integration-libs/cdp/package.json
index 5803769c7ad..2102d08b5e8 100644
--- a/integration-libs/cdp/package.json
+++ b/integration-libs/cdp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdp",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/customer-ticketing": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index 9c665e5fd8b..cc49d52b7ea 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cds",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/tracking": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/src/recent-searches/recent-searches.component.html b/integration-libs/cds/src/recent-searches/recent-searches.component.html
index 3aab0add992..e4e08490a91 100644
--- a/integration-libs/cds/src/recent-searches/recent-searches.component.html
+++ b/integration-libs/cds/src/recent-searches/recent-searches.component.html
@@ -1,35 +1,40 @@
 <ng-container *ngIf="result$ | async as results">
   <ng-container *ngIf="results?.length">
-    <div class="message">
-      {{ 'cdsRecentSearches.recentSearches' | cxTranslate }}
+    <div class="recent-searches">
+      <h3>
+        {{ 'cdsRecentSearches.recentSearches' | cxTranslate }}
+      </h3>
+      <ul
+        tabindex="0"
+        [ariaLabel]="'cdsRecentSearches.ariaRecentSearches' | cxTranslate"
+        role="listbox"
+      >
+        <li *ngFor="let recentSearch of results">
+          <a
+            role="option"
+            [innerHTML]="
+              recentSearch
+                | cxHighlight: (outletContext$ | async)?.search : false
+            "
+            [routerLink]="
+              {
+                cxRoute: 'search',
+                params: { query: recentSearch },
+              } | cxUrl
+            "
+            (mousedown)="$event.preventDefault()"
+            (keydown.arrowup)="shareEvent($any($event))"
+            (keydown.arrowdown)="shareEvent($any($event))"
+            (keydown.arrowleft)="shareEvent($any($event))"
+            (keydown.arrowright)="shareEvent($any($event))"
+            (keydown.enter)="shareEvent($any($event))"
+            (keydown.escape)="shareEvent($any($event))"
+            (blur)="shareEvent($any($event))"
+            (click)="updateChosenWord(recentSearch)"
+          >
+          </a>
+        </li>
+      </ul>
     </div>
-    <ul
-      class="recent-searches"
-      [ariaLabel]="'cdsRecentSearches.ariaRecentSearches' | cxTranslate"
-      role="listbox"
-    >
-      <li *ngFor="let recentSearch of results">
-        <a
-          role="option"
-          [innerHTML]="
-            recentSearch | cxHighlight: (outletContext$ | async)?.search : false
-          "
-          [routerLink]="
-            {
-              cxRoute: 'search',
-              params: { query: recentSearch },
-            } | cxUrl
-          "
-          (mousedown)="$event.preventDefault()"
-          (keydown.arrowup)="shareEvent($any($event))"
-          (keydown.arrowdown)="shareEvent($any($event))"
-          (keydown.enter)="shareEvent($any($event))"
-          (keydown.escape)="shareEvent($any($event))"
-          (blur)="shareEvent($any($event))"
-          (click)="updateChosenWord(recentSearch)"
-        >
-        </a>
-      </li>
-    </ul>
   </ng-container>
 </ng-container>
diff --git a/integration-libs/cds/src/trending-searches/trending-searches.component.html b/integration-libs/cds/src/trending-searches/trending-searches.component.html
index 166d28f54bf..a37cc62d339 100644
--- a/integration-libs/cds/src/trending-searches/trending-searches.component.html
+++ b/integration-libs/cds/src/trending-searches/trending-searches.component.html
@@ -1,26 +1,34 @@
 <ng-container *ngIf="searchPhrases$ | async as searchPhrases">
   <ng-container *ngIf="searchPhrases?.length">
-    <div class="message">
-      {{ 'cdsTrendingSearches.trendingSearches' | cxTranslate }}
+    <div class="trending-searches">
+      <h3>
+        {{ 'cdsTrendingSearches.trendingSearches' | cxTranslate }}
+      </h3>
+      <ul
+        tabindex="0"
+        [ariaLabel]="'cdsTrendingSearches.ariaTrendingSearches' | cxTranslate"
+      >
+        <li *ngFor="let phrase of searchPhrases">
+          <a
+            role="option"
+            [routerLink]="
+              {
+                cxRoute: 'search',
+                params: { query: phrase.searchPhrase },
+              } | cxUrl
+            "
+            (mousedown)="$event.preventDefault()"
+            (keydown.arrowup)="shareEvent($any($event))"
+            (keydown.arrowdown)="shareEvent($any($event))"
+            (keydown.arrowleft)="shareEvent($any($event))"
+            (keydown.arrowright)="shareEvent($any($event))"
+            (keydown.enter)="shareEvent($any($event))"
+            (keydown.escape)="shareEvent($any($event))"
+          >
+            {{ phrase.searchPhrase }}
+          </a>
+        </li>
+      </ul>
     </div>
-
-    <ul
-      class="recent-searches"
-      [ariaLabel]="'cdsTrendingSearches.ariaTrendingSearches' | cxTranslate"
-    >
-      <li *ngFor="let phrase of searchPhrases">
-        <a
-          role="option"
-          [routerLink]="
-            {
-              cxRoute: 'search',
-              params: { query: phrase.searchPhrase },
-            } | cxUrl
-          "
-        >
-          {{ phrase.searchPhrase }}
-        </a>
-      </li>
-    </ul>
   </ng-container>
 </ng-container>
diff --git a/integration-libs/cds/src/trending-searches/trending-searches.component.ts b/integration-libs/cds/src/trending-searches/trending-searches.component.ts
index 9c980a6d0d1..3164f0b5092 100644
--- a/integration-libs/cds/src/trending-searches/trending-searches.component.ts
+++ b/integration-libs/cds/src/trending-searches/trending-searches.component.ts
@@ -60,4 +60,11 @@ export class TrendingSearchesComponent implements OnInit {
   get contextObservable() {
     return this.outletContext?.context$ ?? EMPTY;
   }
+
+  shareEvent(event: KeyboardEvent) {
+    if (!event) {
+      throw new Error('Missing Event');
+    }
+    this.searchBoxComponentService.shareEvent(event);
+  }
 }
diff --git a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.html b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.html
index 446b18eddec..c98bd36b640 100644
--- a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.html
+++ b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.html
@@ -11,8 +11,11 @@
       <span role="cell" class="cx-total cx-discount">
         {{ discount.isoCode
         }}{{
-          getDiscountedPrice(quoteDiscountData.basePrice?.value, discount.value)
-            | number: '1.2-2' : 'en-US'
+          getDiscountedPrice(
+            quoteDiscountData.basePrice?.value ?? 0,
+            discount.appliedValue,
+            quoteDiscountData.quantity
+          ) | number: '1.2-2' : 'en-US'
         }}
       </span>
     </ng-container>
diff --git a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.spec.ts b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.spec.ts
index 4cb775ef20a..7d77352a755 100644
--- a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.spec.ts
+++ b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.spec.ts
@@ -28,7 +28,7 @@ describe('CpqQuoteDiscountComponent', () => {
 
   beforeEach(async () => {
     cpqQuoteServiceMock = {
-      isFlag$: of(false), // Mock isFlag$ to return false
+      isFlag$: of(false),
     };
     mockCartItemContext = new MockCartItemContext();
     await TestBed.configureTestingModule({
@@ -54,7 +54,7 @@ describe('CpqQuoteDiscountComponent', () => {
     const contentElements = fixture.nativeElement.querySelectorAll(
       '.cx-total, .cx-formatted-value'
     );
-    expect(contentElements.length).toBeGreaterThan(0); // Ensure that at least one element is found
+    expect(contentElements.length).toBeGreaterThan(0);
   });
   it('should create', () => {
     expect(component).toBeTruthy();
@@ -92,23 +92,35 @@ describe('CpqQuoteDiscountComponent', () => {
       const htmlElem = fixture.nativeElement;
       expect(htmlElem.querySelectorAll('.cx-discount').length).toBe(1);
     });
-
     it('should display the appliedValue data', () => {
       const discounts: CpqDiscounts[] = [
         { appliedValue: 30, isoCode: 'USD', value: 15 },
       ];
       mockCartItemContext.item$.next({
         cpqDiscounts: discounts,
+        basePrice: { value: 100, formattedValue: 'USD100.00' },
+        quantity: 1,
       });
-
       fixture.detectChanges();
       const htmlElem = fixture.nativeElement;
       const discountsDisplayed = htmlElem.querySelectorAll('.cx-discount');
       expect(discountsDisplayed.length).toBe(discounts.length);
-
       for (let i = 0; i < discountsDisplayed.length; i++) {
-        expect(discountsDisplayed[i].textContent).toContain(
-          component.getDiscountedPrice(discounts[i].appliedValue, 100) // Assuming 100 as base price
+        const expectedDiscountedPrice = component.getDiscountedPrice(
+          100,
+          discounts[i].appliedValue,
+          1
+        );
+        const formattedPrice = new Intl.NumberFormat('en-US', {
+          minimumFractionDigits: 2,
+          maximumFractionDigits: 2,
+        }).format(expectedDiscountedPrice ?? 0);
+        const expectedDisplayValue = `${discounts[i].isoCode}${formattedPrice}`;
+        console.log(
+          `Expected: ${expectedDisplayValue}, Actual: ${discountsDisplayed[i].textContent}`
+        );
+        expect(discountsDisplayed[i].textContent.trim()).toBe(
+          expectedDisplayValue
         );
       }
     });
diff --git a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.ts b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.ts
index f6860df2761..870f44fbee6 100644
--- a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.ts
+++ b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote-discount-tbody/cpq-quote.component.ts
@@ -51,12 +51,20 @@ export class CpqQuoteDiscountComponent implements OnInit, OnDestroy {
     }
   }
   getDiscountedPrice(
-    basePrice: number | undefined,
-    discountPercentage: number | undefined
+    basePrice: number,
+    appliedDiscount: number | undefined,
+    quantity: number | undefined
   ): number | undefined {
-    if (basePrice !== undefined && discountPercentage !== undefined) {
-      const discountAmount = (basePrice * discountPercentage) / 100;
-      return basePrice - discountAmount;
+    if (
+      basePrice > 0 &&
+      appliedDiscount !== undefined &&
+      quantity !== undefined &&
+      quantity > 0
+    ) {
+      const totalBasePrice = basePrice * quantity;
+      const discountedPrice = totalBasePrice - appliedDiscount;
+      return discountedPrice / quantity;
     }
+    return undefined;
   }
 }
diff --git a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.html b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.html
index 31d7e9a35da..8404be7856c 100644
--- a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.html
+++ b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.html
@@ -13,9 +13,15 @@
         'discountCaption'
           | cxTranslate
             : {
-                discount: discount?.value,
+                discount: formatDiscount(
+                  getDiscountPercentage(
+                    quoteDiscountData.basePrice?.value ?? 0,
+                    discount.appliedValue,
+                    quoteDiscountData.quantity
+                  )
+                ),
               }
       }}
-    </div></ng-container
-  >
+    </div>
+  </ng-container>
 </ng-container>
diff --git a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.spec.ts b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.spec.ts
index 004436cb20f..31b1788ba97 100644
--- a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.spec.ts
+++ b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.spec.ts
@@ -109,5 +109,51 @@ describe('CpqQuoteOfferComponent', () => {
       component.ngOnInit();
       expect(component.quoteDiscountData).toBeNull();
     });
+    it('should calculate the correct discount percentage', () => {
+      const basePrice = 100;
+      const appliedDiscount = 20;
+      const quantity = 1;
+      const expectedPercentage =
+        (appliedDiscount / (basePrice * quantity)) * 100;
+      const result = component.getDiscountPercentage(
+        basePrice,
+        appliedDiscount,
+        quantity
+      );
+      expect(result).toBe(expectedPercentage);
+    });
+  });
+  describe('formatDiscount', () => {
+    it('should return an empty string for undefined input', () => {
+      expect(component.formatDiscount(undefined)).toBe('');
+    });
+
+    it('should return "5" for input 5', () => {
+      expect(component.formatDiscount(5)).toBe('5');
+    });
+
+    it('should return "5.50" for input 5.5', () => {
+      expect(component.formatDiscount(5.5)).toBe('5.50');
+    });
+
+    it('should return "5.12" for input 5.1234', () => {
+      expect(component.formatDiscount(5.1234)).toBe('5.12');
+    });
+
+    it('should return "0" for input 0', () => {
+      expect(component.formatDiscount(0)).toBe('0');
+    });
+
+    it('should return "-3" for input -3', () => {
+      expect(component.formatDiscount(-3)).toBe('-3');
+    });
+
+    it('should return "-3.25" for input -3.25', () => {
+      expect(component.formatDiscount(-3.25)).toBe('-3.25');
+    });
+
+    it('should return "1000000" for input 1000000', () => {
+      expect(component.formatDiscount(1000000)).toBe('1000000');
+    });
   });
 });
diff --git a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.ts b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.ts
index 15f7e6fd113..eaa949001f4 100644
--- a/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.ts
+++ b/integration-libs/cpq-quote/cpq-quote-discount/components/cpq-quote/cpq-quote-offer.component.ts
@@ -45,4 +45,28 @@ export class CpqQuoteOfferComponent implements OnInit, OnDestroy {
       this.subscription.unsubscribe();
     }
   }
+
+  getDiscountPercentage(
+    basePrice: number,
+    appliedDiscount: number | undefined,
+    quantity: number | undefined
+  ): number | undefined {
+    if (
+      basePrice > 0 &&
+      appliedDiscount !== undefined &&
+      quantity !== undefined &&
+      quantity > 0
+    ) {
+      const totalBasePrice = basePrice * quantity;
+      return (appliedDiscount / totalBasePrice) * 100;
+    }
+    return undefined;
+  }
+
+  formatDiscount(value: number | undefined): string {
+    if (value === undefined) {
+      return '';
+    }
+    return Number.isInteger(value) ? value.toFixed(0) : value.toFixed(2);
+  }
 }
diff --git a/integration-libs/cpq-quote/package.json b/integration-libs/cpq-quote/package.json
index 2b9ff57201e..c628fcd0b1a 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/cart": "2211.29.1",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index d9f255949a7..8c1bd91d4b0 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 025ee26a24c..51124069129 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/integration-libs/omf/package.json b/integration-libs/omf/package.json
index 8ad6a609d64..e4cae34f97e 100644
--- a/integration-libs/omf/package.json
+++ b/integration-libs/omf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/omf",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/order": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/opps/package.json b/integration-libs/opps/package.json
index 8987bc5b570..d19199d912b 100644
--- a/integration-libs/opps/package.json
+++ b/integration-libs/opps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/opps",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4-service/package.json b/integration-libs/s4-service/package.json
index 381838a54b1..376c375248f 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 92b5ad2a15d..5e01beb5e25 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4om",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/pdf-invoices": "2211.29.0",
-    "@spartacus/requested-delivery-date": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index 40a0e061878..be446060655 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.0",
+  "version": "2211.29.1",
   "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/package-lock.json b/package-lock.json
index 82a97512c48..ccc31d9e1fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
         "@angular-eslint/schematics": "^17.1.0",
         "@angular-eslint/template-parser": "17.2.1",
         "@angular-eslint/utils": "^17.1.0",
-        "@angular/cli": "~17.0.0",
+        "@angular/cli": "~17.3.0",
         "@angular/compiler-cli": "^17.0.5",
         "@angular/language-service": "17.0.5",
         "@babel/runtime": "^7.18.9",
@@ -95,13 +95,13 @@
         "http-proxy": "^1.18.1",
         "http-server": "^14.1.1",
         "i18n-lint": "^1.1.0",
-        "jasmine-core": "~5.3.0",
+        "jasmine-core": "~5.4.0",
         "jasmine-marbles": "^0.9.2",
         "jest": "^29.0.0",
         "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.0",
         "karma": "~6.4.1",
         "karma-chrome-launcher": "~3.2.0",
         "karma-cli": "^2.0.0",
@@ -126,7 +126,7 @@
         "ts-morph": "^23.0.0",
         "ts-node": "^10.6.0",
         "typescript": "^5.2.2",
-        "webpack": "~5.94.0",
+        "webpack": "~5.95.0",
         "webpack-cli": "^5.0.0"
       },
       "engines": {
@@ -183,12 +183,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1700.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.5.tgz",
-      "integrity": "sha512-kPGiPzystxyLDj79Wy+wCZs5vzx6iUy6fjZ9dKFNS3M9T9UXoo8CZLJS0dWrgO/97M25MSgufyIEDmi+HvwZ7w==",
+      "version": "0.1703.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.10.tgz",
+      "integrity": "sha512-wmjx5GspSPprdUGryK5+9vNawbEO7p8h9dxgX3uoeFwPAECcHC+/KK3qPhX2NiGcM6MDsyt25SrbSktJp6PRsA==",
       "devOptional": true,
       "dependencies": {
-        "@angular-devkit/core": "17.0.5",
+        "@angular-devkit/core": "17.3.10",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -197,6 +197,51 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz",
+      "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==",
+      "devOptional": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
+      }
+    },
+    "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",
+      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
+      "devOptional": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "17.3.5",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.5.tgz",
@@ -855,17 +900,11 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "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",
@@ -934,21 +973,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
       "version": "5.90.3",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
@@ -996,12 +1020,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/@angular-devkit/build-webpack": {
       "version": "0.1703.5",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.5.tgz",
@@ -1063,6 +1081,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",
@@ -2287,27 +2311,27 @@
       }
     },
     "node_modules/@angular/cli": {
-      "version": "17.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.0.5.tgz",
-      "integrity": "sha512-IWtepjO1yTVGblbpTI7vtdxX5EjOYSL4BGa+3g85XuY6U2H38Bc9ZVBAYteAvRX1ZA2yvwJw068YY52ITlnr4A==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.10.tgz",
+      "integrity": "sha512-lA0kf4Cpo8Jcuennq6wGyBTP/UG1oX4xsM9uLRZ2vkPoisjHCk46rWaVP7vfAqdUH39vbATFXftpy1SiEmAI4w==",
       "devOptional": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1700.5",
-        "@angular-devkit/core": "17.0.5",
-        "@angular-devkit/schematics": "17.0.5",
-        "@schematics/angular": "17.0.5",
+        "@angular-devkit/architect": "0.1703.10",
+        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/schematics": "17.3.10",
+        "@schematics/angular": "17.3.10",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
-        "ini": "4.1.1",
-        "inquirer": "9.2.11",
-        "jsonc-parser": "3.2.0",
+        "ini": "4.1.2",
+        "inquirer": "9.2.15",
+        "jsonc-parser": "3.2.1",
         "npm-package-arg": "11.0.1",
         "npm-pick-manifest": "9.0.0",
         "open": "8.4.2",
         "ora": "5.4.1",
-        "pacote": "17.0.4",
+        "pacote": "17.0.6",
         "resolve": "1.22.8",
-        "semver": "7.5.4",
+        "semver": "7.6.0",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
@@ -2320,102 +2344,95 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz",
+      "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==",
       "devOptional": true,
+      "dependencies": {
+        "ajv": "8.12.0",
+        "ajv-formats": "2.1.1",
+        "jsonc-parser": "3.2.1",
+        "picomatch": "4.0.1",
+        "rxjs": "7.8.1",
+        "source-map": "0.7.4"
+      },
       "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "chokidar": "^3.5.2"
+      },
+      "peerDependenciesMeta": {
+        "chokidar": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@angular/cli/node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.10.tgz",
+      "integrity": "sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==",
       "devOptional": true,
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@angular-devkit/core": "17.3.10",
+        "jsonc-parser": "3.2.1",
+        "magic-string": "0.30.8",
+        "ora": "5.4.1",
+        "rxjs": "7.8.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/figures": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
-      "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==",
+    "node_modules/@angular/cli/node_modules/@schematics/angular": {
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.10.tgz",
+      "integrity": "sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==",
       "devOptional": true,
       "dependencies": {
-        "escape-string-regexp": "^5.0.0",
-        "is-unicode-supported": "^1.2.0"
+        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/schematics": "17.3.10",
+        "jsonc-parser": "3.2.1"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^18.13.0 || >=20.9.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/inquirer": {
-      "version": "9.2.11",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.11.tgz",
-      "integrity": "sha512-B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g==",
+    "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",
+      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
       "devOptional": true,
       "dependencies": {
-        "@ljharb/through": "^2.3.9",
-        "ansi-escapes": "^4.3.2",
-        "chalk": "^5.3.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "figures": "^5.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
-        "node": ">=14.18.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@angular/cli/node_modules/is-unicode-supported": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
-      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+    "node_modules/@angular/cli/node_modules/picomatch": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
+      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
       "devOptional": true,
       "engines": {
         "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "devOptional": true
-    },
-    "node_modules/@angular/cli/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "devOptional": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/@angular/common": {
@@ -7799,48 +7816,83 @@
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
     },
     "node_modules/@sigstore/bundle": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz",
-      "integrity": "sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
+      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
       "devOptional": true,
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.2.1"
+        "@sigstore/protobuf-specs": "^0.3.2"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@sigstore/core": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
+      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
+      "devOptional": true,
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
     "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz",
-      "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
+      "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
       "devOptional": true,
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@sigstore/sign": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz",
-      "integrity": "sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
+      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
       "devOptional": true,
       "dependencies": {
-        "@sigstore/bundle": "^2.1.0",
-        "@sigstore/protobuf-specs": "^0.2.1",
-        "make-fetch-happen": "^13.0.0"
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "make-fetch-happen": "^13.0.1",
+        "proc-log": "^4.2.0",
+        "promise-retry": "^2.0.1"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@sigstore/sign/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "devOptional": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
     "node_modules/@sigstore/tuf": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz",
-      "integrity": "sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
+      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
       "devOptional": true,
       "dependencies": {
-        "@sigstore/protobuf-specs": "^0.2.1",
-        "tuf-js": "^2.1.0"
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "tuf-js": "^2.2.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sigstore/verify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
+      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
+      "devOptional": true,
+      "dependencies": {
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.1.0",
+        "@sigstore/protobuf-specs": "^0.3.2"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -8237,13 +8289,13 @@
       }
     },
     "node_modules/@tufjs/models": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz",
-      "integrity": "sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
+      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
       "devOptional": true,
       "dependencies": {
         "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.3"
+        "minimatch": "^9.0.4"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -8259,9 +8311,9 @@
       }
     },
     "node_modules/@tufjs/models/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "devOptional": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -13639,7 +13691,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -13654,7 +13706,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -15212,9 +15264,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
-      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
+      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
       "devOptional": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -15233,7 +15285,7 @@
       "version": "9.2.15",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz",
       "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@ljharb/through": "^2.3.12",
         "ansi-escapes": "^4.3.2",
@@ -15259,7 +15311,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
       "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -15271,7 +15323,7 @@
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
       "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -15910,9 +15962,9 @@
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.3.0.tgz",
-      "integrity": "sha512-zsOmeBKESky4toybvWEikRiZ0jHoBEu79wNArLfMdSnlLMZx3Xcp6CSm2sUcYyoJC+Uyj8LBJap/MUbVSfJ27g==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.4.0.tgz",
+      "integrity": "sha512-T4fio3W++llLd7LGSGsioriDHgWyhoL6YTu4k37uwJLF7DzOzspz7mNxRoM3cQdLWtL/ebazQpIf/yZGJx/gzg==",
       "dev": true
     },
     "node_modules/jasmine-marbles": {
@@ -16847,9 +16899,9 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "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": {
@@ -17574,9 +17626,9 @@
       "dev": true
     },
     "node_modules/make-fetch-happen": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
-      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
+      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
       "devOptional": true,
       "dependencies": {
         "@npmcli/agent": "^2.0.0",
@@ -17588,6 +17640,7 @@
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
         "negotiator": "^0.6.3",
+        "proc-log": "^4.2.0",
         "promise-retry": "^2.0.1",
         "ssri": "^10.0.0"
       },
@@ -17595,36 +17648,13 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/rimraf/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "extraneous": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/rimraf/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "extraneous": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+    "node_modules/make-fetch-happen/node_modules/proc-log": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+      "devOptional": true,
       "engines": {
-        "node": "*"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/makeerror": {
@@ -19022,9 +19052,9 @@
       }
     },
     "node_modules/pacote": {
-      "version": "17.0.4",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.4.tgz",
-      "integrity": "sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg==",
+      "version": "17.0.6",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz",
+      "integrity": "sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==",
       "devOptional": true,
       "dependencies": {
         "@npmcli/git": "^5.0.0",
@@ -19042,7 +19072,7 @@
         "promise-retry": "^2.0.1",
         "read-package-json": "^7.0.0",
         "read-package-json-fast": "^3.0.0",
-        "sigstore": "^2.0.0",
+        "sigstore": "^2.2.0",
         "ssri": "^10.0.0",
         "tar": "^6.1.11"
       },
@@ -21049,9 +21079,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "devOptional": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -21354,15 +21384,17 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sigstore": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz",
-      "integrity": "sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
+      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
       "devOptional": true,
       "dependencies": {
-        "@sigstore/bundle": "^2.1.0",
-        "@sigstore/protobuf-specs": "^0.2.1",
-        "@sigstore/sign": "^2.1.0",
-        "@sigstore/tuf": "^2.1.0"
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "@sigstore/sign": "^2.3.2",
+        "@sigstore/tuf": "^2.3.4",
+        "@sigstore/verify": "^1.2.1"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -22993,14 +23025,14 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/tuf-js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz",
-      "integrity": "sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
+      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
       "devOptional": true,
       "dependencies": {
-        "@tufjs/models": "2.0.0",
+        "@tufjs/models": "2.0.1",
         "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.0"
+        "make-fetch-happen": "^13.0.1"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -23544,9 +23576,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "dev": true,
       "dependencies": {
         "@types/estree": "^1.0.5",
@@ -23932,9 +23964,9 @@
       }
     },
     "node_modules/webpack/node_modules/watchpack": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -24315,13 +24347,41 @@
       }
     },
     "@angular-devkit/architect": {
-      "version": "0.1700.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.5.tgz",
-      "integrity": "sha512-kPGiPzystxyLDj79Wy+wCZs5vzx6iUy6fjZ9dKFNS3M9T9UXoo8CZLJS0dWrgO/97M25MSgufyIEDmi+HvwZ7w==",
+      "version": "0.1703.10",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.10.tgz",
+      "integrity": "sha512-wmjx5GspSPprdUGryK5+9vNawbEO7p8h9dxgX3uoeFwPAECcHC+/KK3qPhX2NiGcM6MDsyt25SrbSktJp6PRsA==",
       "devOptional": true,
       "requires": {
-        "@angular-devkit/core": "17.0.5",
+        "@angular-devkit/core": "17.3.10",
         "rxjs": "7.8.1"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "17.3.10",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz",
+          "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==",
+          "devOptional": true,
+          "requires": {
+            "ajv": "8.12.0",
+            "ajv-formats": "2.1.1",
+            "jsonc-parser": "3.2.1",
+            "picomatch": "4.0.1",
+            "rxjs": "7.8.1",
+            "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",
+          "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
+          "devOptional": true
+        }
       }
     },
     "@angular-devkit/build-angular": {
@@ -24675,14 +24735,11 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
+        "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",
@@ -24731,15 +24788,6 @@
             }
           }
         },
-        "semver": {
-          "version": "7.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-          "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "webpack": {
           "version": "5.90.3",
           "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
@@ -24771,12 +24819,6 @@
             "watchpack": "^2.4.0",
             "webpack-sources": "^3.2.3"
           }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
         }
       }
     },
@@ -24814,6 +24856,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",
@@ -25596,98 +25644,89 @@
       }
     },
     "@angular/cli": {
-      "version": "17.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.0.5.tgz",
-      "integrity": "sha512-IWtepjO1yTVGblbpTI7vtdxX5EjOYSL4BGa+3g85XuY6U2H38Bc9ZVBAYteAvRX1ZA2yvwJw068YY52ITlnr4A==",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.10.tgz",
+      "integrity": "sha512-lA0kf4Cpo8Jcuennq6wGyBTP/UG1oX4xsM9uLRZ2vkPoisjHCk46rWaVP7vfAqdUH39vbATFXftpy1SiEmAI4w==",
       "devOptional": true,
       "requires": {
-        "@angular-devkit/architect": "0.1700.5",
-        "@angular-devkit/core": "17.0.5",
-        "@angular-devkit/schematics": "17.0.5",
-        "@schematics/angular": "17.0.5",
+        "@angular-devkit/architect": "0.1703.10",
+        "@angular-devkit/core": "17.3.10",
+        "@angular-devkit/schematics": "17.3.10",
+        "@schematics/angular": "17.3.10",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
-        "ini": "4.1.1",
-        "inquirer": "9.2.11",
-        "jsonc-parser": "3.2.0",
+        "ini": "4.1.2",
+        "inquirer": "9.2.15",
+        "jsonc-parser": "3.2.1",
         "npm-package-arg": "11.0.1",
         "npm-pick-manifest": "9.0.0",
         "open": "8.4.2",
         "ora": "5.4.1",
-        "pacote": "17.0.4",
+        "pacote": "17.0.6",
         "resolve": "1.22.8",
-        "semver": "7.5.4",
+        "semver": "7.6.0",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
       "dependencies": {
-        "chalk": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-          "devOptional": true
-        },
-        "escape-string-regexp": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-          "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-          "devOptional": true
-        },
-        "figures": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
-          "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==",
+        "@angular-devkit/core": {
+          "version": "17.3.10",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.10.tgz",
+          "integrity": "sha512-czdl54yxU5DOAGy/uUPNjJruoBDTgwi/V+eOgLNybYhgrc+TsY0f7uJ11yEk/pz5sCov7xIiS7RdRv96waS7vg==",
           "devOptional": true,
           "requires": {
-            "escape-string-regexp": "^5.0.0",
-            "is-unicode-supported": "^1.2.0"
+            "ajv": "8.12.0",
+            "ajv-formats": "2.1.1",
+            "jsonc-parser": "3.2.1",
+            "picomatch": "4.0.1",
+            "rxjs": "7.8.1",
+            "source-map": "0.7.4"
           }
         },
-        "inquirer": {
-          "version": "9.2.11",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.11.tgz",
-          "integrity": "sha512-B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g==",
+        "@angular-devkit/schematics": {
+          "version": "17.3.10",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.10.tgz",
+          "integrity": "sha512-FHcNa1ktYRd0SKExCsNJpR75RffsyuPIV8kvBXzXnLHmXMqvl25G2te3yYJ9yYqy9OLy/58HZznZTxWRyUdHOg==",
           "devOptional": true,
           "requires": {
-            "@ljharb/through": "^2.3.9",
-            "ansi-escapes": "^4.3.2",
-            "chalk": "^5.3.0",
-            "cli-cursor": "^3.1.0",
-            "cli-width": "^4.1.0",
-            "external-editor": "^3.1.0",
-            "figures": "^5.0.0",
-            "lodash": "^4.17.21",
-            "mute-stream": "1.0.0",
-            "ora": "^5.4.1",
-            "run-async": "^3.0.0",
-            "rxjs": "^7.8.1",
-            "string-width": "^4.2.3",
-            "strip-ansi": "^6.0.1",
-            "wrap-ansi": "^6.2.0"
+            "@angular-devkit/core": "17.3.10",
+            "jsonc-parser": "3.2.1",
+            "magic-string": "0.30.8",
+            "ora": "5.4.1",
+            "rxjs": "7.8.1"
           }
         },
-        "is-unicode-supported": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
-          "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
-          "devOptional": true
+        "@schematics/angular": {
+          "version": "17.3.10",
+          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.10.tgz",
+          "integrity": "sha512-cI+VB/WXlOeAMamni932lE/AZgui8o81dMyEXNXqCuYagNAMuKXliW79Mi5BwYQEABv/BUb4hB4zYtbQqHyACA==",
+          "devOptional": true,
+          "requires": {
+            "@angular-devkit/core": "17.3.10",
+            "@angular-devkit/schematics": "17.3.10",
+            "jsonc-parser": "3.2.1"
+          }
         },
         "jsonc-parser": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-          "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+          "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
           "devOptional": true
         },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+        "magic-string": {
+          "version": "0.30.8",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+          "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
           "devOptional": true,
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
+            "@jridgewell/sourcemap-codec": "^1.4.15"
           }
+        },
+        "picomatch": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
+          "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
+          "devOptional": true
         }
       }
     },
@@ -29302,39 +29341,67 @@
       }
     },
     "@sigstore/bundle": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz",
-      "integrity": "sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz",
+      "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==",
       "devOptional": true,
       "requires": {
-        "@sigstore/protobuf-specs": "^0.2.1"
+        "@sigstore/protobuf-specs": "^0.3.2"
       }
     },
+    "@sigstore/core": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz",
+      "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==",
+      "devOptional": true
+    },
     "@sigstore/protobuf-specs": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz",
-      "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
+      "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
       "devOptional": true
     },
     "@sigstore/sign": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz",
-      "integrity": "sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz",
+      "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==",
       "devOptional": true,
       "requires": {
-        "@sigstore/bundle": "^2.1.0",
-        "@sigstore/protobuf-specs": "^0.2.1",
-        "make-fetch-happen": "^13.0.0"
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "make-fetch-happen": "^13.0.1",
+        "proc-log": "^4.2.0",
+        "promise-retry": "^2.0.1"
+      },
+      "dependencies": {
+        "proc-log": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+          "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+          "devOptional": true
+        }
       }
     },
     "@sigstore/tuf": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz",
-      "integrity": "sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
+      "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==",
       "devOptional": true,
       "requires": {
-        "@sigstore/protobuf-specs": "^0.2.1",
-        "tuf-js": "^2.1.0"
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "tuf-js": "^2.2.1"
+      }
+    },
+    "@sigstore/verify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz",
+      "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==",
+      "devOptional": true,
+      "requires": {
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.1.0",
+        "@sigstore/protobuf-specs": "^0.3.2"
       }
     },
     "@sinclair/typebox": {
@@ -29581,13 +29648,13 @@
       "devOptional": true
     },
     "@tufjs/models": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz",
-      "integrity": "sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz",
+      "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==",
       "devOptional": true,
       "requires": {
         "@tufjs/canonical-json": "2.0.0",
-        "minimatch": "^9.0.3"
+        "minimatch": "^9.0.4"
       },
       "dependencies": {
         "brace-expansion": {
@@ -29600,9 +29667,9 @@
           }
         },
         "minimatch": {
-          "version": "9.0.3",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+          "version": "9.0.5",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+          "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
           "devOptional": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -33626,7 +33693,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -33635,7 +33702,7 @@
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
           "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-          "dev": true
+          "devOptional": true
         }
       }
     },
@@ -34786,9 +34853,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
-      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
+      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
       "devOptional": true
     },
     "injection-js": {
@@ -34804,7 +34871,7 @@
       "version": "9.2.15",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz",
       "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "@ljharb/through": "^2.3.12",
         "ansi-escapes": "^4.3.2",
@@ -34827,13 +34894,13 @@
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
           "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-          "dev": true
+          "devOptional": true
         },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
           "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
+          "devOptional": true,
           "requires": {
             "ansi-styles": "^4.0.0",
             "string-width": "^4.1.0",
@@ -35282,9 +35349,9 @@
       }
     },
     "jasmine-core": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.3.0.tgz",
-      "integrity": "sha512-zsOmeBKESky4toybvWEikRiZ0jHoBEu79wNArLfMdSnlLMZx3Xcp6CSm2sUcYyoJC+Uyj8LBJap/MUbVSfJ27g==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.4.0.tgz",
+      "integrity": "sha512-T4fio3W++llLd7LGSGsioriDHgWyhoL6YTu4k37uwJLF7DzOzspz7mNxRoM3cQdLWtL/ebazQpIf/yZGJx/gzg==",
       "dev": true
     },
     "jasmine-marbles": {
@@ -36003,9 +36070,9 @@
       }
     },
     "jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "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": {
@@ -36554,9 +36621,9 @@
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
-      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
+      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
       "devOptional": true,
       "requires": {
         "@npmcli/agent": "^2.0.0",
@@ -36568,8 +36635,17 @@
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
         "negotiator": "^0.6.3",
+        "proc-log": "^4.2.0",
         "promise-retry": "^2.0.1",
         "ssri": "^10.0.0"
+      },
+      "dependencies": {
+        "proc-log": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+          "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
+          "devOptional": true
+        }
       }
     },
     "makeerror": {
@@ -37612,9 +37688,9 @@
       "dev": true
     },
     "pacote": {
-      "version": "17.0.4",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.4.tgz",
-      "integrity": "sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg==",
+      "version": "17.0.6",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz",
+      "integrity": "sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==",
       "devOptional": true,
       "requires": {
         "@npmcli/git": "^5.0.0",
@@ -37632,7 +37708,7 @@
         "promise-retry": "^2.0.1",
         "read-package-json": "^7.0.0",
         "read-package-json-fast": "^3.0.0",
-        "sigstore": "^2.0.0",
+        "sigstore": "^2.2.0",
         "ssri": "^10.0.0",
         "tar": "^6.1.11"
       }
@@ -38989,9 +39065,9 @@
       }
     },
     "semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
       "devOptional": true,
       "requires": {
         "lru-cache": "^6.0.0"
@@ -39244,15 +39320,17 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sigstore": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz",
-      "integrity": "sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz",
+      "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==",
       "devOptional": true,
       "requires": {
-        "@sigstore/bundle": "^2.1.0",
-        "@sigstore/protobuf-specs": "^0.2.1",
-        "@sigstore/sign": "^2.1.0",
-        "@sigstore/tuf": "^2.1.0"
+        "@sigstore/bundle": "^2.3.2",
+        "@sigstore/core": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.3.2",
+        "@sigstore/sign": "^2.3.2",
+        "@sigstore/tuf": "^2.3.4",
+        "@sigstore/verify": "^1.2.1"
       }
     },
     "sisteransi": {
@@ -40414,14 +40492,14 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "tuf-js": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz",
-      "integrity": "sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz",
+      "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==",
       "devOptional": true,
       "requires": {
-        "@tufjs/models": "2.0.0",
+        "@tufjs/models": "2.0.1",
         "debug": "^4.3.4",
-        "make-fetch-happen": "^13.0.0"
+        "make-fetch-happen": "^13.0.1"
       }
     },
     "type-check": {
@@ -40784,9 +40862,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "dev": true,
       "requires": {
         "@types/estree": "^1.0.5",
@@ -40867,9 +40945,9 @@
           }
         },
         "watchpack": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
-          "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+          "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
           "dev": true,
           "requires": {
             "glob-to-regexp": "^0.4.1",
diff --git a/package.json b/package.json
index 0e1b3d8ef54..96381b4ad56 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
     "@angular-eslint/schematics": "^17.1.0",
     "@angular-eslint/template-parser": "17.2.1",
     "@angular-eslint/utils": "^17.1.0",
-    "@angular/cli": "~17.0.0",
+    "@angular/cli": "~17.3.0",
     "@angular/compiler-cli": "^17.0.5",
     "@angular/language-service": "17.0.5",
     "@babel/runtime": "^7.18.9",
@@ -206,13 +206,13 @@
     "http-proxy": "^1.18.1",
     "http-server": "^14.1.1",
     "i18n-lint": "^1.1.0",
-    "jasmine-core": "~5.3.0",
+    "jasmine-core": "~5.4.0",
     "jasmine-marbles": "^0.9.2",
     "jest": "^29.0.0",
     "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.0",
     "karma": "~6.4.1",
     "karma-chrome-launcher": "~3.2.0",
     "karma-cli": "^2.0.0",
@@ -237,7 +237,7 @@
     "ts-morph": "^23.0.0",
     "ts-node": "^10.6.0",
     "typescript": "^5.2.2",
-    "webpack": "~5.94.0",
+    "webpack": "~5.95.0",
     "webpack-cli": "^5.0.0"
   }
 }
diff --git a/projects/assets/package.json b/projects/assets/package.json
index f8c128303a7..f305c9b8a34 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/assets",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "homepage": "https://github.com/SAP/spartacus",
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/assets",
   "scripts": {
diff --git a/projects/assets/src/translations/en/common.json b/projects/assets/src/translations/en/common.json
index 3e66df91915..c08cc047a18 100644
--- a/projects/assets/src/translations/en/common.json
+++ b/projects/assets/src/translations/en/common.json
@@ -62,7 +62,8 @@
     "footerNavLabel": "Footer links",
     "goTo": "Go to {{location}}",
     "navigateTo": "Navigate to {{nav}}",
-    "scrollToTop": "Scroll back to the top of the page"
+    "scrollToTop": "Scroll back to the top of the page",
+    "linkItemInList": "{{title}}. {{position}} of {{listLength}}"
   },
   "searchBox": {
     "placeholder": "Enter product name or SKU",
@@ -83,7 +84,8 @@
       "noMatch": "We could not find any results",
       "exactMatch": "{{ term }}",
       "empty": "Ask us anything"
-    }
+    },
+    "closeSearchPanel": "Close"
   },
   "sorting": {
     "date": "Date",
diff --git a/projects/core/package.json b/projects/core/package.json
index f0df8903de1..06a8bb87bf1 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/core",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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 8fd1673f2ea..8a813372d0e 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
@@ -61,6 +61,11 @@ export interface FeatureTogglesInterface {
    */
   showSearchingCustomerByOrderInASM?: boolean;
 
+  /**
+   * New REDESIGNED search-box component
+   */
+  searchBoxV2?: boolean;
+
   /**
    * Some Changes for input of cart Number and text of Customer360View in ASM view
    */
@@ -361,7 +366,8 @@ export interface FeatureTogglesInterface {
   /**
    * Stops the focus indicator from overflowing and being obstructed by other elements.
    * Modifies the 'visible-focus' mixin. Includes style changes for:
-   * 'StarRatingComponent', AddToWishListComponent, StarRatingComponent, 'SkipLinkComponent'
+   * `StarRatingComponent`, `AddToWishListComponent`, `StarRatingComponent`, `SkipLinkComponent`,
+   * `StoreComponent`, `SetPreferredStoreComponent`, `WishListComponent`
    */
   a11yVisibleFocusOverflows?: boolean;
 
@@ -562,7 +568,7 @@ export interface FeatureTogglesInterface {
 
   /**
    * When enabled, the focus will be returned to the trigger element after the dialog is closed.
-   * Affected components: 'AddtoCartComponent', 'PickupOptionsComponent'
+   * Affected components: 'AddtoCartComponent', 'PickupOptionsComponent', CartPickupOptionsContainerComponent, PDPPickupOptionsContainerComponent
    */
   a11yDialogTriggerRefocus?: boolean;
 
@@ -643,9 +649,10 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   showBillingAddressInDigitalPayments: false,
   showDownloadProposalButton: false,
   showPromotionsInPDP: true,
+  searchBoxV2: false,
   recentSearches: true,
   trendingSearches: false,
-  pdfInvoicesSortByInvoiceDate: false,
+  pdfInvoicesSortByInvoiceDate: true,
   storeFrontLibCardParagraphTruncated: true,
   useProductCarouselBatchApi: false,
   productConfiguratorAttributeTypesV2: true,
@@ -685,7 +692,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yFocusableCarouselControls: false,
   a11yUseTrapTabInsteadOfTrapInDialogs: false,
   cmsGuardsServiceUseGuardsComposer: false,
-  cartQuickOrderRemoveListeningToFailEvent: false,
+  cartQuickOrderRemoveListeningToFailEvent: true,
   a11yKeyboardAccessibleZoom: false,
   a11yOrganizationLinkableCells: false,
   a11yVisibleFocusOverflows: false,
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index c77743c60dd..0e095f1c407 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/schematics",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "description": "Spartacus schematics",
   "keywords": [
     "spartacus",
@@ -28,7 +28,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.0",
     "parse5": "^7.1.2",
     "typescript": "^5.2.2"
   },
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index d919a386cfb..90997cfb3be 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -19,12 +19,12 @@
     "@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.0",
     "parse5": "^7.1.2",
     "typescript": "^5.2.2"
   },
   "ssr-tests": {
-    "@spartacus/core": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
     "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.0",
+    "@spartacus/core": "2211.29.1",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/user": "2211.29.0"
+    "@spartacus/cart": "2211.29.1",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/order": "2211.29.1",
+    "@spartacus/user": "2211.29.1"
   },
   "@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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefinder": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/pdf-invoices": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefinder": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
+    "@spartacus/styles": "2211.29.1",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/organization": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/user": "2211.29.0",
+    "@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",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdp": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/customer-ticketing": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/customer-ticketing": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/tracking": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/cart": "2211.29.1",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
     "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/order": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
+    "@spartacus/storefront": "2211.29.1",
     "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.0",
-    "@spartacus/checkout": "2211.29.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/order": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/core": "2211.29.0",
-    "@spartacus/pdf-invoices": "2211.29.0",
-    "@spartacus/requested-delivery-date": "2211.29.0",
-    "@spartacus/schematics": "2211.29.0",
-    "@spartacus/storefront": "2211.29.0",
-    "@spartacus/styles": "2211.29.0",
+    "@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",
     "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.0",
-    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
+    "@spartacus/schematics": "2211.29.1",
     "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 588a6ef5af5..27109b3faf1 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.0",
-    "@spartacus/core": "~2211.29.0",
-    "@spartacus/setup": "~2211.29.0",
-    "@spartacus/storefront": "~2211.29.0",
-    "@spartacus/styles": "~2211.29.0",
+    "@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",
     "angular-oauth2-oidc": "^17.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.18.2",
@@ -89,7 +89,7 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",
     "jasmine-core": "~5.1.0",
-    "jsonc-parser": "~3.2.1",
+    "jsonc-parser": "~3.3.0",
     "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 f075dbed63b..2ae4e1825d2 100644
--- a/projects/ssr-tests/package.json
+++ b/projects/ssr-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssr-tests",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "private": true,
   "description": "Spartacus SSR Tests",
   "keywords": [
@@ -17,7 +17,7 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@spartacus/core": "2211.29.0",
+    "@spartacus/core": "2211.29.1",
     "http-proxy": "^1.18.1",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0"
diff --git a/projects/storefrontapp-e2e-cypress/.npmrc b/projects/storefrontapp-e2e-cypress/.npmrc
deleted file mode 100644
index be1a9b3ec59..00000000000
--- a/projects/storefrontapp-e2e-cypress/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-@continuum:registry=https://npm.levelaccess.net/continuum/
-          //npm.levelaccess.net/continuum/:_authToken=${CONTINUUM_REGISTRY_TOKEN}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts
index 3dea1a4b423..310a4877ee1 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as cart from '../../helpers/cart';
 import * as checkout from '../../helpers/checkout-flow';
 
 describe('Focus managment for a11y', () => {
@@ -34,8 +35,17 @@ describe('Focus managment for a11y', () => {
   });
 
   context('Pick up in store modal', () => {
-    it('Should re-focus the element triggering the modal after it closes', () => {
+    it('Should re-focus the element triggering the modal on PDP after it closes', () => {
+      cy.visit(`/product/266685`);
+      cy.contains('Select Store').click();
+      cy.get('[aria-label="Close"]').click();
+      cy.contains('Select Store').should('have.focus');
+    });
+
+    it('Should re-focus the element triggering the modal in Cart after it closes', () => {
       cy.visit(`/product/266685`);
+      cart.addProductAsAnonymous();
+      cy.visit('/cart');
       cy.contains('Select Store').click();
       cy.get('[aria-label="Close"]').click();
       cy.contains('Select Store').should('have.focus');
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 697dc92de9f..66a9fd36eda 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -282,7 +282,6 @@ if (environment.cpq) {
       provide: USE_MY_ACCOUNT_V2_NOTIFICATION_PREFERENCE,
       useValue: environment.myAccountV2,
     },
-    // CXSPA-6793: refactor to`provideFeatureToggles` and `satisfies` keyword
     provideFeatureTogglesFactory(() => {
       const appFeatureToggles: Required<FeatureToggles> = {
         showDeliveryOptionsTranslation: true,
@@ -294,9 +293,10 @@ if (environment.cpq) {
         showBillingAddressInDigitalPayments: false,
         showDownloadProposalButton: false,
         showPromotionsInPDP: false,
+        searchBoxV2: false,
         recentSearches: true,
         trendingSearches: false,
-        pdfInvoicesSortByInvoiceDate: false,
+        pdfInvoicesSortByInvoiceDate: true,
         storeFrontLibCardParagraphTruncated: true,
         useProductCarouselBatchApi: true,
         productConfiguratorAttributeTypesV2: true,
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 dd2c62db75a..56972097b38 100644
--- a/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
+++ b/projects/storefrontlib/cms-components/navigation/navigation/navigation-ui.component.html
@@ -1,5 +1,9 @@
 <nav [attr.aria-label]="navAriaLabel">
-  <ul [attr.role]="flyout ? 'list' : 'presentation'">
+  <ul
+    [attr.role]="
+      flyout && (node?.children?.length ?? 0) > 1 ? 'list' : 'presentation'
+    "
+  >
     <li
       *ngIf="flyout && (node?.children?.length ?? 0) > 1"
       class="back is-open"
@@ -18,7 +22,13 @@
 </nav>
 <!-- we generate links in a recursive manner -->
 
-<ng-template #nav let-node="node" let-depth="depth">
+<ng-template
+  #nav
+  let-node="node"
+  let-depth="depth"
+  let-listLength="listLength"
+  let-position="position"
+>
   <li [attr.role]="!flyout && !depth ? 'presentation' : 'listitem'">
     <ng-container *cxFeature="'!a11yNavigationUiKeyboardControls'">
       <cx-generic-link
@@ -41,6 +51,15 @@
           node.url && (!node.children || node.children?.length === 0);
           else heading
         "
+        [ariaLabel]="
+          'navigation.linkItemInList'
+            | cxTranslate
+              : {
+                  title: node.title,
+                  position,
+                  listLength,
+                }
+        "
         [url]="node.url"
         [target]="node.target"
         [style]="node.styleAttributes"
@@ -128,9 +147,17 @@
         [attr.wrap-after]="node.children.length > wrapAfter ? wrapAfter : null"
         [attr.columns]="getColumnCount(node.children.length)"
       >
-        <ng-container *ngFor="let child of node.children">
+        <ng-container *ngFor="let child of node.children; index as i">
           <ng-container
-            *ngTemplateOutlet="nav; context: { node: child, depth: depth + 1 }"
+            *ngTemplateOutlet="
+              nav;
+              context: {
+                node: child,
+                depth: depth + 1,
+                listLength: node.children.length,
+                position: i + 1,
+              }
+            "
           >
           </ng-container>
         </ng-container>
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box-features.model.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box-features.model.ts
index 3f7b7d02ec3..c561732343b 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box-features.model.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box-features.model.ts
@@ -5,6 +5,7 @@
  */
 
 export enum SearchBoxFeatures {
+  SEARCH_BOX_V2 = 'searchBoxV2',
   RECENT_SEARCHES_FEATURE = 'recentSearches',
   TRENDING_SEARCHES_FEATURE = 'trendingSearches',
 }
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html
index 7e2acbca3cc..54628734857 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.html
@@ -64,51 +64,93 @@
   id="results"
   (click)="close($any($event), true)"
   role="dialog"
+  [class.no-headers]="
+    !isEnabledFeature(searchBoxFeatures.RECENT_SEARCHES_FEATURE) &&
+    !isEnabledFeature(searchBoxFeatures.TRENDING_SEARCHES_FEATURE) &&
+    !isEnabledFeature(searchBoxFeatures.SEARCH_BOX_V2)
+  "
 >
+  <button
+    *ngIf="isEnabledFeature(searchBoxFeatures.SEARCH_BOX_V2)"
+    class="btn btn-tertiary search-panel-close-btn"
+    (keydown.arrowdown)="focusPreviousGroup($any($event))"
+    (click)="close($any($event))"
+  >
+    {{ 'searchBox.closeSearchPanel' | cxTranslate }}
+  </button>
+  <h3 *ngIf="result.message" [innerHTML]="result.message"></h3>
+
+  <!--RESULT SUGGESTIONS-->
+  <div class="suggestions" *ngIf="(searchInput?.value ?? '').length > 0">
+    <ng-container
+      *ngIf="
+        isEnabledFeature(searchBoxFeatures.RECENT_SEARCHES_FEATURE) ||
+        isEnabledFeature(searchBoxFeatures.TRENDING_SEARCHES_FEATURE) ||
+        isEnabledFeature(searchBoxFeatures.SEARCH_BOX_V2)
+      "
+    >
+      <h3>
+        {{ 'searchBox.suggestions' | cxTranslate }}
+      </h3>
+    </ng-container>
+    <ul
+      tabindex="0"
+      attr.aria-label="{{ 'searchBox.ariaLabelSuggestions' | cxTranslate }}"
+      role="listbox"
+      [class.no-headers]="
+        !isEnabledFeature(searchBoxFeatures.RECENT_SEARCHES_FEATURE) &&
+        !isEnabledFeature(searchBoxFeatures.TRENDING_SEARCHES_FEATURE) &&
+        !isEnabledFeature(searchBoxFeatures.SEARCH_BOX_V2)
+      "
+    >
+      <li *ngFor="let suggestion of result.suggestions">
+        <a
+          role="option"
+          [innerHTML]="suggestion | cxHighlight: searchInput.value"
+          [routerLink]="
+            {
+              cxRoute: 'search',
+              params: { query: suggestion },
+            } | cxUrl
+          "
+          (keydown.arrowup)="focusPreviousChild($any($event))"
+          (keydown.arrowdown)="focusNextChild($any($event))"
+          (keydown.arrowleft)="focusPreviousGroup($any($event))"
+          (keydown.arrowright)="focusNextGroup($any($event))"
+          (keydown.enter)="close($any($event), true)"
+          (keydown.escape)="close($any($event), true)"
+          (blur)="close($event)"
+          (mousedown)="preventDefault($event)"
+          (click)="
+            dispatchSuggestionEvent({
+              freeText: searchInput.value,
+              selectedSuggestion: suggestion,
+              searchSuggestions: result.suggestions ?? [],
+            });
+            updateChosenWord(suggestion)
+          "
+        >
+        </a>
+      </li>
+    </ul>
+  </div>
+
+  <!--  TRENDING SEARCHES-->
   <div
-    *ngIf="result.message"
-    class="message"
-    [innerHTML]="result.message"
-  ></div>
-  <!--RESULT  SUGGESTIONS-->
-  <ng-container>
-    <div class="message" *ngIf="result?.suggestions?.length">
-      {{ 'searchBox.suggestions' | cxTranslate }}
-    </div>
-  </ng-container>
-  <ul
-    class="suggestions"
-    attr.aria-label="{{ 'searchBox.ariaLabelSuggestions' | cxTranslate }}"
-    role="listbox"
+    class="trending-searches-container"
+    [class.d-block]="searchInput?.value?.length === 0"
   >
-    <li *ngFor="let suggestion of result.suggestions">
-      <a
-        role="option"
-        [innerHTML]="suggestion | cxHighlight: searchInput.value"
-        [routerLink]="
-          {
-            cxRoute: 'search',
-            params: { query: suggestion },
-          } | cxUrl
-        "
-        (keydown.arrowup)="focusPreviousChild($any($event))"
-        (keydown.arrowdown)="focusNextChild($any($event))"
-        (keydown.enter)="close($any($event), true)"
-        (keydown.escape)="close($any($event), true)"
-        (blur)="close($event)"
-        (mousedown)="preventDefault($event)"
-        (click)="
-          dispatchSuggestionEvent({
-            freeText: searchInput.value,
-            selectedSuggestion: suggestion,
-            searchSuggestions: result.suggestions ?? [],
-          });
-          updateChosenWord(suggestion)
-        "
-      >
-      </a>
-    </li>
-  </ul>
+    <ng-container *ngIf="searchBoxFeatures.TRENDING_SEARCHES_FEATURE">
+      <ng-container *cxFeature="searchBoxFeatures.TRENDING_SEARCHES_FEATURE">
+        <ng-template
+          [cxOutlet]="searchBoxOutlets.TRENDING_SEARCHES"
+          [cxOutletContext]="{
+            maxTrendingSearches: config.maxTrendingSearches,
+          }"
+        ></ng-template>
+      </ng-container>
+    </ng-container>
+  </div>
 
   <!--  RECENT SEARCHES-->
   <ng-container *cxFeature="searchBoxFeatures.RECENT_SEARCHES_FEATURE">
@@ -123,65 +165,149 @@
     ></ng-template>
   </ng-container>
 
-  <!--  TRENDING SEARCHES-->
-  <ng-container *ngIf="searchInput?.value?.length === 0">
-    <ng-container *cxFeature="searchBoxFeatures.TRENDING_SEARCHES_FEATURE">
-      <ng-template
-        *ngIf="config.trendingSearches"
-        [cxOutlet]="searchBoxOutlets.TRENDING_SEARCHES"
-        [cxOutletContext]="{
-          maxTrendingSearches: config.maxTrendingSearches,
-        }"
-      ></ng-template>
+  <!--RESULT  PRODUCTS-->
+  <div class="products">
+    <ng-container
+      *ngIf="
+        isEnabledFeature(searchBoxFeatures.RECENT_SEARCHES_FEATURE) ||
+        isEnabledFeature(searchBoxFeatures.TRENDING_SEARCHES_FEATURE) ||
+        isEnabledFeature(searchBoxFeatures.SEARCH_BOX_V2)
+      "
+    >
+      <h3 *ngIf="result.products?.length">
+        {{ 'searchBox.products' | cxTranslate }}
+      </h3>
     </ng-container>
-  </ng-container>
+    <ul
+      *ngIf="result.products"
+      attr.aria-label="{{ 'searchBox.ariaLabelProducts' | cxTranslate }}"
+      role="listbox"
+      [class.hidden]="hasSearchBoxV2"
+    >
+      <li *ngFor="let product of result.products">
+        <a
+          role="option"
+          [routerLink]="
+            {
+              cxRoute: 'product',
+              params: product,
+            } | cxUrl
+          "
+          [class.has-media]="config.displayProductImages"
+          (keydown.arrowup)="focusPreviousChild($any($event))"
+          (keydown.arrowdown)="focusNextChild($any($event))"
+          (keydown.arrowleft)="focusPreviousGroup($any($event))"
+          (keydown.arrowright)="focusNextGroup($any($event))"
+          (keydown.enter)="close($any($event), true)"
+          (keydown.escape)="close($any($event), true)"
+          (blur)="close($any($event))"
+          (mousedown)="preventDefault($event)"
+          (click)="
+            dispatchProductEvent({
+              freeText: searchInput.value,
+              productCode: product.code,
+            })
+          "
+        >
+          <cx-media
+            *ngIf="config.displayProductImages"
+            [container]="product.images?.PRIMARY"
+            format="thumbnail"
+            role="presentation"
+          ></cx-media>
+          <div class="name" [innerHTML]="product.nameHtml"></div>
+          <span class="price">{{ product.price?.formattedValue }}</span>
+        </a>
+      </li>
+    </ul>
+    <ng-container *ngIf="items$ | async as items">
+      <cx-carousel
+        role="region"
+        [items]="items"
+        [template]="carouselItem"
+        itemWidth="160px"
+        (keybordEvent)="carouselEventPropagator($event)"
+      >
+      </cx-carousel>
 
-  <!--RESULT  PRODUCTS-->
-  <ng-container>
-    <div class="message" *ngIf="result.products?.length">
-      {{ 'searchBox.products' | cxTranslate }}
-    </div>
-  </ng-container>
-  <ul
-    class="products"
-    *ngIf="result.products"
-    attr.aria-label="{{ 'searchBox.ariaLabelProducts' | cxTranslate }}"
-    role="listbox"
+      <ng-template #carouselItem let-product="item">
+        <a
+          tabindex="0"
+          [routerLink]="
+            {
+              cxRoute: 'product',
+              params: product,
+            } | cxUrl
+          "
+          [class.has-media]="config.displayProductImages"
+          (keydown.enter)="close($any($event), true)"
+          (keydown.escape)="close($any($event), true)"
+          (keydown.arrowleft)="carouselEventPropagator($any($event))"
+          (keydown.arrowright)="carouselEventPropagator($any($event))"
+          (keydown.arrowup)="carouselEventPropagator($any($event))"
+          (mousedown)="preventDefault($event)"
+          (click)="
+            dispatchProductEvent({
+              freeText: searchInput.value,
+              productCode: product.code,
+            })
+          "
+        >
+          <cx-media
+            tabindex="0"
+            [container]="product.images?.PRIMARY"
+            format="product"
+            [alt]="product.name ?? ''"
+          ></cx-media>
+          <h3 class="cx-product-name" [innerHtml]="product.nameHtml"></h3>
+          <div class="price">
+            {{ product.price?.formattedValue }}
+          </div>
+        </a>
+        <div class="actions">
+          <ng-container cxInnerComponentsHost></ng-container>
+        </div>
+      </ng-template>
+    </ng-container>
+  </div>
+
+  <div
+    [class.d-none]="!hasSearchBoxV2"
+    class="search-panel-header"
+    [class.header-panel-divider]="!result.message"
+    *ngIf="isEnabledFeature(searchBoxFeatures.SEARCH_BOX_V2)"
   >
-    <li *ngFor="let product of result.products">
-      <a
-        role="option"
-        [routerLink]="
-          {
-            cxRoute: 'product',
-            params: product,
-          } | cxUrl
-        "
-        [class.has-media]="config.displayProductImages"
-        (keydown.arrowup)="focusPreviousChild($any($event))"
-        (keydown.arrowdown)="focusNextChild($any($event))"
-        (keydown.enter)="close($any($event), true)"
-        (keydown.escape)="close($any($event), true)"
-        (blur)="close($any($event))"
-        (mousedown)="preventDefault($event)"
-        (click)="
-          dispatchProductEvent({
-            freeText: searchInput.value,
-            productCode: product.code,
-          })
-        "
+    <h3
+      class="search-panel-message"
+      *ngIf="result.message"
+      [innerHTML]="result.message"
+    ></h3>
+    <ng-container *ngIf="!result.message">
+      <h3 class="suggestions-header">
+        {{ 'searchBox.suggestions' | cxTranslate }}
+      </h3>
+      <h3
+        class="trendingSearches-header"
+        *ngIf="searchInput?.value?.length === 0"
       >
-        <cx-media
-          *ngIf="config.displayProductImages"
-          [container]="product.images?.PRIMARY"
-          format="thumbnail"
-          role="presentation"
-        ></cx-media>
-        <div class="name" [innerHTML]="product.nameHtml"></div>
-        <span class="price">{{ product.price?.formattedValue }}</span>
-      </a>
-    </li>
-  </ul>
+        {{ 'cdsTrendingSearches.trendingSearches' | cxTranslate }}
+      </h3>
+      <h3 class="recentSearches-header">
+        {{ 'cdsRecentSearches.recentSearches' | cxTranslate }}
+      </h3>
+      <h3 class="products-header" *ngIf="result.products?.length">
+        {{ 'searchBox.products' | cxTranslate }}
+      </h3>
+    </ng-container>
+    <button
+      class="btn btn-tertiary search-panel-close-btn"
+      (keydown.arrowdown)="focusPreviousGroup($any($event))"
+      (click)="close($any($event))"
+    >
+      {{ 'searchBox.closeSearchPanel' | cxTranslate }}
+    </button>
+  </div>
+
   <span id="initialDescription" class="cx-visually-hidden">
     {{ 'searchBox.initialDescription' | cxTranslate }}
   </span>
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts
index 2fd11d5de96..ab547fbb06c 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.spec.ts
@@ -18,7 +18,14 @@ import {
   RouterState,
   RoutingService,
 } from '@spartacus/core';
-import { BehaviorSubject, EMPTY, Observable, ReplaySubject, of } from 'rxjs';
+import {
+  BehaviorSubject,
+  EMPTY,
+  Observable,
+  ReplaySubject,
+  of,
+  delay,
+} from 'rxjs';
 import { CmsComponentData } from '../../../cms-structure/page/model/cms-component-data';
 import { SearchBoxComponentService } from './search-box-component.service';
 import { SearchBoxComponent } from './search-box.component';
@@ -129,8 +136,8 @@ describe('SearchBoxComponent', () => {
     sharedEvent = new ReplaySubject<KeyboardEvent>();
 
     launchSearchPage = jasmine.createSpy('launchSearchPage');
-    getResults = jasmine.createSpy('search').and.callFake(() =>
-      of(<SearchResults>{
+    getResults = jasmine.createSpy('search').and.callFake(() => {
+      const results = {
         suggestions: ['te', 'test'],
         message: 'I found stuff for you!',
         products: [
@@ -138,8 +145,9 @@ describe('SearchBoxComponent', () => {
             name: 'title 1',
           },
         ],
-      })
-    );
+      };
+      return of(<SearchResults>results);
+    });
     dispatchSuggestionSelectedEvent = jasmine.createSpy(
       'dispatchSuggestionSelectedEvent'
     );
@@ -216,12 +224,31 @@ describe('SearchBoxComponent', () => {
       expect(searchBoxComponent).toBeTruthy();
     });
 
+    it('should initialize subscriptions on initialization', () => {
+      spyOn(searchBoxComponent['subscriptions'], 'add');
+      spyOn(serviceSpy['chosenWord'], 'subscribe');
+      spyOn(serviceSpy['sharedEvent'], 'subscribe');
+
+      searchBoxComponent.ngOnInit();
+
+      expect(routingService.getRouterState).toHaveBeenCalled();
+      expect(serviceSpy.chosenWord.subscribe).toHaveBeenCalled();
+      expect(serviceSpy.sharedEvent.subscribe).toHaveBeenCalled();
+      expect(searchBoxComponent['subscriptions'].add).toHaveBeenCalledTimes(3);
+    });
+
     it('should dispatch new results when search is executed', () => {
       searchBoxComponent.search('testQuery');
       fixture.detectChanges();
       expect(serviceSpy.getResults).toHaveBeenCalled();
     });
 
+    it('should set the queryText and trigger a search', () => {
+      searchBoxComponent.queryText = 'testQuery';
+      expect(searchBoxComponent.chosenWord).toBe('testQuery');
+      expect(searchBoxComponent.search).toHaveBeenCalledWith('testQuery');
+    });
+
     it('should dispatch new search query on input', () => {
       searchBoxComponent.queryText = 'test input';
       fixture.detectChanges();
@@ -248,6 +275,92 @@ describe('SearchBoxComponent', () => {
       expect(serviceSpy.launchSearchPage).not.toHaveBeenCalled();
     });
 
+    it('should return true when the feature is enabled', () => {
+      spyOn(
+        searchBoxComponent.featureConfigService,
+        'isEnabled'
+      ).and.returnValue(true);
+      expect(searchBoxComponent.searchBoxV2).toBeTrue();
+    });
+
+    it('should return false when the feature is disabled', function () {
+      spyOn(
+        searchBoxComponent.featureConfigService,
+        'isEnabled'
+      ).and.returnValue(false);
+      expect(searchBoxComponent.searchBoxV2).toBeFalse();
+    });
+
+    it('should bind the "search-box-v2" class when the feature is enabled', function () {
+      spyOn(
+        searchBoxComponent.featureConfigService,
+        'isEnabled'
+      ).and.returnValue(true);
+      expect(searchBoxComponent.searchBoxV2).toBeTrue();
+    });
+
+    it('should handle typing, selecting suggestion, and pressing Enter to launch search', () => {
+      spyOn(searchBoxComponent, 'launchSearchResult').and.callThrough();
+      const inputElement = document.createElement('input');
+      const mockEventData: SearchBoxSuggestionSelectedEvent = {
+        freeText: 'laptop',
+        selectedSuggestion: 'laptop',
+        searchSuggestions: [{ value: 'laptop' }, { value: 'camileo' }],
+      };
+      searchBoxComponent.searchInput = { nativeElement: inputElement };
+      // Simulate typing a query
+      searchBoxComponent.search('laptop');
+
+      // Simulate selecting a suggestion
+      const suggestionEvent = new KeyboardEvent('keydown', { code: 'Enter' });
+      searchBoxComponent.dispatchSuggestionEvent(mockEventData);
+
+      // Simulate pressing Enter
+      searchBoxComponent.launchSearchResult(suggestionEvent, 'laptop');
+      expect(searchBoxComponent.launchSearchResult).toHaveBeenCalledWith(
+        suggestionEvent,
+        'laptop'
+      );
+    });
+
+    it('should handle async search result fetching and update the results', fakeAsync(() => {
+      const mockResults = {
+        products: [{ name: 'Product 1' }, { name: 'Product 2' }],
+      };
+      serviceSpy.getResults = jasmine
+        .createSpy()
+        .and.returnValue(of(mockResults).pipe(delay(1000)));
+
+      let results: any;
+      searchBoxComponent.results$.subscribe((res) => (results = res));
+
+      expect(results).toBeUndefined(); // Initially no results
+      tick(1000); // Simulate the passage of time for async call
+      expect(results.products.length).toBe(2); // Results are fetched after delay
+    }));
+
+    it('should use setTimeout to delay focus action', () => {
+      spyOn(window, 'setTimeout');
+      searchBoxComponent.onEscape();
+      expect(setTimeout).toHaveBeenCalled();
+    });
+
+    it('should return an Observable when breakpointService is available', () => {
+      const result = searchBoxComponent.isMobile;
+      expect(result).toBeInstanceOf(Observable);
+    });
+
+    it('should return 0 when isMobile is false', () => {
+      const result = searchBoxComponent.getTabIndex(false);
+      expect(result).toBe(0);
+    });
+
+    it('should return 0 when isMobile is true and searchBoxActive is true', () => {
+      searchBoxComponent.searchBoxActive = true;
+      const result = searchBoxComponent.getTabIndex(true);
+      expect(result).toBe(0);
+    });
+
     describe('UI tests', () => {
       it('should contain an input text field', () => {
         expect(fixture.debugElement.query(By.css('input'))).not.toBeNull();
@@ -264,20 +377,11 @@ describe('SearchBoxComponent', () => {
         expect(fixture.debugElement.query(By.css('.results'))).toBeTruthy();
       }));
 
-      it('should contain 2 suggestion after search', () => {
-        searchBoxComponent.queryText = 'te';
-        fixture.detectChanges();
-
-        expect(
-          fixture.debugElement.queryAll(By.css('.suggestions a')).length
-        ).toEqual(2);
-      });
-
       it('should contain a message after search', () => {
         searchBoxComponent.queryText = 'te';
         fixture.detectChanges();
 
-        const el = fixture.debugElement.query(By.css('.results .message'));
+        const el = fixture.debugElement.query(By.css('.results h3'));
         expect(el).toBeTruthy();
         expect((<HTMLElement>el.nativeElement).innerText).toEqual(
           'I found stuff for you!'
@@ -318,6 +422,26 @@ describe('SearchBoxComponent', () => {
 
         expect(mockSearchInput.focus).toHaveBeenCalled();
       }));
+
+      it('should navigate between groups and results with arrow keys', () => {
+        const eventDown = new KeyboardEvent('keydown', { code: 'ArrowDown' });
+        const eventUp = new KeyboardEvent('keydown', { code: 'ArrowUp' });
+
+        spyOn(searchBoxComponent, 'focusNextChild').and.callThrough();
+        spyOn(searchBoxComponent, 'focusPreviousChild').and.callThrough();
+
+        // Simulate navigating down
+        searchBoxComponent['propagateEvent'](eventDown);
+        expect(searchBoxComponent.focusNextChild).toHaveBeenCalledWith(
+          eventDown
+        );
+
+        // Simulate navigating up
+        searchBoxComponent['propagateEvent'](eventUp);
+        expect(searchBoxComponent.focusPreviousChild).toHaveBeenCalledWith(
+          eventUp
+        );
+      });
     });
 
     it('should contain 1 product after search', () => {
@@ -384,46 +508,183 @@ describe('SearchBoxComponent', () => {
         expect(inputSearchBox).toBe(getFocusedElement());
       });
 
-      it('should navigate to first child', () => {
-        searchBoxComponent.focusNextChild(new UIEvent('keydown.arrowdown'));
-
-        expect(
-          fixture.debugElement.query(By.css('.results .suggestions > li > a'))
-            .nativeElement
-        ).toBe(getFocusedElement());
-      });
-
-      it('should navigate to second child', () => {
-        searchBoxComponent.focusNextChild(new UIEvent('keydown.arrowdown'));
-        searchBoxComponent.focusNextChild(new UIEvent('keydown.arrowdown'));
-
-        expect(
-          fixture.debugElement.query(
-            By.css('.results .suggestions > li:nth-child(2) > a')
-          ).nativeElement
-        ).toBe(getFocusedElement());
+      describe('focusPreviousGroup', () => {
+        it('should prevent default key scrolling', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+
+          // Create a mock element with a focus method
+          const mockElement = jasmine.createSpyObj('HTMLDivElement', ['focus']);
+
+          // Mock getGroupElements to return arrays with mock elements
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            [mockElement],
+            ['element2'],
+          ]);
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(1);
+
+          searchBoxComponent.focusPreviousGroup(mockEvent);
+
+          // Check that focus was called on the mock element
+          expect(mockEvent.preventDefault).toHaveBeenCalled();
+          expect(mockElement.focus).toHaveBeenCalled();
+        });
+
+        it('should not change focus if there are no groups', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue(
+            []
+          ); // No groups
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0);
+
+          const result = searchBoxComponent.focusPreviousGroup(mockEvent);
+
+          expect(result).toBeUndefined(); // Should return early
+        });
+
+        it('should not change focus if current group is empty', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            [],
+            ['element2'],
+          ]); // First group is empty
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0);
+
+          const result = searchBoxComponent.focusPreviousGroup(mockEvent);
+
+          expect(result).toBeUndefined(); // Should return early
+        });
+
+        it('should focus on the previous group if valid', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          const mockElement = jasmine.createSpyObj('HTMLDivElement', ['focus']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            [mockElement],
+            ['element2'],
+          ]);
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(1);
+
+          searchBoxComponent.focusPreviousGroup(mockEvent);
+
+          expect(mockElement.focus).toHaveBeenCalled(); // Focus on the first element of the previous group
+        });
+
+        it('should focus on the first group when current group is the first', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          const mockElement = jasmine.createSpyObj('HTMLDivElement', ['focus']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            [mockElement],
+            ['element2'],
+          ]);
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0);
+
+          searchBoxComponent.focusPreviousGroup(mockEvent);
+
+          expect(mockElement.focus).toHaveBeenCalled(); // Focus on the first element of the first group
+        });
       });
-
-      it('should navigate to last child', () => {
-        searchBoxComponent.focusPreviousChild(new UIEvent('keydown.arrowup'));
-
-        expect(
-          fixture.debugElement.query(
-            By.css('.results .products > li > a:last-child')
-          ).nativeElement
-        ).toBe(getFocusedElement());
-      });
-
-      it('should navigate to second last child', () => {
-        searchBoxComponent.focusPreviousChild(new UIEvent('keydown.arrowup'));
-        searchBoxComponent.focusPreviousChild(new UIEvent('keydown.arrowup'));
-        fixture.detectChanges();
-
-        expect(
-          fixture.debugElement.query(
-            By.css('.results .suggestions > li:nth-child(2) > a')
-          ).nativeElement
-        ).toBe(getFocusedElement());
+      describe('focusNextGroup', () => {
+        it('should prevent default key scrolling', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+
+          // Create a mock element with a focus method
+          const mockElement = jasmine.createSpyObj('HTMLDivElement', ['focus']);
+
+          // Mock getGroupElements to return arrays with mock elements
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            ['element1'],
+            [mockElement],
+          ]);
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0); // First group focused
+
+          searchBoxComponent.focusNextGroup(mockEvent);
+
+          // Check that the default event was prevented and focus was called on the next element
+          expect(mockEvent.preventDefault).toHaveBeenCalled();
+          expect(mockElement.focus).toHaveBeenCalled(); // Focus on the first element of the next group
+        });
+
+        it('should not change focus if there are no groups', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue(
+            []
+          ); // No groups
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0);
+
+          const result = searchBoxComponent.focusNextGroup(mockEvent);
+
+          expect(result).toBeUndefined(); // Should return early
+        });
+
+        it('should not change focus if all groups are empty', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            [],
+            [],
+          ]); // Both groups are empty
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0);
+
+          const result = searchBoxComponent.focusNextGroup(mockEvent);
+
+          expect(result).toBeUndefined(); // Should return early
+        });
+
+        it('should focus on the next group if valid', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          const mockElement = jasmine.createSpyObj('HTMLDivElement', ['focus']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            ['element1'],
+            [mockElement],
+          ]);
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(0);
+
+          searchBoxComponent.focusNextGroup(mockEvent);
+
+          expect(mockElement.focus).toHaveBeenCalled(); // Focus on the first element of the next group
+        });
+
+        it('should wrap around and focus on the first group if last group is focused', () => {
+          const mockEvent = jasmine.createSpyObj('UIEvent', ['preventDefault']);
+          const mockElement = jasmine.createSpyObj('HTMLDivElement', ['focus']);
+          spyOn<any>(searchBoxComponent, 'getGroupElements').and.returnValue([
+            [mockElement],
+            ['element2'],
+          ]);
+          spyOn<any>(
+            searchBoxComponent,
+            'getFocusedGroupIndex'
+          ).and.returnValue(1); // Last group
+
+          searchBoxComponent.focusNextGroup(mockEvent);
+
+          expect(mockElement.focus).toHaveBeenCalled(); // Focus on the first element of the first group
+        });
       });
     });
 
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
index ff886fe4209..a70d9b5ad36 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.component.ts
@@ -9,13 +9,15 @@ import {
   ChangeDetectorRef,
   Component,
   ElementRef,
+  HostBinding,
   HostListener,
+  inject,
   Input,
   OnDestroy,
   OnInit,
   Optional,
+  Renderer2,
   ViewChild,
-  inject,
 } from '@angular/core';
 import {
   CmsSearchBoxComponent,
@@ -24,7 +26,7 @@ import {
   RoutingService,
   WindowRef,
 } from '@spartacus/core';
-import { Observable, Subscription, of } from 'rxjs';
+import { Observable, of, Subscription } from 'rxjs';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
 import { ICON_TYPE } from '../../../cms-components/misc/icon/index';
 import { CmsComponentData } from '../../../cms-structure/page/model/cms-component-data';
@@ -58,6 +60,8 @@ const SEARCHBOX_IS_ACTIVE = 'searchbox-is-active';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class SearchBoxComponent implements OnInit, OnDestroy {
+  private elementRef = inject(ElementRef);
+  private renderer = inject(Renderer2);
   readonly searchBoxOutlets = SearchBoxOutlets;
   readonly searchBoxFeatures = SearchBoxFeatures;
   @Input() config: SearchBoxConfig;
@@ -68,10 +72,30 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
   @Input('queryText')
   set queryText(value: string) {
     if (value) {
+      this.updateChosenWord(value);
       this.search(value);
     }
   }
 
+  @HostBinding('class.search-box-v2') get searchBoxV2() {
+    return this.isEnabledFeature(SearchBoxFeatures.SEARCH_BOX_V2);
+  }
+
+  get hasSearchBoxV2(): boolean {
+    const hostElement = this.elementRef.nativeElement;
+    return hostElement.classList.contains('search-box-v2');
+  }
+
+  /**
+   * Listener for clickout out of searchInput and searchPanel
+   * */
+  @HostListener('document:click', ['$event'])
+  clickout(event: UIEvent) {
+    if (!this.elementRef.nativeElement.contains(event.target)) {
+      this.softClose();
+    }
+  }
+
   @ViewChild('searchInput') searchInput: any;
 
   @ViewChild('searchButton') searchButton: ElementRef<HTMLElement>;
@@ -81,7 +105,7 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     if (
       (this.featureConfigService?.isEnabled('a11ySearchBoxFocusOnEscape') &&
         this.winRef.document.activeElement !==
-          this.searchInput.nativeElement) ||
+          this.searchInput?.nativeElement) ||
       this.searchBoxActive
     ) {
       setTimeout(() => {
@@ -111,9 +135,7 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
   // TODO: (CXSPA-6929) - Remove getter next major release.
   /** Temporary getter, not ment for public use */
   get a11ySearchBoxMobileFocusEnabled(): boolean {
-    return (
-      this.featureConfigService?.isEnabled('a11ySearchBoxMobileFocus') || false
-    );
+    return this.isEnabledFeature('a11ySearchBoxMobileFocus') || false;
   }
 
   // TODO: (CXSPA-6929) - Make dependencies no longer optional next major release
@@ -164,6 +186,10 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     switchMap((config) => this.searchBoxComponentService.getResults(config))
   );
 
+  items$: Observable<any> = this.results$.pipe(
+    map((result) => result.products?.map((prod) => of(prod)))
+  );
+
   ngOnInit(): void {
     const routeStateSubscription = this.routingService
       .getRouterState()
@@ -213,6 +239,8 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
    */
   search(query: string): void {
     this.searchBoxComponentService.search(query, this.config);
+
+    this.checkOuterResults();
     // force the searchBox to open
     this.open();
   }
@@ -267,7 +295,13 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     });
   }
 
+  softClose(): void {
+    this.searchBoxComponentService.toggleBodyClass(SEARCHBOX_IS_ACTIVE, false);
+    this.searchBoxActive = false;
+  }
+
   protected blurSearchBox(event: UIEvent): void {
+    this.softClose();
     this.searchBoxComponentService.toggleBodyClass(SEARCHBOX_IS_ACTIVE, false);
     this.searchBoxActive = false;
     // TODO: (CXSPA-6929) - Remove feature flag next major release
@@ -290,6 +324,19 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     );
   }
 
+  protected checkOuterResults() {
+    const recentSearches = this.elementRef.nativeElement.querySelector(
+      'cx-recent-searches .recent-searches'
+    );
+    const trendingSearches = this.elementRef.nativeElement.querySelector(
+      'cx-trending-searches .trending-searches'
+    );
+    const results = this.elementRef.nativeElement.querySelector('.results');
+    if (recentSearches || trendingSearches) {
+      this.renderer.addClass(results, 'has-outer-results');
+    }
+  }
+
   /**
    * Especially in mobile we do not want the search icon
    * to focus the input again when it's already open.
@@ -302,16 +349,58 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
   }
 
   // Return result list as HTMLElement array
-  private getResultElements(): HTMLElement[] {
+  protected getResultElements(): HTMLElement[] {
     return Array.from(
       this.winRef.document.querySelectorAll(
-        '.products > li a, .suggestions > li a, .recent-searches > li a'
+        '.products ul:not(.hidden) > li a, .suggestions ul  > li a, .recent-searches ul > li a,.trending-searches ul > li a, .carousel-panel .item.active > a, .products .carousel-panel > button:not([disabled])'
       )
     );
   }
 
+  // Return group list as HTMLElement array
+  private getGroupElements(): HTMLElement[][] {
+    const groups: HTMLElement[][] = [];
+    groups.push(
+      Array.from(
+        this.winRef.document.querySelectorAll(
+          '.products ul:not(.hidden) > li a'
+        )
+      )
+    );
+    groups.push(
+      Array.from(
+        this.winRef.document.querySelectorAll('.suggestions ul  > li a')
+      )
+    );
+    groups.push(
+      Array.from(
+        this.winRef.document.querySelectorAll(
+          '.trending-searches-container.d-block .trending-searches ul > li a'
+        )
+      )
+    );
+    groups.push(
+      Array.from(
+        this.winRef.document.querySelectorAll('.recent-searches ul > li a')
+      )
+    );
+
+    groups.push(
+      Array.from(
+        this.winRef.document.querySelectorAll(
+          '.carousel-panel .item.active > a, .carousel-panel > button:not([disabled])'
+        )
+      )
+    );
+    groups.push(
+      Array.from(
+        this.winRef.document.querySelectorAll('.search-panel-close-btn')
+      )
+    );
+    return groups.filter((group) => group.length);
+  }
   // Return focused element as HTMLElement
-  private getFocusedElement(): HTMLElement {
+  protected getFocusedElement(): HTMLElement {
     return <HTMLElement>this.winRef.document.activeElement;
   }
 
@@ -319,11 +408,19 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     this.chosenWord = chosenWord;
   }
 
-  private getFocusedIndex(): number {
+  protected getFocusedIndex(): number {
     return this.getResultElements().indexOf(this.getFocusedElement());
   }
 
-  private propagateEvent(event: KeyboardEvent) {
+  protected getFocusedGroupIndex(): number {
+    return (
+      this.getGroupElements().findIndex(
+        (group) => group.indexOf(this.getFocusedElement()) !== -1
+      ) ?? 0
+    );
+  }
+
+  protected propagateEvent(event: KeyboardEvent) {
     if (event.code) {
       switch (event.code) {
         case 'Escape':
@@ -336,6 +433,12 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
         case 'ArrowDown':
           this.focusNextChild(event);
           return;
+        case 'ArrowLeft':
+          this.focusPreviousGroup(event);
+          return;
+        case 'ArrowRight':
+          this.focusNextGroup(event);
+          return;
         default:
           return;
       }
@@ -379,6 +482,108 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     }
   }
 
+  // Focus on previous item in results list
+  focusPreviousGroup(event: UIEvent) {
+    event.preventDefault(); // Prevent default key scrolling behavior
+
+    const results = this.getGroupElements(); // Get all group elements
+    const focusedGroupIndex = this.getFocusedGroupIndex(); // Get the currently focused group index
+
+    // Check if there are any groups and if the focused index is valid
+    if (
+      !results.length ||
+      focusedGroupIndex < 0 ||
+      focusedGroupIndex >= results.length
+    ) {
+      return; // Exit if no groups or invalid focused index
+    }
+
+    // Check if the current group contains any elements
+    const currentGroup = results[focusedGroupIndex];
+    if (currentGroup.length === 0) {
+      return; // If the current group is empty, exit the function
+    }
+
+    // Set focus on the appropriate group
+    const previousGroupIndex =
+      focusedGroupIndex > 0 ? focusedGroupIndex - 1 : 0;
+    const previousGroup = results[previousGroupIndex];
+
+    // Check if the previous group contains any elements
+    if (previousGroup.length > 0) {
+      previousGroup[0].focus(); // Focus on the first element of the previous group
+    }
+  }
+
+  // Focus on next item in results list
+  focusNextGroup(event: UIEvent) {
+    this.open(); // Ensure the dropdown or UI is open before navigating
+    event.preventDefault(); // Prevent default key scrolling behavior
+
+    const results = this.getGroupElements(); // Get all group elements
+    const focusedGroupIndex = this.getFocusedGroupIndex(); // Get the current focused group index
+
+    // Check if there are any groups and if the focused index is valid
+    if (
+      !results.length ||
+      focusedGroupIndex < 0 ||
+      focusedGroupIndex >= results.length
+    ) {
+      return; // Exit if no groups or invalid focused index
+    }
+
+    // Find the next group that contains elements
+    let nextGroupIndex = focusedGroupIndex + 1;
+
+    // Loop forward through groups until a non-empty group is found
+    while (
+      nextGroupIndex < results.length &&
+      results[nextGroupIndex].length === 0
+    ) {
+      nextGroupIndex++; // Keep moving to the next group if current one is empty
+    }
+
+    // If no next group with elements was found, wrap around to the first group
+    if (nextGroupIndex >= results.length) {
+      nextGroupIndex = 0; // Move focus to the first group
+      if (results[nextGroupIndex].length === 0) {
+        return; // Exit if the first group is also empty
+      }
+    }
+
+    // Set focus on the first element of the next (or first) non-empty group
+    results[nextGroupIndex][0].focus();
+  }
+
+  carouselEventPropagator(event: KeyboardEvent | null) {
+    if (!event || !event?.code) {
+      return;
+    }
+    switch (event.code) {
+      case 'ArrowRight':
+        this.focusNextChild(event);
+        return;
+      case 'ArrowLeft': {
+        this.getGroupElements().forEach((group) => {
+          if (group.indexOf(this.getFocusedElement()) !== -1) {
+            if (group.indexOf(this.getFocusedElement()) === 0) {
+              this.focusPreviousGroup(event);
+            } else {
+              this.focusPreviousChild(event);
+            }
+          }
+        });
+
+        return;
+      }
+      case 'ArrowUp':
+        this.focusNextGroup(event);
+        return;
+      default:
+        return;
+    }
+  }
+
   /**
    * Opens the PLP with the given query.
    *
@@ -419,6 +624,10 @@ export class SearchBoxComponent implements OnInit, OnDestroy {
     });
   }
 
+  isEnabledFeature(feature: string) {
+    return this.featureConfigService?.isEnabled(feature);
+  }
+
   ngOnDestroy(): void {
     this.subscriptions?.unsubscribe();
   }
diff --git a/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts b/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts
index 223bec55310..041079bcfcf 100644
--- a/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts
+++ b/projects/storefrontlib/cms-components/navigation/search-box/search-box.module.ts
@@ -19,6 +19,7 @@ import { MediaModule } from '../../../shared/components/media/media.module';
 import { IconModule } from '../../misc/icon/icon.module';
 import { HighlightPipe } from './highlight.pipe';
 import { SearchBoxComponent } from './search-box.component';
+import { CarouselModule } from '../../../shared';
 
 @NgModule({
   imports: [
@@ -30,6 +31,7 @@ import { SearchBoxComponent } from './search-box.component';
     I18nModule,
     OutletModule,
     FeaturesConfigModule,
+    CarouselModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/projects/storefrontlib/layout/main/storefront.component.ts b/projects/storefrontlib/layout/main/storefront.component.ts
index e2943ef9967..8bd99b7b6ae 100644
--- a/projects/storefrontlib/layout/main/storefront.component.ts
+++ b/projects/storefrontlib/layout/main/storefront.component.ts
@@ -120,8 +120,9 @@ export class StorefrontComponent implements OnInit, OnDestroy {
   }
 
   protected focusOnFirstNavigationItem() {
-    const closestNavigationUi =
-      this.elementRef.nativeElement.querySelector('cx-navigation-ui');
+    const closestNavigationUi = this.elementRef.nativeElement.querySelector(
+      'header cx-navigation-ui'
+    );
     const focusable = closestNavigationUi?.querySelector<HTMLElement>(
       'li:not(.back) button, [tabindex="0"]'
     );
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index 45042df6861..0e0bd6cd460 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefront",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "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.0",
+    "@spartacus/core": "2211.29.1",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0"
   },
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.html b/projects/storefrontlib/shared/components/carousel/carousel.component.html
index 90731e25f08..74fcf0e9779 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.html
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.html
@@ -6,10 +6,17 @@ <h2 *ngIf="title">{{ title }}</h2>
       <button
         *ngIf="size < items.length"
         class="previous"
-        (click)="activeSlide === 0 ? null : (activeSlide = activeSlide - size)"
+        (click)="
+          $event.stopPropagation();
+          activeSlide === 0 ? null : (activeSlide = activeSlide - size)
+        "
         [attr.aria-disabled]="activeSlide === 0"
         [attr.aria-label]="'carousel.previousSlide' | cxTranslate"
         [attr.title]="'carousel.previousSlide' | cxTranslate"
+        (keydown.arrowleft)="shareEvent($any($event))"
+        (keydown.arrowright)="shareEvent($any($event))"
+        (keydown.arrowup)="shareEvent($any($event))"
+        (keydown.arrowdown)="shareEvent($any($event))"
       >
         <cx-icon [type]="previousIcon"></cx-icon>
       </button>
@@ -18,7 +25,7 @@ <h2 *ngIf="title">{{ title }}</h2>
       <button
         *ngIf="size < items.length"
         class="previous"
-        (click)="activeSlide = activeSlide - size"
+        (click)="$event.stopPropagation(); activeSlide = activeSlide - size"
         [disabled]="activeSlide === 0"
         [attr.aria-label]="'carousel.previousSlide' | cxTranslate"
         [attr.title]="'carousel.previousSlide' | cxTranslate"
@@ -58,6 +65,7 @@ <h2 *ngIf="title">{{ title }}</h2>
         *ngIf="size < items.length"
         class="next"
         (click)="
+          $event.stopPropagation();
           activeSlide > items.length - size - 1
             ? null
             : (activeSlide = activeSlide + size)
@@ -65,6 +73,10 @@ <h2 *ngIf="title">{{ title }}</h2>
         [attr.aria-disabled]="activeSlide > items.length - size - 1"
         [attr.aria-label]="'carousel.nextSlide' | cxTranslate"
         [attr.title]="'carousel.nextSlide' | cxTranslate"
+        (keydown.arrowleft)="shareEvent($any($event))"
+        (keydown.arrowright)="shareEvent($any($event))"
+        (keydown.arrowup)="shareEvent($any($event))"
+        (keydown.arrowdown)="shareEvent($any($event))"
       >
         <cx-icon [type]="nextIcon"></cx-icon>
       </button>
@@ -73,7 +85,7 @@ <h2 *ngIf="title">{{ title }}</h2>
       <button
         *ngIf="size < items.length"
         class="next"
-        (click)="activeSlide = activeSlide + size"
+        (click)="$event.stopPropagation(); activeSlide = activeSlide + size"
         tabindex="-1"
         [disabled]="activeSlide > items.length - size - 1"
         [attr.aria-label]="'carousel.nextSlide' | cxTranslate"
@@ -94,7 +106,7 @@ <h2 *ngIf="title">{{ title }}</h2>
       <ng-container *cxFeature="'a11yFocusableCarouselControls'">
         <button
           *ngIf="i % size === 0"
-          (click)="activeSlide = i"
+          (click)="$event.stopPropagation(); activeSlide = i"
           [attr.aria-selected]="i === activeSlide"
           [attr.aria-disabled]="i === activeSlide"
           [attr.aria-label]="
@@ -121,7 +133,7 @@ <h2 *ngIf="title">{{ title }}</h2>
       <ng-container *cxFeature="'!a11yFocusableCarouselControls'">
         <button
           *ngIf="i % size === 0"
-          (click)="activeSlide = i"
+          (click)="$event.stopPropagation(); activeSlide = i"
           [disabled]="i === activeSlide"
           [attr.aria-current]="i === activeSlide"
           [attr.aria-label]="
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts b/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts
index dc927121d3f..f6e63ea4381 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts
@@ -91,7 +91,7 @@ describe('Carousel Component', () => {
       component.template = template;
       component.ngOnInit();
       let results: number;
-
+      component.ngOnChanges();
       component.size$.subscribe((value) => (results = value)).unsubscribe();
 
       expect(results).toEqual(4);
@@ -101,6 +101,7 @@ describe('Carousel Component', () => {
       spyOn(service, 'getItemsPerSlide').and.returnValue(of(4));
       component.template = template;
       component.ngOnInit();
+      component.ngOnChanges();
       component.size$.subscribe().unsubscribe();
       expect(component.activeSlide).toEqual(0);
     });
@@ -139,6 +140,7 @@ describe('Carousel Component', () => {
       it('should have h2 with title', () => {
         component.title = 'test carousel with title';
         component.ngOnInit();
+        component.ngOnChanges();
         fixture.detectChanges();
 
         const el = fixture.debugElement.query(By.css('h2'));
@@ -163,6 +165,7 @@ describe('Carousel Component', () => {
         spyOn(service, 'getItemsPerSlide').and.returnValue(of(4));
         component.items = [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY];
         component.ngOnInit();
+        component.ngOnChanges();
         fixture.detectChanges();
       });
 
@@ -278,6 +281,7 @@ describe('Carousel Component', () => {
         spyOn(service, 'getItemsPerSlide').and.returnValue(of(4));
         component.items = [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY];
         component.ngOnInit();
+        component.ngOnChanges();
         fixture.detectChanges();
       });
 
@@ -325,6 +329,7 @@ describe('Carousel Component', () => {
           EMPTY,
         ];
         component.ngOnInit();
+        component.ngOnChanges();
         fixture.detectChanges();
       });
 
@@ -363,6 +368,7 @@ describe('Carousel Component', () => {
         component.title = 'test carousel with title';
         component.items = [EMPTY, EMPTY, EMPTY];
         component.ngOnInit();
+        component.ngOnChanges();
         fixture.detectChanges();
       });
 
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.ts b/projects/storefrontlib/shared/components/carousel/carousel.component.ts
index 8b7b60beab2..f4b6d126de9 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.ts
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.ts
@@ -11,11 +11,13 @@ import {
   inject,
   Input,
   isDevMode,
+  OnChanges,
   OnInit,
+  Output,
   TemplateRef,
 } from '@angular/core';
 import { LoggerService, useFeatureStyles } from '@spartacus/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { ICON_TYPE } from '../../../cms-components/misc/icon/icon.model';
 import { CarouselService } from './carousel.service';
@@ -40,7 +42,8 @@ import { CarouselService } from './carousel.service';
   templateUrl: './carousel.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CarouselComponent implements OnInit {
+export class CarouselComponent implements OnInit, OnChanges {
+  @Output() keybordEvent = new BehaviorSubject<KeyboardEvent | null>(null);
   /**
    * The title is rendered as the carousel heading.
    */
@@ -101,6 +104,8 @@ export class CarouselComponent implements OnInit {
       );
       return;
     }
+  }
+  ngOnChanges() {
     this.size$ = this.service
       .getItemsPerSlide(this.el.nativeElement, this.itemWidth)
       .pipe(tap(() => (this.activeSlide = 0)));
@@ -166,4 +171,11 @@ export class CarouselComponent implements OnInit {
     const normalizedCurrentIndex = currentIndex + 1;
     return Math.ceil(normalizedCurrentIndex / size);
   }
+
+  shareEvent(event: KeyboardEvent) {
+    if (!event) {
+      throw new Error('Missing Event');
+    }
+    this.keybordEvent.next(event);
+  }
 }
diff --git a/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.spec.ts b/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.spec.ts
index 5a883f00d2d..27ceae10eea 100644
--- a/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.spec.ts
+++ b/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { FeatureConfigService, TranslationService } from '@spartacus/core';
+import { BreakpointService } from '@spartacus/storefront';
 import { of } from 'rxjs';
 import { NgSelectA11yDirective } from './ng-select-a11y.directive';
 import { NgSelectA11yModule } from './ng-select-a11y.module';
@@ -12,16 +13,16 @@ import { NgSelectA11yModule } from './ng-select-a11y.module';
     <ng-select
       [searchable]="isSearchable"
       [cxNgSelectA11y]="{ ariaLabel: 'Size', ariaControls: 'size-results' }"
+      [items]="[1, 2, 3]"
+      [(ngModel)]="selected"
     >
-      <ng-option *ngFor="let val of [1, 2, 3]" [value]="val">{{
-        val
-      }}</ng-option>
     </ng-select>
     <div id="size-results"></div>
   `,
 })
 class MockComponent {
   isSearchable: boolean = false;
+  selected = 1;
 }
 
 class MockFeatureConfigService {
@@ -39,6 +40,8 @@ class MockTranslationService {
 describe('NgSelectA11yDirective', () => {
   let component: MockComponent;
   let fixture: ComponentFixture<MockComponent>;
+  let breakpointService: BreakpointService;
+  let directive: NgSelectA11yDirective;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -51,8 +54,12 @@ describe('NgSelectA11yDirective', () => {
     }).compileComponents();
 
     fixture = TestBed.createComponent(MockComponent);
-
     component = fixture.componentInstance;
+    breakpointService = TestBed.inject(BreakpointService);
+    const directiveEl = fixture.debugElement.query(
+      By.directive(NgSelectA11yDirective)
+    );
+    directive = directiveEl.injector.get(NgSelectA11yDirective);
   });
 
   function getNgSelect(): DebugElement {
@@ -65,12 +72,10 @@ describe('NgSelectA11yDirective', () => {
 
     const select = getNgSelect().nativeElement;
     const innerDiv = select.querySelector("[role='combobox']");
-    const inputElement = select.querySelector('input');
 
     expect(innerDiv).toBeTruthy();
     expect(innerDiv.getAttribute('aria-controls')).toEqual('size-results');
     expect(innerDiv.getAttribute('aria-label')).toEqual('Size');
-    expect(inputElement.getAttribute('aria-hidden')).toEqual('true');
   });
 
   it('should append aria-label to options', (done) => {
@@ -91,4 +96,29 @@ describe('NgSelectA11yDirective', () => {
       done();
     });
   });
+
+  it('should append value to aria-label and hide the value element from screen reader on mobile', (done) => {
+    const isDownSpy = spyOn(breakpointService, 'isDown').and.returnValue(
+      of(true)
+    );
+    directive['platformId'] = 'browser';
+    fixture.detectChanges();
+    const ngSelectInstance = getNgSelect().componentInstance;
+    ngSelectInstance.writeValue(component.selected);
+    ngSelectInstance.detectChanges();
+
+    // Wait for the mutation observer to update the aria-label
+    setTimeout(() => {
+      const select = getNgSelect().nativeElement;
+      const valueElement = select.querySelector('.ng-value');
+      const divCombobox = select.querySelector("[role='combobox']");
+
+      expect(valueElement.getAttribute('aria-hidden')).toEqual('true');
+      expect(divCombobox.getAttribute('aria-label')).toContain(
+        `, ${component.selected}`
+      );
+      isDownSpy.and.callThrough();
+      done();
+    });
+  });
 });
diff --git a/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts b/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts
index 8b63f49f98a..97410186f5c 100644
--- a/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts
+++ b/projects/storefrontlib/shared/components/ng-select-a11y/ng-select-a11y.directive.ts
@@ -4,17 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { isPlatformBrowser } from '@angular/common';
 import {
   AfterViewInit,
   Directive,
   ElementRef,
   HostListener,
+  Inject,
   inject,
   Input,
+  Optional,
+  PLATFORM_ID,
   Renderer2,
 } from '@angular/core';
 import { FeatureConfigService, TranslationService } from '@spartacus/core';
-import { take } from 'rxjs';
+import { filter, take } from 'rxjs';
+import { BREAKPOINT, BreakpointService } from '../../../layout';
+
+const ARIA_LABEL = 'aria-label';
 
 @Directive({
   selector: '[cxNgSelectA11y]',
@@ -41,6 +48,10 @@ export class NgSelectA11yDirective implements AfterViewInit {
     observer.observe(this.elementRef.nativeElement, { childList: true });
   }
 
+  @Optional() breakpointService = inject(BreakpointService, { optional: true });
+
+  @Inject(PLATFORM_ID) protected platformId: Object;
+
   constructor(
     private renderer: Renderer2,
     private elementRef: ElementRef
@@ -56,7 +67,7 @@ export class NgSelectA11yDirective implements AfterViewInit {
     const ariaControls = this.cxNgSelectA11y.ariaControls ?? elementId;
 
     if (ariaLabel) {
-      this.renderer.setAttribute(divCombobox, 'aria-label', ariaLabel);
+      this.renderer.setAttribute(divCombobox, ARIA_LABEL, ariaLabel);
     }
 
     if (ariaControls) {
@@ -65,9 +76,21 @@ export class NgSelectA11yDirective implements AfterViewInit {
 
     if (
       this.featureConfigService.isEnabled('a11yNgSelectMobileReadout') &&
-      inputElement.readOnly
+      inputElement.readOnly &&
+      isPlatformBrowser(this.platformId)
     ) {
-      this.renderer.setAttribute(inputElement, 'aria-hidden', 'true');
+      this.breakpointService
+        ?.isDown(BREAKPOINT.md)
+        .pipe(filter(Boolean), take(1))
+        .subscribe(() => {
+          const selectObserver = new MutationObserver((changes, observer) => {
+            this.appendValueToAriaLabel(changes, observer, divCombobox);
+          });
+          selectObserver.observe(this.elementRef.nativeElement, {
+            subtree: true,
+            characterData: true,
+          });
+        });
     }
   }
 
@@ -85,11 +108,36 @@ export class NgSelectA11yDirective implements AfterViewInit {
           options.forEach(
             (option: HTMLOptionElement, index: string | number) => {
               const ariaLabel = `${option.innerText}, ${+index + 1} ${translation} ${options.length}`;
-              this.renderer.setAttribute(option, 'aria-label', ariaLabel);
+              this.renderer.setAttribute(option, ARIA_LABEL, ariaLabel);
             }
           );
         });
     }
     observerInstance.disconnect();
   }
+
+  /**
+   * Hides the input value from the screen reader and provides it as part of the aria-label instead.
+   * This improves the screen reader output on mobile devices.
+   */
+  appendValueToAriaLabel(
+    _changes: any,
+    observer: MutationObserver,
+    divCombobox: HTMLElement
+  ) {
+    const valueLabel =
+      this.elementRef.nativeElement.querySelector('.ng-value-label')?.innerText;
+    if (valueLabel) {
+      const comboboxAriaLabel = divCombobox?.getAttribute(ARIA_LABEL) || '';
+      const valueElement =
+        this.elementRef.nativeElement.querySelector('.ng-value');
+      this.renderer.setAttribute(valueElement, 'aria-hidden', 'true');
+      this.renderer.setAttribute(
+        divCombobox,
+        ARIA_LABEL,
+        comboboxAriaLabel + ', ' + valueLabel
+      );
+    }
+    observer.disconnect();
+  }
 }
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index 6e632cff65a..ab53c29ae76 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/styles",
-  "version": "2211.29.0",
+  "version": "2211.29.1",
   "description": "Style library containing global styles",
   "keywords": [
     "spartacus",
diff --git a/projects/storefrontstyles/scss/_versioning.scss b/projects/storefrontstyles/scss/_versioning.scss
index 12ad7b39330..87b74298064 100644
--- a/projects/storefrontstyles/scss/_versioning.scss
+++ b/projects/storefrontstyles/scss/_versioning.scss
@@ -29,7 +29,7 @@
 $_fullVersion: (
   major: 2211,
   minor: 29,
-  patch: 0,
+  patch: 1,
 );
 
 // The _global_ major version. Any (left over) styles from previous stable versions
diff --git a/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss b/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss
index 704e5c8b2ad..7256eddc7fa 100644
--- a/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss
+++ b/projects/storefrontstyles/scss/components/product/carousel/_carousel.scss
@@ -56,6 +56,12 @@
         .item {
           opacity: 0;
           z-index: -1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          text-align: center;
+          height: 100%;
           &.active {
             opacity: 1;
             z-index: 1;
diff --git a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
index d28cef271a2..4f9d39387f0 100644
--- a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
+++ b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
@@ -17,18 +17,36 @@
   // when there are results and the searchbox is active
   // we display the searchbox
   &.searchbox-is-active {
+    // the searchbox requires an overlay over the page (except for the header)
+    // we do this with an overlay under the header, on top of the rest of the page
+    header,
+    .header {
+      position: relative;
+      z-index: 100;
+    }
+    cx-searchbox {
+      &.search-box-v2 {
+        .results.has-outer-results {
+          display: flex;
+          @include media-breakpoint-down(sm) {
+            display: block;
+          }
+        }
+      }
+    }
     &.has-searchbox-results {
       cx-searchbox {
         .results {
           display: block;
         }
-      }
-
-      // the searchbox requires an overlay over the page (except for the header)
-      // we do this with an overlay under the header, on top of the rest of the page
-      header {
-        position: relative;
-        z-index: 100;
+        &.search-box-v2 {
+          .results {
+            display: flex;
+            @include media-breakpoint-down(sm) {
+              display: block;
+            }
+          }
+        }
       }
       cx-storefront {
         &:before {
@@ -84,7 +102,7 @@
   }
 
   a,
-  .message {
+  h3 {
     padding: 6px 16px;
     color: currentColor;
     user-select: none;
@@ -119,9 +137,9 @@
       @include media-breakpoint-down(sm) {
         position: absolute;
         left: 0;
-        top: 57px;
+        top: 72px;
         width: 100%;
-        background-color: var(--cx-color-secondary);
+        background-color: var(--cx-color-light);
         padding: 6px 16px;
         height: 48px;
         border-bottom: 1px solid var(--cx-color-light);
@@ -164,16 +182,19 @@
         font-size: var(--cx-font-size, 1.563rem);
       }
 
-      &.reset cx-icon {
+      &.reset {
         &:before {
           font-size: 1.4rem;
         }
         @include media-breakpoint-down(sm) {
           position: relative;
-          left: 74px;
+          left: 120px;
           z-index: 20;
-          top: 52px;
+          top: 59px;
           margin-top: 0;
+          @include forFeature('a11yImproveContrast') {
+            z-index: 1001;
+          }
         }
       }
     }
@@ -184,17 +205,26 @@
     display: none;
     position: absolute;
     left: 0;
+    padding-top: 14px;
     width: 100%;
     color: #000;
     background-color: #fff;
     font-size: var(--cx-font-small, 1rem);
 
+    &.no-headers {
+      padding-top: 4px;
+    }
+
     @include forFeature('a11yImproveContrast') {
       @include type('8');
     }
 
+    h3 {
+      @include type('8');
+    }
+
     @include media-breakpoint-down(sm) {
-      top: 105px;
+      top: 120px;
       z-index: 10;
     }
 
@@ -215,77 +245,462 @@
         color: currentColor;
       }
     }
+
+    .trending-searches-container {
+      display: none;
+    }
+
+    .recent-searches,
+    .trending-searches,
     .suggestions {
-      display: flex;
-      flex-wrap: wrap;
-      list-style: none;
-      padding-inline-start: 0;
-      margin-bottom: 0;
+      margin-bottom: 20px;
+      ul {
+        display: flex;
+        flex-wrap: wrap;
+        list-style: none;
+        padding-inline-start: 0;
+        margin-bottom: 0;
+        border-top: solid 1px var(--cx-color-light);
+        &.no-headers {
+          border-top: none;
+        }
+        li,
+        a {
+          flex: 100%;
+          line-height: 2rem;
+          display: block;
+          max-width: 100%;
+        }
+      }
+    }
 
-      li,
-      a {
-        flex: 100%;
-        line-height: 2rem;
+    .products {
+      cx-carousel {
+        display: none;
+      }
+      @include media-breakpoint-down(sm) {
+        display: none;
+      }
+      ul {
+        list-style: none;
+        padding-inline-start: 0;
+        margin-bottom: 0;
+
+        a {
+          display: grid;
+          grid-column-gap: 16px;
+
+          &.has-media {
+            // create a grid layout in case we show an image
+            grid-template-columns: 50px 1fr;
+          }
+
+          border-top: solid 1px var(--cx-color-light);
+
+          cx-media {
+            grid-row: 1 / 3;
+          }
+
+          div.name {
+            text-overflow: ellipsis;
+
+            font-size: inherit;
+            font-weight: inherit;
+
+            @include forFeature('a11yImproveContrast') {
+              @include type('8');
+            }
+
+            // Required for text-overflow to do anything
+            white-space: nowrap;
+            overflow: hidden;
+          }
+          .price {
+            font-weight: normal;
+
+            @include forFeature('a11yImproveContrast') {
+              @include type('8');
+            }
+          }
+        }
+      }
+    }
+  }
+  .search-panel-close-btn {
+    display: none;
+  }
+  &.search-box-v2 {
+    input {
+      @include media-breakpoint-down(sm) {
+        background-color: var(--cx-color-light);
+        &:focus {
+          box-shadow: 0 -2px 0 $medium;
+        }
+      }
+    }
+    .search-panel-close-btn {
+      display: block;
+      position: absolute;
+      right: 40px; //padding panel
+      top: 24px; //padding panel
+      min-height: 1rem;
+      color: $primary;
+      padding: 5px 8px;
+      z-index: 1;
+      @include forFeature('a11yImproveContrast') {
+        @include type('6');
+      }
+      @include media-breakpoint-down(sm) {
         display: block;
+        right: 12px;
+        top: 20px;
       }
     }
+    position: unset;
 
-    .recent-searches {
-      display: flex;
+    a:hover {
+      background: none;
+    }
+    .results {
+      height: 350px;
+      display: none;
+      padding: 24px 40px 48px 40px;
+      margin-top: 14px;
+      overflow: hidden;
       flex-wrap: wrap;
-      list-style: none;
-      padding-inline-start: 0;
-      margin-bottom: 0;
 
-      li,
-      a {
-        flex: 100%;
-        line-height: 2rem;
-        display: block;
+      .search-panel-header {
+        width: 100%;
+        display: flex;
+        order: -1;
+        height: min-content;
+        &.header-panel-divider {
+          border-bottom: 1px solid var(--cx-color-medium);
+        }
+        @include media-breakpoint-down(sm) {
+          display: none;
+        }
+        .search-panel-close-btn {
+          display: block;
+        }
+
+        h3:not(.cx-product-name) {
+          padding-inline-start: 0;
+          font-size: $font-size-base; // 16px
+          @include weight('semi');
+          @include media-breakpoint-down(sm) {
+            display: none;
+          }
+
+          &.search-panel-message {
+            display: inline-block;
+          }
+        }
+
+        .suggestions-header {
+          width: 20%;
+          display: none;
+        }
+        .trendingSearches-header {
+          width: 20%;
+        }
+        .recentSearches-header {
+          width: 20%;
+          display: none;
+        }
+      }
+      cx-recent-searches:has(.recent-searches)
+        ~ .search-panel-header
+        .recentSearches-header {
+        display: inline-block;
       }
-    }
 
-    .products {
-      list-style: none;
-      padding-inline-start: 0;
-      margin-bottom: 0;
+      .trending-searches-container:has(.trending-searches)
+        ~ .search-panel-header
+        .trendingSearches-header {
+        display: inline-block;
+      }
+
+      .suggestions ~ .search-panel-header .suggestions-header {
+        display: inline-block;
+      }
+
+      .suggestions
+        ~ cx-recent-searches:has(.recent-searches)
+        ~ .search-panel-header {
+        .products-header {
+          display: inline-block;
+          flex-basis: 60%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+      }
+
+      .trending-searches-container:has(.trending-searches)
+        ~ cx-recent-searches:has(.recent-searches)
+        ~ .search-panel-header {
+        .products-header {
+          display: inline-block;
+          flex-basis: 60%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+      }
+
+      .suggestions ~ .search-panel-header {
+        .products-header {
+          display: inline-block;
+          flex-basis: 80%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+      }
+
+      cx-recent-searches:has(.recent-searches) ~ .search-panel-header {
+        .products-header {
+          display: inline-block;
+          flex-basis: 80%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+      }
+      .trending-searches-container:has(.trending-searches)
+        ~ .search-panel-header {
+        .products-header {
+          display: inline-block;
+          flex-basis: 80%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+      }
 
       @include media-breakpoint-down(sm) {
-        display: none;
+        height: inherit;
+        margin-top: inherit;
+        padding: 20px;
       }
 
       a {
-        display: grid;
-        grid-column-gap: 16px;
+        padding: 6px 0;
+        color: currentColor;
+        user-select: none;
+        max-width: 160px;
+        display: block;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        @include type('6');
+
+        .highlight,
+        .search-results-highlight {
+          font-weight: normal;
+          font-style: normal;
+        }
+      }
 
-        &.has-media {
-          // create a grid layout in case we show an image
-          grid-template-columns: 50px 1fr;
+      h3:not(.cx-product-name) {
+        display: none;
+        padding-inline-start: 0;
+        font-size: $font-size-base; // 16px
+        @include weight('semi');
+        @include media-breakpoint-down(sm) {
+          display: inline-block;
+          border-bottom: 1px solid var(--cx-color-medium);
+          width: 100%;
         }
+        @include weight('semi');
+      }
+      ul {
+        padding-inline-start: 0;
+        width: 100%;
+      }
 
-        cx-media {
-          grid-row: 1 / 3;
+      .suggestions {
+        width: 20%;
+        flex-wrap: wrap;
+        list-style: none;
+        padding-inline-start: 0;
+        margin-bottom: 0;
+        border-top: none;
+        @include media-breakpoint-down(sm) {
+          width: 100%;
+          margin-bottom: 20px;
+        }
+        &:focus {
+          background-color: pink;
+        }
+        ul {
+          border-top: none;
+          li {
+            padding: 0 40px 0 0;
+            @include media-breakpoint-down(sm) {
+              padding: 0;
+            }
+          }
         }
+        a {
+          &:hover {
+            color: var(--cx-color-primary);
+            text-decoration: underline;
+          }
+        }
+      }
 
-        div.name {
-          text-overflow: ellipsis;
+      cx-recent-searches {
+        flex-wrap: wrap;
+        list-style: none;
+        padding-inline-start: 0;
+        margin-bottom: 0;
+        border-top: none;
+        &:has(.recent-searches) {
+          width: 20%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+        ul {
+          border-top: none;
+          li {
+            padding: 0 40px 0 0;
+            @include media-breakpoint-down(sm) {
+              padding: 0;
+            }
+          }
+        }
+        a {
+          &:hover {
+            color: var(--cx-color-primary);
+            text-decoration: underline;
+          }
+        }
+      }
+      .trending-searches-container {
+        display: none;
+        &:has(.trending-searches) {
+          width: 20%;
+          @include media-breakpoint-down(sm) {
+            width: 100%;
+          }
+        }
+        cx-trending-searches {
+          flex-wrap: wrap;
+          list-style: none;
+          padding-inline-start: 0;
+          margin-bottom: 0;
+          border-top: none;
+          &:has(.trending-searches) {
+            @include media-breakpoint-down(sm) {
+              width: 100%;
+            }
+          }
+          ul {
+            border-top: none;
+            li {
+              padding: 0 40px 0 0;
+              @include media-breakpoint-down(sm) {
+                padding: 0;
+              }
+            }
+          }
+          a {
+            &:hover {
+              color: var(--cx-color-primary);
+              text-decoration: underline;
+            }
+          }
+        }
+      }
 
-          font-size: inherit;
-          font-weight: inherit;
+      .products {
+        cx-carousel {
+          display: flex;
+        }
 
-          @include forFeature('a11yImproveContrast') {
-            @include type('8');
-          }
+        ul {
+          display: none;
+        }
 
-          // Required for text-overflow to do anything
+        width: 100%;
+        flex-wrap: wrap;
+        list-style: none;
+        padding-inline-start: 0;
+        margin-bottom: 0;
+        overflow: hidden;
+        position: relative;
+        min-height: 100%;
+        .slides {
+          text-align: center;
+          text-overflow: ellipsis;
           white-space: nowrap;
           overflow: hidden;
+          cx-media {
+            &.is-missing {
+              height: 120px;
+            }
+            img {
+              max-width: 120px;
+            }
+          }
+          h3.cx-product-name {
+            text-overflow: ellipsis;
+            overflow: hidden;
+          }
+          a {
+            &:hover {
+              color: var(--cx-color-primary);
+              text-decoration: underline;
+            }
+          }
         }
-        .price {
-          font-weight: normal;
+        @include media-breakpoint-down(sm) {
+          display: block;
+        }
+      }
+      .suggestions ~ cx-recent-searches:has(.recent-searches) ~ .products {
+        flex-basis: 60%;
+        @include media-breakpoint-down(sm) {
+          width: 100%;
+        }
+      }
 
-          @include forFeature('a11yImproveContrast') {
-            @include type('8');
+      .trending-searches-container:has(.trending-searches)
+        ~ cx-recent-searches:has(.recent-searches)
+        ~ .products {
+        flex-basis: 60%;
+        @include media-breakpoint-down(sm) {
+          width: 100%;
+        }
+      }
+
+      .suggestions ~ .products {
+        flex-basis: 80%;
+        @include media-breakpoint-down(sm) {
+          width: 100%;
+        }
+      }
+      cx-recent-searches:has(.recent-searches) ~ .products {
+        flex-basis: 80%;
+        @include media-breakpoint-down(sm) {
+          width: 100%;
+        }
+      }
+      .trending-searches-container:has(.trending-searches) ~ .products {
+        flex-basis: 80%;
+        @include media-breakpoint-down(sm) {
+          width: 100%;
+        }
+      }
+      %cx-carousel {
+        .indicators {
+          display: none;
+          @include media-breakpoint-down(sm) {
+            display: flex;
           }
         }
       }
@@ -298,6 +713,14 @@
       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/tools/build-lib/package-lock.json b/tools/build-lib/package-lock.json
index 2cd869ebbc9..cd7e42bc7ba 100644
--- a/tools/build-lib/package-lock.json
+++ b/tools/build-lib/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@angular-devkit/architect": "0.1700.3"
+        "@angular-devkit/architect": "0.1802.8"
       },
       "devDependencies": {
         "@types/node": "^12.12.27",
@@ -18,33 +18,33 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1700.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.3.tgz",
-      "integrity": "sha512-HUjx7vD16paWXHKHYc2LsSn/kaYbFr2YNnlzuSr9C0kauKS1e7sRpRvtGwQzXfohzgyKi81AAU5uA2KLRGq83w==",
+      "version": "0.1802.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.8.tgz",
+      "integrity": "sha512-/rtFQEKgS7LlB9oHr4NCBSdKnvP5kr8L5Hbd3Vl8hZOYK9QWjxKPEXnryA2d5+PCE98bBzZswCNXqELZCPTgIQ==",
       "dependencies": {
-        "@angular-devkit/core": "17.0.3",
+        "@angular-devkit/core": "18.2.8",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.0.3.tgz",
-      "integrity": "sha512-SOngD3rKnwZWhhUV68AYlH8M3LRGvF69jnDrYKwtRy1ESqSH7tt+1vexGC290gKvqH7bNMgYv8f5BS1AASRfzw==",
+      "version": "18.2.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.8.tgz",
+      "integrity": "sha512-4o2T6wsmXGE/v53+F8L7kGoN2+qzt03C9rtjLVQpOljzpJVttQ8bhvfWxyYLWwcl04RWqRa+82fpIZtBkOlZJw==",
       "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "picomatch": "3.0.1",
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
         "rxjs": "7.8.1",
         "source-map": "0.7.4"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
@@ -64,14 +64,14 @@
       "dev": true
     },
     "node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -79,9 +79,9 @@
       }
     },
     "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -120,15 +120,20 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "node_modules/fast-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
+      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="
+    },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="
     },
     "node_modules/make-error": {
       "version": "1.3.6",
@@ -137,24 +142,16 @@
       "dev": true
     },
     "node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -241,14 +238,6 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
     "node_modules/yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
@@ -261,23 +250,23 @@
   },
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.1700.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.3.tgz",
-      "integrity": "sha512-HUjx7vD16paWXHKHYc2LsSn/kaYbFr2YNnlzuSr9C0kauKS1e7sRpRvtGwQzXfohzgyKi81AAU5uA2KLRGq83w==",
+      "version": "0.1802.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.8.tgz",
+      "integrity": "sha512-/rtFQEKgS7LlB9oHr4NCBSdKnvP5kr8L5Hbd3Vl8hZOYK9QWjxKPEXnryA2d5+PCE98bBzZswCNXqELZCPTgIQ==",
       "requires": {
-        "@angular-devkit/core": "17.0.3",
+        "@angular-devkit/core": "18.2.8",
         "rxjs": "7.8.1"
       }
     },
     "@angular-devkit/core": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.0.3.tgz",
-      "integrity": "sha512-SOngD3rKnwZWhhUV68AYlH8M3LRGvF69jnDrYKwtRy1ESqSH7tt+1vexGC290gKvqH7bNMgYv8f5BS1AASRfzw==",
+      "version": "18.2.8",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.8.tgz",
+      "integrity": "sha512-4o2T6wsmXGE/v53+F8L7kGoN2+qzt03C9rtjLVQpOljzpJVttQ8bhvfWxyYLWwcl04RWqRa+82fpIZtBkOlZJw==",
       "requires": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "picomatch": "3.0.1",
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
         "rxjs": "7.8.1",
         "source-map": "0.7.4"
       }
@@ -289,20 +278,20 @@
       "dev": true
     },
     "ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "requires": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       }
     },
     "ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "requires": {
         "ajv": "^8.0.0"
       }
@@ -330,15 +319,20 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "fast-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
+      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="
+    },
     "json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="
     },
     "make-error": {
       "version": "1.3.6",
@@ -347,14 +341,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="
-    },
-    "punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -416,14 +405,6 @@
       "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true
     },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
     "yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
diff --git a/tools/build-lib/package.json b/tools/build-lib/package.json
index d12186f4408..c162e939cfb 100644
--- a/tools/build-lib/package.json
+++ b/tools/build-lib/package.json
@@ -16,6 +16,6 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@angular-devkit/architect": "0.1700.3"
+    "@angular-devkit/architect": "0.1802.8"
   }
 }
diff --git a/tools/config/const.ts b/tools/config/const.ts
index 840a2796a8f..ccb27e30206 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.0';
+export const PUBLISHING_VERSION = '2211.29.1';
diff --git a/tools/schematics/testing.ts b/tools/schematics/testing.ts
index 15ed58f5e48..a12753a749c 100644
--- a/tools/schematics/testing.ts
+++ b/tools/schematics/testing.ts
@@ -80,11 +80,13 @@ const commands = [
   'test all schematics',
   'exit',
 ] as const;
-type Command = typeof commands[number];
+type Command = (typeof commands)[number];
 
 const buildLibRegEx = new RegExp('build (.*?)/schematics');
-const verdaccioUrl = 'http://localhost:4873/';
-const npmUrl = 'https://registry.npmjs.org/';
+const verdaccioRegistryUrl = 'http://localhost:4873/';
+const originalRegistryUrl = execSync('npm config get @spartacus:registry')
+  .toString()
+  .trim();
 
 function startVerdaccio(): ChildProcess {
   execSync('rm -rf ./scripts/install/storage');
@@ -92,7 +94,7 @@ function startVerdaccio(): ChildProcess {
   console.log('Waiting for verdaccio to boot...');
   const res = exec('verdaccio --config ./scripts/install/config.yaml');
   try {
-    execSync(`npx wait-on ${verdaccioUrl} --timeout 10000`);
+    execSync(`npx wait-on ${verdaccioRegistryUrl} --timeout 10000`);
   } catch (_e) {
     console.log(
       chalk.red(
@@ -102,13 +104,13 @@ function startVerdaccio(): ChildProcess {
     process.exit(1);
   }
   console.log('Pointing npm to verdaccio');
-  execSync(`npm config set @spartacus:registry ${verdaccioUrl}`);
+  execSync(`npm config set @spartacus:registry ${verdaccioRegistryUrl}`);
   return res;
 }
 
 function beforeExit(): void {
   console.log('Setting npm back to npmjs.org');
-  execSync(`npm config set @spartacus:registry ${npmUrl}`);
+  execSync(`npm config set @spartacus:registry ${originalRegistryUrl}`);
   if (verdaccioProcess) {
     try {
       console.log('Killing verdaccio');
@@ -140,7 +142,7 @@ function publishLibs(): void {
     const dir = path.dirname(packagePath);
     console.log(`\nPublishing ${content.name}`);
     execSync(
-      `cd ${dir} && npm publish --registry=${verdaccioUrl} --no-git-tag-version`,
+      `cd ${dir} && npm publish --registry=${verdaccioRegistryUrl} --no-git-tag-version`,
       { stdio: 'inherit' }
     );
   });