diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2d9f8d7d3a..a18ff9814e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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/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/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/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/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/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/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/styles/_configurator-conflict-solver-dialog.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-solver-dialog.scss
index 3f77ad35f87..660cd69059d 100644
--- a/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-solver-dialog.scss
+++ b/feature-libs/product-configurator/rulebased/styles/_configurator-conflict-solver-dialog.scss
@@ -12,7 +12,6 @@
     $modal-dialog-margin-sm: 0 !important;
 
     .cx-modal-container {
-      height: auto !important;
       margin-block-start: 80px;
       overflow-x: hidden;
 
@@ -33,6 +32,11 @@
       }
 
       .cx-modal-content {
+        margin: auto;
+        @include media-breakpoint-down(sm) {
+          min-height: 100%;
+        }
+
         .cx-dialog-header {
           outline: 0;
           padding-inline-start: 16px;
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/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 d63f1c4438c..03833613fb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,13 +95,13 @@
         "http-proxy": "^1.18.1",
         "http-server": "^14.1.1",
         "i18n-lint": "^1.1.0",
-        "jasmine-core": "~5.1.2",
+        "jasmine-core": "~5.3.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": {
@@ -855,6 +855,12 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/jsonc-parser": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -1063,6 +1069,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",
@@ -15910,9 +15922,9 @@
       }
     },
     "node_modules/jasmine-core": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.2.tgz",
-      "integrity": "sha512-2oIUMGn00FdUiqz6epiiJr7xcFyNYj3rDcfmnzfkBnHyBQ3cBQUs4mmyGsOb7TTLb9kxk7dBcmEmqhDKkBoDyA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.3.0.tgz",
+      "integrity": "sha512-zsOmeBKESky4toybvWEikRiZ0jHoBEu79wNArLfMdSnlLMZx3Xcp6CSm2sUcYyoJC+Uyj8LBJap/MUbVSfJ27g==",
       "dev": true
     },
     "node_modules/jasmine-marbles": {
@@ -16847,9 +16859,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": {
@@ -23544,9 +23556,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 +23944,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",
@@ -24675,6 +24687,12 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
+        "jsonc-parser": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+          "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+          "dev": true
+        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -24814,6 +24832,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",
@@ -35282,9 +35306,9 @@
       }
     },
     "jasmine-core": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.1.2.tgz",
-      "integrity": "sha512-2oIUMGn00FdUiqz6epiiJr7xcFyNYj3rDcfmnzfkBnHyBQ3cBQUs4mmyGsOb7TTLb9kxk7dBcmEmqhDKkBoDyA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.3.0.tgz",
+      "integrity": "sha512-zsOmeBKESky4toybvWEikRiZ0jHoBEu79wNArLfMdSnlLMZx3Xcp6CSm2sUcYyoJC+Uyj8LBJap/MUbVSfJ27g==",
       "dev": true
     },
     "jasmine-marbles": {
@@ -36003,9 +36027,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": {
@@ -40784,9 +40808,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 +40891,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 6fc3e9599a3..cc7bf8e34a4 100644
--- a/package.json
+++ b/package.json
@@ -206,13 +206,13 @@
     "http-proxy": "^1.18.1",
     "http-server": "^14.1.1",
     "i18n-lint": "^1.1.0",
-    "jasmine-core": "~5.1.2",
+    "jasmine-core": "~5.3.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/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 a7704a7c719..f62c5f5198e 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
@@ -562,7 +562,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;
 
@@ -640,7 +640,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   showPromotionsInPDP: true,
   recentSearches: true,
   trendingSearches: false,
-  pdfInvoicesSortByInvoiceDate: false,
+  pdfInvoicesSortByInvoiceDate: true,
   storeFrontLibCardParagraphTruncated: true,
   useProductCarouselBatchApi: false,
   productConfiguratorAttributeTypesV2: true,
@@ -680,7 +680,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 844c1b5547d..0b59cf789d5 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,
@@ -296,7 +295,7 @@ if (environment.cpq) {
         showPromotionsInPDP: false,
         recentSearches: true,
         trendingSearches: false,
-        pdfInvoicesSortByInvoiceDate: false,
+        pdfInvoicesSortByInvoiceDate: true,
         storeFrontLibCardParagraphTruncated: true,
         useProductCarouselBatchApi: true,
         productConfiguratorAttributeTypesV2: true,
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/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/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' }
     );
   });