diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 3e0f3a58ddb..438662b8264 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -392,15 +392,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/cart/base/root/models/cart.model.ts b/feature-libs/cart/base/root/models/cart.model.ts
index ccd5c549df8..9c77d1760bd 100644
--- a/feature-libs/cart/base/root/models/cart.model.ts
+++ b/feature-libs/cart/base/root/models/cart.model.ts
@@ -119,8 +119,6 @@ export interface CartItemComponentOptions {
 
 export interface OrderEntry {
   orderCode?: string;
-  //TODO CHHI Where to put this? Depends on the library dependencies
-  //between cart, quote and product-configurator
   quoteCode?: string;
   basePrice?: Price;
   deliveryMode?: DeliveryMode;
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
index 0d63c0b9e60..3ab1a9adca9 100644
--- a/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
+++ b/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
@@ -143,6 +143,8 @@ class MockCardComponent {
   content: Card;
   @Input()
   fitToContainer: boolean;
+  @Input()
+  index: number;
 }
 
 describe('B2BCheckoutDeliveryAddressComponent', () => {
diff --git a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts
index 9179d72fde1..5d7d7c6dd4e 100644
--- a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts
+++ b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts
@@ -30,7 +30,7 @@ import {
   QueryState,
   UserCostCenterService,
 } from '@spartacus/core';
-import { Card, PromotionsModule } from '@spartacus/storefront';
+import { Card, OutletModule, PromotionsModule } from '@spartacus/storefront';
 import { IconTestingModule } from 'projects/storefrontlib/cms-components/misc/icon/testing/icon-testing.module';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { B2BCheckoutReviewSubmitComponent } from './checkout-review-submit.component';
@@ -221,6 +221,7 @@ describe('B2BCheckoutReviewSubmitComponent', () => {
           PromotionsModule,
           RouterTestingModule,
           IconTestingModule,
+          OutletModule,
         ],
         declarations: [
           B2BCheckoutReviewSubmitComponent,
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
index e4219775fe4..1dad5745da6 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
@@ -9,11 +9,11 @@ import {
 } from '@spartacus/checkout/base/root';
 import {
   Address,
+  FeaturesConfig,
+  FeaturesConfigModule,
   GlobalMessageService,
   I18nTestingModule,
   UserAddressService,
-  FeaturesConfig,
-  FeaturesConfigModule,
 } from '@spartacus/core';
 import { Card } from '@spartacus/storefront';
 import { EMPTY, of } from 'rxjs';
@@ -92,6 +92,7 @@ class MockAddressFormComponent {
   @Input() cancelBtnLabel: string;
   @Input() showTitleCode: boolean;
   @Input() setAsDefaultField: boolean;
+  @Input() addressData: Address;
 }
 
 @Component({
@@ -111,6 +112,8 @@ class MockCardComponent {
   content: Card;
   @Input()
   fitToContainer: boolean;
+  @Input()
+  index: number;
 }
 
 class MockCheckoutDeliveryModesFacade
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
index 595d94d5356..19d552192b4 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
@@ -11,6 +11,7 @@ import {
 } from '@spartacus/cart/base/root';
 import { CheckoutDeliveryModesFacade } from '@spartacus/checkout/base/root';
 import {
+  FeaturesConfigModule,
   GlobalMessageService,
   GlobalMessageType,
   I18nTestingModule,
@@ -118,7 +119,12 @@ describe('CheckoutDeliveryModeComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [ReactiveFormsModule, I18nTestingModule, OutletModule],
+        imports: [
+          ReactiveFormsModule,
+          I18nTestingModule,
+          OutletModule,
+          FeaturesConfigModule,
+        ],
         declarations: [CheckoutDeliveryModeComponent, MockSpinnerComponent],
         providers: [
           {
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
index 994f76717ed..7286faa09a5 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
@@ -31,7 +31,6 @@ import { CheckoutDeliveryModeComponent } from './checkout-delivery-mode.componen
     OutletModule,
     PageComponentModule,
     FeaturesConfigModule,
-    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts
index ee948cff11c..2e5cb096013 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts
@@ -21,6 +21,7 @@ import {
   FormErrorsModule,
   ICON_TYPE,
   LaunchDialogService,
+  NgSelectA11yModule,
 } from '@spartacus/storefront';
 import { EMPTY, Observable, of } from 'rxjs';
 import { CheckoutPaymentFormComponent } from './checkout-payment-form.component';
@@ -180,6 +181,7 @@ describe('CheckoutPaymentFormComponent', () => {
         imports: [
           ReactiveFormsModule,
           NgSelectModule,
+          NgSelectA11yModule,
           I18nTestingModule,
           FormErrorsModule,
         ],
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
index 4c7007da1b4..f65db3396c1 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
@@ -150,6 +150,10 @@ class MockPaymentFormComponent {
   paymentMethodsCount: number;
   @Input()
   setAsDefaultField: boolean;
+  @Input()
+  loading: boolean;
+  @Input()
+  paymentDetails?: PaymentDetails;
 }
 
 @Component({
diff --git a/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts b/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts
index dd84cb3e865..7d07f2b0c45 100644
--- a/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts
@@ -1,10 +1,18 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { UntypedFormGroup, ReactiveFormsModule } from '@angular/forms';
+import { ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
-import { I18nTestingModule, RoutingService } from '@spartacus/core';
+import {
+  GlobalMessageService,
+  I18nTestingModule,
+  RoutingService,
+} from '@spartacus/core';
 import { OrderFacade } from '@spartacus/order/root';
-import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import {
+  AtMessageModule,
+  LaunchDialogService,
+  LAUNCH_CALLER,
+} from '@spartacus/storefront';
 import { of } from 'rxjs';
 import { CheckoutPlaceOrderComponent } from './checkout-place-order.component';
 import createSpy = jasmine.createSpy;
@@ -42,12 +50,18 @@ describe('CheckoutPlaceOrderComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [ReactiveFormsModule, RouterTestingModule, I18nTestingModule],
+        imports: [
+          ReactiveFormsModule,
+          RouterTestingModule,
+          I18nTestingModule,
+          AtMessageModule,
+        ],
         declarations: [MockUrlPipe, CheckoutPlaceOrderComponent],
         providers: [
           { provide: OrderFacade, useClass: MockOrderFacade },
           { provide: RoutingService, useClass: MockRoutingService },
           { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+          { provide: GlobalMessageService, useValue: {} },
         ],
       }).compileComponents();
     })
diff --git a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts
index f9a1cd90b95..e9de27f3f0e 100644
--- a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts
@@ -17,7 +17,7 @@ import {
   CheckoutStepType,
 } from '@spartacus/checkout/base/root';
 import { Address, Country, I18nTestingModule } from '@spartacus/core';
-import { Card, PromotionsModule } from '@spartacus/storefront';
+import { Card, OutletModule, PromotionsModule } from '@spartacus/storefront';
 import { IconTestingModule } from 'projects/storefrontlib/cms-components/misc/icon/testing/icon-testing.module';
 import { of } from 'rxjs';
 import { CheckoutStepService } from '../services/checkout-step.service';
@@ -149,6 +149,7 @@ describe('CheckoutReviewSubmitComponent', () => {
           PromotionsModule,
           RouterTestingModule,
           IconTestingModule,
+          OutletModule,
         ],
         declarations: [
           CheckoutReviewSubmitComponent,
diff --git a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.module.ts b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.module.ts
index 2414205b933..334e59b90f7 100644
--- a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.module.ts
+++ b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.module.ts
@@ -9,6 +9,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
@@ -33,6 +34,7 @@ import { CheckoutReviewSubmitComponent } from './checkout-review-submit.componen
     PromotionsModule,
     IconModule,
     OutletModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/components/checkout-review/checkout-review-shipping/checkout-review-shipping.component.spec.ts b/feature-libs/checkout/base/components/checkout-review/checkout-review-shipping/checkout-review-shipping.component.spec.ts
index 6319b1d3c5e..2fdb5b847c8 100644
--- a/feature-libs/checkout/base/components/checkout-review/checkout-review-shipping/checkout-review-shipping.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-review/checkout-review-shipping/checkout-review-shipping.component.spec.ts
@@ -11,12 +11,19 @@ import { IconTestingModule } from 'projects/storefrontlib/cms-components/misc/ic
 import { of } from 'rxjs';
 import createSpy = jasmine.createSpy;
 
-import { ChangeDetectorRef, Pipe, PipeTransform } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 import {
   ActiveCartFacade,
   DeliveryMode,
   OrderEntry,
 } from '@spartacus/cart/base/root';
+import { Card, OutletModule } from '@spartacus/storefront';
 import { CheckoutStepService } from '../../services/checkout-step.service';
 import { CheckoutReviewShippingComponent } from './checkout-review-shipping.component';
 
@@ -107,14 +114,38 @@ class MockUrlPipe implements PipeTransform {
   transform(): any {}
 }
 
+@Component({
+  selector: 'cx-card',
+  template: '',
+})
+class MockCardComponent {
+  @Input()
+  border: boolean;
+  @Input()
+  content: Card;
+  @Input()
+  fitToContainer: boolean;
+  @Input()
+  index: number;
+}
+
 describe('CheckoutReviewShippingComponent', () => {
   let component: CheckoutReviewShippingComponent;
   let fixture: ComponentFixture<CheckoutReviewShippingComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [I18nTestingModule, RouterTestingModule, IconTestingModule],
-      declarations: [CheckoutReviewShippingComponent, MockUrlPipe],
+      imports: [
+        I18nTestingModule,
+        RouterTestingModule,
+        IconTestingModule,
+        OutletModule,
+      ],
+      declarations: [
+        CheckoutReviewShippingComponent,
+        MockUrlPipe,
+        MockCardComponent,
+      ],
       providers: [
         {
           provide: CheckoutDeliveryAddressFacade,
diff --git a/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts
index ad8433fdf99..83b5aa7873b 100644
--- a/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts
+++ b/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts
@@ -2,7 +2,11 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
-import { I18nTestingModule, RoutingService } from '@spartacus/core';
+import {
+  GlobalMessageService,
+  I18nTestingModule,
+  RoutingService,
+} from '@spartacus/core';
 import {
   DaysOfWeek,
   OrderFacade,
@@ -11,7 +15,11 @@ import {
   ScheduledReplenishmentOrderFacade,
   ScheduleReplenishmentForm,
 } from '@spartacus/order/root';
-import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import {
+  AtMessageModule,
+  LaunchDialogService,
+  LAUNCH_CALLER,
+} from '@spartacus/storefront';
 import { BehaviorSubject, EMPTY, of } from 'rxjs';
 import { CheckoutReplenishmentFormService } from '../services/checkout-replenishment-form.service';
 import { CheckoutScheduledReplenishmentPlaceOrderComponent } from './checkout-place-order.component';
@@ -85,7 +93,12 @@ describe('CheckoutScheduledReplenishmentPlaceOrderComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [ReactiveFormsModule, RouterTestingModule, I18nTestingModule],
+        imports: [
+          ReactiveFormsModule,
+          RouterTestingModule,
+          I18nTestingModule,
+          AtMessageModule,
+        ],
         declarations: [
           MockUrlPipe,
           CheckoutScheduledReplenishmentPlaceOrderComponent,
@@ -102,6 +115,10 @@ describe('CheckoutScheduledReplenishmentPlaceOrderComponent', () => {
             provide: ScheduledReplenishmentOrderFacade,
             useClass: MockScheduledReplenishmentOrderFacade,
           },
+          {
+            provide: GlobalMessageService,
+            useValue: {},
+          },
         ],
       }).compileComponents();
     })
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index 7fed492a7f6..8714945cf6d 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -402,15 +402,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/pdf-invoices/tsconfig.schematics.json b/feature-libs/pdf-invoices/tsconfig.schematics.json
index 7fed492a7f6..8714945cf6d 100644
--- a/feature-libs/pdf-invoices/tsconfig.schematics.json
+++ b/feature-libs/pdf-invoices/tsconfig.schematics.json
@@ -402,15 +402,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index 66ecd404891..4fa08974773 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -405,15 +405,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts
index c34bc028928..38073f0cb83 100644
--- a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts
+++ b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts
@@ -51,7 +51,7 @@ const mockQuote: Quote = {
 const testMappings: ConfirmActionDialogMappingConfig = {
   BUYER_OFFER: {
     EDIT: {
-      i18nKey: 'quote.actions.confirmDialog.buyer_offer.edit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer_offer.edit',
       showWarningNote: true,
       showExpirationDate: true,
       showSuccessMessage: false,
@@ -60,7 +60,7 @@ const testMappings: ConfirmActionDialogMappingConfig = {
   },
   BUYER: {
     SUBMIT: {
-      i18nKey: 'quote.actions.confirmDialog.buyer.submit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer.submit',
       showWarningNote: false,
       showExpirationDate: false,
       showSuccessMessage: true,
@@ -69,7 +69,7 @@ const testMappings: ConfirmActionDialogMappingConfig = {
   },
   EXPIRED: {
     REQUOTE: {
-      i18nKey: 'quote.actions.confirmDialog.expired.requote',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.expired.requote',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
@@ -78,7 +78,7 @@ const testMappings: ConfirmActionDialogMappingConfig = {
   },
   ALL: {
     EDIT: {
-      i18nKey: 'quote.confirmActionDialog.all.edit',
+      i18nKeyPrefix: 'quote.confirmActionDialog.all.edit',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
@@ -322,8 +322,6 @@ describe('QuoteActionsByRoleComponent', () => {
   });
 
   describe('Threshold check', () => {
-    const attributeName = 'disabled';
-
     const allowedActionsSubmit = [
       { type: QuoteActionType.SUBMIT, isPrimary: true },
     ];
@@ -348,7 +346,7 @@ describe('QuoteActionsByRoleComponent', () => {
         expect,
         htmlElem,
         '.btn:first-child',
-        attributeName
+        'disabled'
       );
     });
 
@@ -360,7 +358,7 @@ describe('QuoteActionsByRoleComponent', () => {
         expect,
         htmlElem,
         '.btn:first-child',
-        attributeName
+        'disabled'
       );
     });
 
@@ -373,7 +371,7 @@ describe('QuoteActionsByRoleComponent', () => {
         expect,
         htmlElem,
         '.btn:first-child',
-        attributeName
+        'disabled'
       );
       expect(globalMessageService.add).toHaveBeenCalled();
     });
@@ -387,7 +385,7 @@ describe('QuoteActionsByRoleComponent', () => {
         expect,
         htmlElem,
         '.btn:first-child',
-        attributeName
+        'disabled'
       );
     });
 
@@ -399,7 +397,7 @@ describe('QuoteActionsByRoleComponent', () => {
         expect,
         htmlElem,
         '.btn:first-child',
-        attributeName
+        'disabled'
       );
     });
 
@@ -542,7 +540,7 @@ describe('QuoteActionsByRoleComponent', () => {
           QuoteState.BUYER_OFFER
         )
       ).toEqual({
-        i18nKey: 'quote.actions.confirmDialog.buyer_offer.edit',
+        i18nKeyPrefix: 'quote.actions.confirmDialog.buyer_offer.edit',
         showWarningNote: true,
         showExpirationDate: true,
         showSuccessMessage: false,
@@ -556,7 +554,7 @@ describe('QuoteActionsByRoleComponent', () => {
           QuoteState.BUYER_DRAFT
         )
       ).toEqual({
-        i18nKey: 'quote.confirmActionDialog.all.edit',
+        i18nKeyPrefix: 'quote.confirmActionDialog.all.edit',
         showWarningNote: true,
         showExpirationDate: false,
         showSuccessMessage: false,
@@ -599,6 +597,16 @@ describe('QuoteActionsByRoleComponent', () => {
       expect(globalMessageService.add).not.toHaveBeenCalled();
     });
 
+    it("should perform quote action once if dialog was closed a few times selecting 'no', before finally selecting 'yes'", () => {
+      context.successMessage = undefined;
+      component['handleConfirmationDialogClose'](QuoteActionType.EDIT, context);
+      launchDialogService.closeDialog('no');
+      component['handleConfirmationDialogClose'](QuoteActionType.EDIT, context);
+      launchDialogService.closeDialog('yes');
+      expect(facade.performQuoteAction).toHaveBeenCalledTimes(1);
+      expect(globalMessageService.add).not.toHaveBeenCalled();
+    });
+
     it("should perform quote action if dialog was closed selecting 'yes' and display the given success message", () => {
       component['handleConfirmationDialogClose'](
         QuoteActionType.SUBMIT,
diff --git a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts
index 71839000645..c9f89a6db55 100644
--- a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts
+++ b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts
@@ -41,7 +41,7 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
   protected launchDialogService = inject(LaunchDialogService);
   protected viewContainerRef = inject(ViewContainerRef);
   protected globalMessageService = inject(GlobalMessageService);
-  protected config = inject(QuoteUIConfig);
+  protected quoteUIConfig = inject(QuoteUIConfig);
   protected activeCartFacade = inject(ActiveCartFacade);
 
   quoteDetails$: Observable<Quote> = this.quoteFacade.getQuoteDetails();
@@ -115,6 +115,8 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
     action: QuoteActionType,
     context: ConfirmationContext
   ) {
+    this.subscription.unsubscribe();
+    this.subscription = new Subscription();
     this.subscription.add(
       this.launchDialogService.dialogClose
         .pipe(
@@ -164,7 +166,7 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
     state: QuoteState,
     cartIsEmpty: boolean
   ): boolean {
-    const mappingConfig = this.config.quote?.confirmActionDialogMapping;
+    const mappingConfig = this.quoteUIConfig.quote?.confirmActionDialogMapping;
     const dialogConfig =
       mappingConfig?.[state]?.[action] ??
       mappingConfig?.[this.stateToRoleTypeForDialogConfig(state)]?.[action] ??
@@ -182,18 +184,19 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
     const dialogConfig = this.getDialogConfig(action, quote.state);
     const confirmationContext: ConfirmationContext = {
       quote: quote,
-      title: dialogConfig.i18nKey + '.title',
-      confirmNote: dialogConfig.i18nKey + '.confirmNote',
+      title: dialogConfig.i18nKeyPrefix + '.title',
+      confirmNote: dialogConfig.i18nKeyPrefix + '.confirmNote',
     };
     if (dialogConfig.showWarningNote) {
-      confirmationContext.warningNote = dialogConfig.i18nKey + '.warningNote';
+      confirmationContext.warningNote =
+        dialogConfig.i18nKeyPrefix + '.warningNote';
     }
     if (dialogConfig.showExpirationDate) {
       confirmationContext.validity = 'quote.actions.confirmDialog.validity';
     }
     if (dialogConfig.showSuccessMessage) {
       confirmationContext.successMessage =
-        dialogConfig.i18nKey + '.successMessage';
+        dialogConfig.i18nKeyPrefix + '.successMessage';
     }
     return confirmationContext;
   }
@@ -202,7 +205,7 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
     action: QuoteActionType,
     state: QuoteState
   ): ConfirmActionDialogConfig {
-    const mappingConfig = this.config.quote?.confirmActionDialogMapping;
+    const mappingConfig = this.quoteUIConfig.quote?.confirmActionDialogMapping;
 
     const config =
       mappingConfig?.[state]?.[action] ??
diff --git a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.module.ts b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.module.ts
index 26c4b0e0a61..36dc3874d56 100644
--- a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.module.ts
+++ b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.module.ts
@@ -6,8 +6,6 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { QuoteCoreConfig } from '@spartacus/quote/core';
-import { QuoteActionType } from '@spartacus/quote/root';
 import {
   AuthGuard,
   CmsConfig,
@@ -19,34 +17,6 @@ import { QuoteActionsByRoleComponent } from './quote-actions-by-role.component';
 @NgModule({
   imports: [CommonModule, I18nModule],
   providers: [
-    provideDefaultConfig(<QuoteCoreConfig>{
-      quote: {
-        actions: {
-          primaryActions: [
-            QuoteActionType.APPROVE,
-            QuoteActionType.CHECKOUT,
-            QuoteActionType.SUBMIT,
-            QuoteActionType.REQUOTE,
-          ],
-          actionsOrderByState: {
-            BUYER_DRAFT: [
-              QuoteActionType.SUBMIT,
-              QuoteActionType.EDIT,
-              QuoteActionType.CANCEL,
-            ],
-            BUYER_OFFER: [
-              QuoteActionType.CHECKOUT,
-              QuoteActionType.EDIT,
-              QuoteActionType.CANCEL,
-            ],
-            CANCELLED: [QuoteActionType.REQUOTE],
-            EXPIRED: [QuoteActionType.REQUOTE, QuoteActionType.CANCEL],
-            SELLER_REQUEST: [QuoteActionType.SUBMIT, QuoteActionType.EDIT],
-            SELLER_DRAFT: [QuoteActionType.SUBMIT, QuoteActionType.EDIT],
-          },
-        },
-      },
-    }),
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
         QuoteActionsByRoleComponent: {
diff --git a/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.ts b/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.ts
index 507ad68c3f2..4c0b9d25ab1 100644
--- a/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.ts
+++ b/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.ts
@@ -27,7 +27,7 @@ import { ConfirmationContext } from './quote-actions-confirm-dialog.model';
 })
 export class QuoteActionsConfirmDialogComponent implements OnInit {
   protected launchDialogService = inject(LaunchDialogService);
-  protected config = inject(QuoteCoreConfig);
+  protected quoteCoreConfig = inject(QuoteCoreConfig);
 
   iconTypes = ICON_TYPE;
 
diff --git a/feature-libs/quote/components/actions/link/quote-actions-link.component.html b/feature-libs/quote/components/actions/link/quote-actions-link.component.html
index 956ff6dc244..ea51f96e36a 100644
--- a/feature-libs/quote/components/actions/link/quote-actions-link.component.html
+++ b/feature-libs/quote/components/actions/link/quote-actions-link.component.html
@@ -2,17 +2,17 @@
   <section>
     <ul>
       <li>
-        <button (click)="goToNewCart()" class="link cx-action-link">
+        <a (click)="goToNewCart()" class="link cx-action-link">
           {{ 'quote.actions.link.newCart' | cxTranslate }}
-        </button>
+        </a>
       </li>
       <li>
-        <button
+        <a
           [routerLink]="{ cxRoute: 'quotes' } | cxUrl"
           class="link cx-action-link"
         >
           {{ 'quote.actions.link.quotes' | cxTranslate }}
-        </button>
+        </a>
       </li>
     </ul>
   </section>
diff --git a/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts b/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts
index fb713eba35a..e0fc3e64710 100644
--- a/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts
+++ b/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts
@@ -115,14 +115,14 @@ describe('QuoteActionsLinkComponent', () => {
     CommonQuoteTestUtilsService.expectNumberOfElementsPresent(
       expect,
       htmlElem,
-      'button.link',
+      'a.link',
       2
     );
 
     CommonQuoteTestUtilsService.expectElementToContainText(
       expect,
       htmlElem,
-      'button.link',
+      'a.link',
       'quote.actions.link.newCart',
       0
     );
@@ -130,7 +130,7 @@ describe('QuoteActionsLinkComponent', () => {
     CommonQuoteTestUtilsService.expectElementToContainText(
       expect,
       htmlElem,
-      'button.link',
+      'a.link',
       'quote.actions.link.quotes',
       1
     );
@@ -140,7 +140,7 @@ describe('QuoteActionsLinkComponent', () => {
     spyOn(component, 'goToNewCart').and.callThrough();
     const link = CommonQuoteTestUtilsService.getHTMLElement(
       htmlElem,
-      'button.link',
+      'a.link',
       0
     );
     link.click();
@@ -152,7 +152,7 @@ describe('QuoteActionsLinkComponent', () => {
     fixture.detectChanges();
     const link = CommonQuoteTestUtilsService.getHTMLElement(
       htmlElem,
-      'button.link',
+      'a.link',
       1
     );
     link.click();
diff --git a/feature-libs/quote/components/aware/ng-package.json b/feature-libs/quote/components/aware/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/quote/components/aware/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/quote/quote-aware/public_api.ts b/feature-libs/quote/components/aware/public_api.ts
similarity index 58%
rename from feature-libs/quote/quote-aware/public_api.ts
rename to feature-libs/quote/components/aware/public_api.ts
index 374411b4c44..902a1930859 100644
--- a/feature-libs/quote/quote-aware/public_api.ts
+++ b/feature-libs/quote/components/aware/public_api.ts
@@ -4,4 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './quote-aware.module';
+export * from './quote-aware.component.module';
+export * from './quote-aware.component';
diff --git a/feature-libs/quote/quote-aware/component/quote-aware.component.html b/feature-libs/quote/components/aware/quote-aware.component.html
similarity index 100%
rename from feature-libs/quote/quote-aware/component/quote-aware.component.html
rename to feature-libs/quote/components/aware/quote-aware.component.html
diff --git a/feature-libs/quote/quote-aware/component/quote-aware.component.module.ts b/feature-libs/quote/components/aware/quote-aware.component.module.ts
similarity index 100%
rename from feature-libs/quote/quote-aware/component/quote-aware.component.module.ts
rename to feature-libs/quote/components/aware/quote-aware.component.module.ts
diff --git a/feature-libs/quote/quote-aware/component/quote-aware.component.spec.ts b/feature-libs/quote/components/aware/quote-aware.component.spec.ts
similarity index 100%
rename from feature-libs/quote/quote-aware/component/quote-aware.component.spec.ts
rename to feature-libs/quote/components/aware/quote-aware.component.spec.ts
diff --git a/feature-libs/quote/quote-aware/component/quote-aware.component.ts b/feature-libs/quote/components/aware/quote-aware.component.ts
similarity index 100%
rename from feature-libs/quote/quote-aware/component/quote-aware.component.ts
rename to feature-libs/quote/components/aware/quote-aware.component.ts
diff --git a/feature-libs/quote/components/comments/quote-comments.component.ts b/feature-libs/quote/components/comments/quote-comments.component.ts
index 83bf3a6af6f..bff27582c67 100644
--- a/feature-libs/quote/components/comments/quote-comments.component.ts
+++ b/feature-libs/quote/components/comments/quote-comments.component.ts
@@ -34,7 +34,7 @@ export class QuoteCommentsComponent {
   protected quoteItemsComponentService = inject(QuoteItemsComponentService);
   protected eventService = inject(EventService);
   protected translationService = inject(TranslationService);
-  protected config = inject(QuoteUIConfig);
+  protected quoteUIConfig = inject(QuoteUIConfig);
   protected document = inject(DOCUMENT);
 
   @ViewChild(MessagingComponent) commentsComponent: MessagingComponent;
@@ -103,7 +103,8 @@ export class QuoteCommentsComponent {
   protected prepareMessagingConfigs(): MessagingConfigs {
     return {
       charactersLimit:
-        this.config.quote?.maxCharsForComments ?? DEFAULT_COMMENT_MAX_CHARS,
+        this.quoteUIConfig.quote?.maxCharsForComments ??
+        DEFAULT_COMMENT_MAX_CHARS,
       displayAddMessageSection: this.quoteDetails$.pipe(
         map((quote) => quote.isEditable)
       ),
diff --git a/feature-libs/quote/components/config/augmented-config.model.ts b/feature-libs/quote/components/config/augmented-config.model.ts
deleted file mode 100644
index 1ba1337b4df..00000000000
--- a/feature-libs/quote/components/config/augmented-config.model.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { QuoteUIConfig } from './quote-ui.config';
-
-declare module '@spartacus/core' {
-  interface Config extends QuoteUIConfig {}
-}
diff --git a/feature-libs/quote/components/config/default-quote-ui.config.ts b/feature-libs/quote/components/config/default-quote-ui.config.ts
index bd7d7489457..8616b5cd19f 100644
--- a/feature-libs/quote/components/config/default-quote-ui.config.ts
+++ b/feature-libs/quote/components/config/default-quote-ui.config.ts
@@ -22,32 +22,32 @@ const defaultConfirmActionDialogConfig = {
 const defaultDialogMappings: ConfirmActionDialogMappingConfig = {
   BUYER_OFFER: {
     EDIT: {
-      i18nKey: 'quote.actions.confirmDialog.buyer_offer.edit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer_offer.edit',
       showWarningNote: true,
       showExpirationDate: true,
       showSuccessMessage: false,
       showOnlyWhenCartIsNotEmpty: false,
     },
     CANCEL: {
-      i18nKey: 'quote.actions.confirmDialog.buyer_offer.cancel',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer_offer.cancel',
       ...defaultConfirmActionDialogConfig,
     },
     CHECKOUT: {
-      i18nKey: 'quote.actions.confirmDialog.buyer_offer.checkout',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer_offer.checkout',
       ...defaultConfirmActionDialogConfig,
       showSuccessMessage: false,
     },
   },
   EXPIRED: {
     EDIT: {
-      i18nKey: 'quote.actions.confirmDialog.expired.edit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.expired.edit',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
       showOnlyWhenCartIsNotEmpty: false,
     },
     REQUOTE: {
-      i18nKey: 'quote.actions.confirmDialog.expired.requote',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.expired.requote',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
@@ -56,34 +56,34 @@ const defaultDialogMappings: ConfirmActionDialogMappingConfig = {
   },
   BUYER: {
     SUBMIT: {
-      i18nKey: 'quote.actions.confirmDialog.buyer.submit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer.submit',
       ...defaultConfirmActionDialogConfig,
     },
     CANCEL: {
-      i18nKey: 'quote.actions.confirmDialog.buyer.cancel',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.buyer.cancel',
       ...defaultConfirmActionDialogConfig,
     },
   },
   SELLER: {
     SUBMIT: {
-      i18nKey: 'quote.actions.confirmDialog.seller.submit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.seller.submit',
       ...defaultConfirmActionDialogConfig,
       showWarningNote: true,
     },
   },
   SELLERAPPROVER: {
     SUBMIT: {
-      i18nKey: 'quote.actions.confirmDialog.sellerapprover.submit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.sellerapprover.submit',
       ...defaultConfirmActionDialogConfig,
     },
     REJECT: {
-      i18nKey: 'quote.actions.confirmDialog.sellerapprover.reject',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.sellerapprover.reject',
       ...defaultConfirmActionDialogConfig,
     },
   },
   ALL: {
     EDIT: {
-      i18nKey: 'quote.actions.confirmDialog.all.edit',
+      i18nKeyPrefix: 'quote.actions.confirmDialog.all.edit',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
diff --git a/feature-libs/quote/components/config/index.ts b/feature-libs/quote/components/config/index.ts
index c239f6d73bd..e8d3adbcda5 100644
--- a/feature-libs/quote/components/config/index.ts
+++ b/feature-libs/quote/components/config/index.ts
@@ -5,4 +5,3 @@
  */
 
 export * from './quote-ui.config';
-import './augmented-config.model';
diff --git a/feature-libs/quote/components/config/quote-ui.config.ts b/feature-libs/quote/components/config/quote-ui.config.ts
index dd3c155b513..ec9d60492df 100644
--- a/feature-libs/quote/components/config/quote-ui.config.ts
+++ b/feature-libs/quote/components/config/quote-ui.config.ts
@@ -22,7 +22,7 @@ export interface QuoteUIConfigFragment {
 }
 
 export type ConfirmActionDialogConfig = {
-  i18nKey: string;
+  i18nKeyPrefix: string;
   showWarningNote: boolean;
   showExpirationDate: boolean;
   showSuccessMessage: boolean;
@@ -49,3 +49,7 @@ export type ConfirmActionDialogMappingConfig = {
 export abstract class QuoteUIConfig {
   quote?: QuoteUIConfigFragment;
 }
+
+declare module '@spartacus/core' {
+  interface Config extends QuoteUIConfig {}
+}
diff --git a/feature-libs/quote/components/header/overview/quote-header-overview.component.html b/feature-libs/quote/components/header/overview/quote-header-overview.component.html
index 79932722048..036adfde512 100644
--- a/feature-libs/quote/components/header/overview/quote-header-overview.component.html
+++ b/feature-libs/quote/components/header/overview/quote-header-overview.component.html
@@ -17,11 +17,11 @@ <h3 class="cx-status">
             getQuoteInformation(quoteDetails.name, quoteDetails.description)
               | async
           "
-          [truncateText]="true"
+          [truncateParagraphText]="true"
           [charactersLimit]="getCharactersLimitForCardTile()"
         ></cx-card>
         <button
-          *ngIf="isQuoteInformationEditable(quoteDetails)"
+          *ngIf="isQuoteEditableForBuyer(quoteDetails)"
           class="link cx-action-link cx-edit-btn"
           (click)="toggleEditMode()"
         >
@@ -40,15 +40,17 @@ <h3 class="cx-status">
     <div class="cx-summary-card">
       <cx-card
         [content]="
-          getEstimatedAndDate(quoteDetails, quoteDetails.creationTime | cxDate)
-            | async
+          getEstimatedTotalAndDate(
+            quoteDetails,
+            quoteDetails.creationTime | cxDate
+          ) | async
         "
       ></cx-card>
     </div>
     <div class="cx-summary-card">
       <cx-card
         [content]="
-          getUpdate(
+          getCardMetadata(
             quoteDetails.updatedTime | cxDate,
             quoteDetails.expirationTime | cxDate
           ) | async
diff --git a/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts b/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts
index a33bb04e44a..db799ba00ec 100644
--- a/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts
+++ b/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts
@@ -313,22 +313,22 @@ describe('QuoteHeaderOverviewComponent', () => {
 
     it('should return "false" if the quote information is not editable', () => {
       quote.isEditable = false;
-      expect(component.isQuoteInformationEditable(quote)).toBe(false);
+      expect(component.isQuoteEditableForBuyer(quote)).toBe(false);
     });
 
     it('should return "false" if the quote information is not editable for "SELLER_DRAFT"', () => {
       quote.state = QuoteState.SELLER_DRAFT;
-      expect(component.isQuoteInformationEditable(quote)).toBe(false);
+      expect(component.isQuoteEditableForBuyer(quote)).toBe(false);
     });
 
     it('should return "true" if the quote information is editable for "BUYER_DRAFT"', () => {
       quote.state = QuoteState.BUYER_DRAFT;
-      expect(component.isQuoteInformationEditable(quote)).toBe(true);
+      expect(component.isQuoteEditableForBuyer(quote)).toBe(true);
     });
 
     it('should return "true" if the quote information is editable for "BUYER_OFFER"', () => {
       quote.state = QuoteState.BUYER_OFFER;
-      expect(component.isQuoteInformationEditable(quote)).toBe(true);
+      expect(component.isQuoteEditableForBuyer(quote)).toBe(true);
     });
   });
 
@@ -421,7 +421,7 @@ describe('QuoteHeaderOverviewComponent', () => {
       };
 
       component
-        .getEstimatedAndDate(mockQuote, undefined)
+        .getEstimatedTotalAndDate(mockQuote, undefined)
         .subscribe((result) => {
           expect(result).toEqual(expected);
         });
@@ -446,7 +446,7 @@ describe('QuoteHeaderOverviewComponent', () => {
         ],
       };
 
-      component.getUpdate(undefined, undefined).subscribe((result) => {
+      component.getCardMetadata(undefined, undefined).subscribe((result) => {
         expect(result).toEqual(expected);
       });
     });
diff --git a/feature-libs/quote/components/header/overview/quote-header-overview.component.ts b/feature-libs/quote/components/header/overview/quote-header-overview.component.ts
index 507aeb3831d..4a5258d2549 100644
--- a/feature-libs/quote/components/header/overview/quote-header-overview.component.ts
+++ b/feature-libs/quote/components/header/overview/quote-header-overview.component.ts
@@ -31,11 +31,11 @@ export class QuoteHeaderOverviewComponent {
   protected quoteFacade = inject(QuoteFacade);
   protected eventService = inject(EventService);
   protected translationService = inject(TranslationService);
-  protected config = inject(QuoteUIConfig);
+  protected quoteUIConfig = inject(QuoteUIConfig);
 
-  private static NO_DATA = '-';
-  private static CHARACTERS_LIMIT = 255;
-  private static DEFAULT_CARD_TILE_MAX_CHARS = 100;
+  protected static NO_DATA = '-';
+  protected static CHARACTERS_LIMIT = 255;
+  protected static DEFAULT_CARD_TILE_MAX_CHARS = 100;
 
   quoteDetails$: Observable<Quote> = this.quoteFacade.getQuoteDetails();
   iconTypes = ICON_TYPE;
@@ -56,12 +56,12 @@ export class QuoteHeaderOverviewComponent {
   }
 
   /**
-   * Verifies whether the quote information card tile is editable.
+   * Verifies whether the quote is editable and is viewed from a user acting as buyer.
    *
    * @param {Quote} quote - quote
    * @returns {boolean} - if the quote is editable and its state is 'QuoteState.BUYER_DRAFT' or 'QuoteState.BUYER_OFFER', otherwise returns 'false'.
    */
-  isQuoteInformationEditable(quote: Quote): boolean {
+  isQuoteEditableForBuyer(quote: Quote): boolean {
     return (
       quote.isEditable &&
       (quote.state === QuoteState.BUYER_DRAFT ||
@@ -146,13 +146,13 @@ export class QuoteHeaderOverviewComponent {
   }
 
   /**
-   * Retrieves the card content that represents the estimated and date information.
+   * Retrieves the card content that represents the estimated total and date information.
    *
    * @param {Quote} quote - Quote
    * @param {any} createdDate - Created date
    * @returns {Observable<Card>} - Card content
    */
-  getEstimatedAndDate(
+  getEstimatedTotalAndDate(
     quote: Quote,
     createdDate?: string | null
   ): Observable<Card> {
@@ -190,7 +190,7 @@ export class QuoteHeaderOverviewComponent {
    * @param {string} expirationTime - expiration time
    * @returns {Observable<Card>} - Card content
    */
-  getUpdate(
+  getCardMetadata(
     lastUpdated?: string | null,
     expirationTime?: string | null
   ): Observable<Card> {
@@ -225,7 +225,7 @@ export class QuoteHeaderOverviewComponent {
    */
   getCharactersLimitForCardTile(): number {
     return (
-      this.config.quote?.truncateCardTileContentAfterNumChars ??
+      this.quoteUIConfig.quote?.truncateCardTileContentAfterNumChars ??
       QuoteHeaderOverviewComponent.DEFAULT_CARD_TILE_MAX_CHARS
     );
   }
diff --git a/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.ts b/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.ts
index f50ed6865af..7ec682a9066 100644
--- a/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.ts
+++ b/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.ts
@@ -35,7 +35,7 @@ export class QuoteHeaderSellerEditComponent implements OnInit, OnDestroy {
   protected quoteHeaderSellerEditComponentService = inject(
     QuoteHeaderSellerEditComponentService
   );
-  protected config = inject(QuoteUIConfig);
+  protected quoteUIConfig = inject(QuoteUIConfig);
 
   quoteDetailsForSeller$: Observable<Quote> = this.quoteFacade
     .getQuoteDetails()
@@ -96,7 +96,9 @@ export class QuoteHeaderSellerEditComponent implements OnInit, OnDestroy {
     this.subscription.add(
       this.dateUpdates
         .pipe(
-          debounceTime(this.config.quote?.updateDebounceTime?.expiryDate ?? 500)
+          debounceTime(
+            this.quoteUIConfig.quote?.updateDebounceTime?.expiryDate ?? 500
+          )
         )
         .subscribe((payload) => {
           const quoteMetaData: QuoteMetadata = {
diff --git a/feature-libs/quote/components/items/quote-items.component.spec.ts b/feature-libs/quote/components/items/quote-items.component.spec.ts
index da55fedbb65..385b7e2ec19 100644
--- a/feature-libs/quote/components/items/quote-items.component.spec.ts
+++ b/feature-libs/quote/components/items/quote-items.component.spec.ts
@@ -68,7 +68,7 @@ class MockActiveCartFacade implements Partial<ActiveCartFacade> {
 
 describe('QuoteItemsComponent', () => {
   let mockedEventService: EventService;
-  let mockQuoteItemsService: QuoteItemsComponentService;
+  let mockQuoteItemsComponentService: QuoteItemsComponentService;
   let fixture: ComponentFixture<QuoteItemsComponent>;
   let htmlElem: HTMLElement;
   let component: QuoteItemsComponent;
@@ -94,7 +94,7 @@ describe('QuoteItemsComponent', () => {
           },
           {
             provide: QuoteItemsComponentService,
-            useValue: mockQuoteItemsService,
+            useValue: mockQuoteItemsComponentService,
           },
         ],
       }).compileComponents();
@@ -115,12 +115,14 @@ describe('QuoteItemsComponent', () => {
       'get',
       'dispatch',
     ]);
-    mockQuoteItemsService = jasmine.createSpyObj('QuoteItemsComponentService', [
-      'setQuoteEntriesExpanded',
-      'getQuoteEntriesExpanded',
-    ]);
+    mockQuoteItemsComponentService = jasmine.createSpyObj(
+      'QuoteItemsComponentService',
+      ['setQuoteEntriesExpanded', 'getQuoteEntriesExpanded']
+    );
     asSpy(mockedEventService.get).and.returnValue(EMPTY);
-    asSpy(mockQuoteItemsService.getQuoteEntriesExpanded).and.returnValue(true);
+    asSpy(
+      mockQuoteItemsComponentService.getQuoteEntriesExpanded
+    ).and.returnValue(true);
   }
 
   function asSpy(f: any) {
@@ -244,14 +246,14 @@ describe('QuoteItemsComponent', () => {
     it('should call quoteItemsComponentService correctly if argument is true', () => {
       component.onToggleShowOrHideCart(true);
       expect(
-        mockQuoteItemsService.setQuoteEntriesExpanded
+        mockQuoteItemsComponentService.setQuoteEntriesExpanded
       ).toHaveBeenCalledWith(false);
     });
 
     it('should call quoteItemsComponentService correctly if argument is false', () => {
       component.onToggleShowOrHideCart(false);
       expect(
-        mockQuoteItemsService.setQuoteEntriesExpanded
+        mockQuoteItemsComponentService.setQuoteEntriesExpanded
       ).toHaveBeenCalledWith(true);
     });
   });
@@ -279,9 +281,9 @@ describe('QuoteItemsComponent', () => {
   it('should toggle quote entries on enter', () => {
     CommonQuoteTestUtilsService.clickToggle(htmlElem, true);
     fixture.detectChanges();
-    expect(mockQuoteItemsService.setQuoteEntriesExpanded).toHaveBeenCalledWith(
-      false
-    );
+    expect(
+      mockQuoteItemsComponentService.setQuoteEntriesExpanded
+    ).toHaveBeenCalledWith(false);
   });
 
   it('should toggle quote entries on click', () => {
@@ -289,9 +291,9 @@ describe('QuoteItemsComponent', () => {
     fixture.detectChanges();
     CommonQuoteTestUtilsService.clickToggle(htmlElem, false);
     fixture.detectChanges();
-    expect(mockQuoteItemsService.setQuoteEntriesExpanded).toHaveBeenCalledWith(
-      true
-    );
+    expect(
+      mockQuoteItemsComponentService.setQuoteEntriesExpanded
+    ).toHaveBeenCalledWith(true);
   });
 
   it('should provide quote details observable', (done) => {
diff --git a/feature-libs/quote/components/items/quote-items.component.ts b/feature-libs/quote/components/items/quote-items.component.ts
index 8d84b89446a..6654549854d 100644
--- a/feature-libs/quote/components/items/quote-items.component.ts
+++ b/feature-libs/quote/components/items/quote-items.component.ts
@@ -18,16 +18,16 @@ import { QuoteItemsComponentService } from './quote-items.component.service';
 export class QuoteItemsComponent {
   protected quoteFacade = inject(QuoteFacade);
   protected activeCartFacade = inject(ActiveCartFacade);
-  protected quoteItemsService = inject(QuoteItemsComponentService);
+  protected quoteItemsComponentService = inject(QuoteItemsComponentService);
 
   quoteDetails$: Observable<Quote> = this.quoteFacade.getQuoteDetails();
   cartDetails$: Observable<Cart> = this.activeCartFacade.getActive();
-  showCart$ = this.quoteItemsService.getQuoteEntriesExpanded();
+  showCart$ = this.quoteItemsComponentService.getQuoteEntriesExpanded();
   iconTypes = ICON_TYPE;
   readonly cartOutlets = CartOutlets;
   protected subscription: Subscription;
 
   onToggleShowOrHideCart(showCart: boolean) {
-    this.quoteItemsService.setQuoteEntriesExpanded(!showCart);
+    this.quoteItemsComponentService.setQuoteEntriesExpanded(!showCart);
   }
 }
diff --git a/feature-libs/quote/components/list/quote-list.component.ts b/feature-libs/quote/components/list/quote-list.component.ts
index 2e2ae370309..a984d46b26f 100644
--- a/feature-libs/quote/components/list/quote-list.component.ts
+++ b/feature-libs/quote/components/list/quote-list.component.ts
@@ -15,11 +15,11 @@ import { QuoteListComponentService } from './quote-list-component.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class QuoteListComponent {
-  protected quoteListService = inject(QuoteListComponentService);
+  protected quoteListComponentService = inject(QuoteListComponentService);
 
-  sorts = this.quoteListService.sorts;
-  sortLabels$ = this.quoteListService.sortLabels$;
-  quotesState$ = this.quoteListService.quotesState$;
+  sorts = this.quoteListComponentService.sorts;
+  sortLabels$ = this.quoteListComponentService.sortLabels$;
+  quotesState$ = this.quoteListComponentService.quotesState$;
   dateFormat: string = 'MMMM d, YYYY h:mm aa';
   iconTypes = ICON_TYPE;
 
@@ -29,11 +29,11 @@ export class QuoteListComponent {
   }
 
   changeSortCode(sortCode: string): void {
-    this.quoteListService.setSort(sortCode);
+    this.quoteListComponentService.setSort(sortCode);
   }
 
   changePage(page: number): void {
-    this.quoteListService.setCurrentPage(page);
+    this.quoteListComponentService.setCurrentPage(page);
   }
 
   /**
diff --git a/feature-libs/quote/components/public_api.ts b/feature-libs/quote/components/public_api.ts
index a554768015b..b43bd2fae06 100644
--- a/feature-libs/quote/components/public_api.ts
+++ b/feature-libs/quote/components/public_api.ts
@@ -10,4 +10,3 @@ export * from './config';
 export * from './header';
 export * from './quote-components.module';
 export * from './list';
-export * from './request-button';
diff --git a/feature-libs/quote/components/quote-components.module.ts b/feature-libs/quote/components/quote-components.module.ts
index f5f05ee2540..9f6aa2796d7 100644
--- a/feature-libs/quote/components/quote-components.module.ts
+++ b/feature-libs/quote/components/quote-components.module.ts
@@ -19,7 +19,6 @@ import { QuoteHeaderOverviewModule } from './header/overview/quote-header-overvi
 import { QuoteHeaderSellerEditModule } from './header/seller-edit/quote-header-seller-edit.module';
 import { QuoteItemsModule } from './items/quote-items.module';
 import { QuoteListModule } from './list/quote-list.module';
-import { QuoteRequestButtonModule } from './request-button/quote-request-button.module';
 
 @NgModule({
   imports: [
@@ -35,7 +34,6 @@ import { QuoteRequestButtonModule } from './request-button/quote-request-button.
     QuoteHeaderSellerEditModule,
     QuoteItemsModule,
     QuoteListModule,
-    QuoteRequestButtonModule,
   ],
   providers: [provideDefaultConfig(defaultQuoteUIConfig)],
 })
diff --git a/feature-libs/quote/components/request-button/ng-package.json b/feature-libs/quote/components/request-button/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/quote/components/request-button/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/quote/components/request-button/index.ts b/feature-libs/quote/components/request-button/public_api.ts
similarity index 100%
rename from feature-libs/quote/components/request-button/index.ts
rename to feature-libs/quote/components/request-button/public_api.ts
index 19d5ca4d0a2..5d905dc70e8 100644
--- a/feature-libs/quote/components/request-button/index.ts
+++ b/feature-libs/quote/components/request-button/public_api.ts
@@ -4,5 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './quote-request-button.component';
 export * from './quote-request-button.module';
+export * from './quote-request-button.component';
diff --git a/feature-libs/quote/components/testing/common-quote-test-utils.service.ts b/feature-libs/quote/components/testing/common-quote-test-utils.service.ts
index bbe33c39c4d..5bea991a8e8 100644
--- a/feature-libs/quote/components/testing/common-quote-test-utils.service.ts
+++ b/feature-libs/quote/components/testing/common-quote-test-utils.service.ts
@@ -68,7 +68,7 @@ export class CommonQuoteTestUtilsService {
     } else {
       text = htmlElement.querySelector(querySelector)?.textContent;
     }
-    expect(text ? text.trim() : '').toBe(expectedText);
+    expect(text).toContain(expectedText);
   }
 
   /**
@@ -89,26 +89,6 @@ export class CommonQuoteTestUtilsService {
     );
   }
 
-  /**
-   * Helper function for verifying how many times the element comes in the HTML tree.
-   *
-   * @param {any} expect - Expectation for a spec.
-   * @param {Element} htmlElement - HTML element.
-   * @param {string} querySelector - Query selector.
-   * @param {number} expectedNumber - expected number of elements.
-   */
-  static expectNumberOfElements(
-    expect: any,
-    htmlElement: Element,
-    querySelector: string,
-    expectedNumber: number
-  ) {
-    expect(htmlElement.querySelectorAll(querySelector).length).toBe(
-      expectedNumber,
-      `expected elements identified by selector '${querySelector}' to be present times, but it is NOT! innerHtml: ${htmlElement.innerHTML}`
-    );
-  }
-
   /**
    * Helper function for verifying whether the element contains attribute.
    *
@@ -201,7 +181,7 @@ export class CommonQuoteTestUtilsService {
    * @param {boolean} useKeyboard - optional - if 'true' the click is executed using the enter key,
    *  otherwise a mouse click is used. 'false' is default.
    */
-  static clickToggle(htmlElement: Element, useKeyboard: boolean = false) {
+  static clickToggle(htmlElement: Element, useKeyboard: boolean) {
     const caret = CommonQuoteTestUtilsService.getHTMLElement(
       htmlElement,
       '.cx-toggle'
diff --git a/feature-libs/quote/core/config/default-quote.core.config.ts b/feature-libs/quote/core/config/default-quote.core.config.ts
new file mode 100644
index 00000000000..afefc0506a7
--- /dev/null
+++ b/feature-libs/quote/core/config/default-quote.core.config.ts
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { QuoteActionType } from '@spartacus/quote/root';
+import { QuoteCoreConfig } from './quote-core.config';
+
+export const defaultQuoteCoreConfig: QuoteCoreConfig = {
+  quote: {
+    actions: {
+      primaryActions: [
+        QuoteActionType.APPROVE,
+        QuoteActionType.CHECKOUT,
+        QuoteActionType.SUBMIT,
+        QuoteActionType.REQUOTE,
+      ],
+      actionsOrderByState: {
+        BUYER_DRAFT: [
+          QuoteActionType.SUBMIT,
+          QuoteActionType.EDIT,
+          QuoteActionType.CANCEL,
+        ],
+        BUYER_OFFER: [
+          QuoteActionType.CHECKOUT,
+          QuoteActionType.EDIT,
+          QuoteActionType.CANCEL,
+        ],
+        CANCELLED: [QuoteActionType.REQUOTE],
+        EXPIRED: [QuoteActionType.REQUOTE, QuoteActionType.CANCEL],
+        SELLER_REQUEST: [QuoteActionType.SUBMIT, QuoteActionType.EDIT],
+        SELLER_DRAFT: [QuoteActionType.SUBMIT, QuoteActionType.EDIT],
+      },
+    },
+  },
+};
diff --git a/feature-libs/quote/core/config/quote-core.config.ts b/feature-libs/quote/core/config/quote-core.config.ts
index dda0383cb0f..36b705f9628 100644
--- a/feature-libs/quote/core/config/quote-core.config.ts
+++ b/feature-libs/quote/core/config/quote-core.config.ts
@@ -24,7 +24,6 @@ export abstract class QuoteCoreConfig {
    * Commerce quotes config
    */
   quote?: {
-    //tresholds?: QuoteTresholdsConfig;
     actions?: QuoteActionsConfig;
   };
 }
diff --git a/feature-libs/quote/core/connectors/quote.adapter.ts b/feature-libs/quote/core/connectors/quote.adapter.ts
index e038544d8a4..92cc22205fb 100644
--- a/feature-libs/quote/core/connectors/quote.adapter.ts
+++ b/feature-libs/quote/core/connectors/quote.adapter.ts
@@ -101,7 +101,7 @@ export abstract class QuoteAdapter {
    * @param quoteCode
    * @param entryNumber
    */
-  abstract addCartEntryComment(
+  abstract addQuoteEntryComment(
     userId: string,
     quoteCode: string,
     entryNumber: string,
diff --git a/feature-libs/quote/core/connectors/quote.connector.spec.ts b/feature-libs/quote/core/connectors/quote.connector.spec.ts
index 4c1b9381687..1bc1ef15d4e 100644
--- a/feature-libs/quote/core/connectors/quote.connector.spec.ts
+++ b/feature-libs/quote/core/connectors/quote.connector.spec.ts
@@ -58,8 +58,8 @@ class MockCommerceQuotesAdapter implements Partial<QuoteAdapter> {
     (userId: string, quoteCode: string, discount: QuoteDiscount) =>
       of(`addDiscount-${userId}-${quoteCode}-${discount}`)
   );
-  addCartEntryComment = createSpy(
-    'CommerceQuotesAdapter.addCartEntryComment'
+  addQuoteEntryComment = createSpy(
+    'CommerceQuotesAdapter.addQuoteEntryComment'
   ).and.callFake(
     (
       userId: string,
@@ -67,7 +67,9 @@ class MockCommerceQuotesAdapter implements Partial<QuoteAdapter> {
       entryNumber: string,
       comment: Comment
     ) =>
-      of(`addCartEntryComment-${userId}-${quoteCode}-${entryNumber}-${comment}`)
+      of(
+        `addQuoteEntryComment-${userId}-${quoteCode}-${entryNumber}-${comment}`
+      )
   );
 }
 
@@ -192,16 +194,16 @@ describe('QuoteConnector', () => {
     );
   });
 
-  it('addCartEntryComment should call adapter', () => {
+  it('addQuoteEntryComment should call adapter', () => {
     let result;
     service
-      .addCartEntryComment(userId, quoteCode, quoteEntryNumber, comment)
+      .addQuoteEntryComment(userId, quoteCode, quoteEntryNumber, comment)
       .pipe(take(1))
       .subscribe((res) => (result = res));
     expect(result).toBe(
-      `addCartEntryComment-${userId}-${quoteCode}-${quoteEntryNumber}-${comment.toString()}`
+      `addQuoteEntryComment-${userId}-${quoteCode}-${quoteEntryNumber}-${comment.toString()}`
     );
-    expect(adapter.addCartEntryComment).toHaveBeenCalledWith(
+    expect(adapter.addQuoteEntryComment).toHaveBeenCalledWith(
       userId,
       quoteCode,
       'entryNumber1',
diff --git a/feature-libs/quote/core/connectors/quote.connector.ts b/feature-libs/quote/core/connectors/quote.connector.ts
index 2cf68a95334..f1ef9c464fe 100644
--- a/feature-libs/quote/core/connectors/quote.connector.ts
+++ b/feature-libs/quote/core/connectors/quote.connector.ts
@@ -20,24 +20,24 @@ import { QuoteAdapter } from './quote.adapter';
 
 @Injectable()
 export class QuoteConnector {
-  protected adapter = inject(QuoteAdapter);
+  protected quoteAdapter = inject(QuoteAdapter);
 
   public getQuotes(
     userId: string,
     pagination: PaginationModel
   ): Observable<QuoteList> {
-    return this.adapter.getQuotes(userId, pagination);
+    return this.quoteAdapter.getQuotes(userId, pagination);
   }
 
   public createQuote(
     userId: string,
     quoteStarter: QuoteStarter
   ): Observable<Quote> {
-    return this.adapter.createQuote(userId, quoteStarter);
+    return this.quoteAdapter.createQuote(userId, quoteStarter);
   }
 
   public getQuote(userId: string, quoteCode: string): Observable<Quote> {
-    return this.adapter.getQuote(userId, quoteCode);
+    return this.quoteAdapter.getQuote(userId, quoteCode);
   }
 
   public editQuote(
@@ -45,7 +45,7 @@ export class QuoteConnector {
     quoteCode: string,
     quoteMetadata: QuoteMetadata
   ): Observable<unknown> {
-    return this.adapter.editQuote(userId, quoteCode, quoteMetadata);
+    return this.quoteAdapter.editQuote(userId, quoteCode, quoteMetadata);
   }
 
   public performQuoteAction(
@@ -53,7 +53,7 @@ export class QuoteConnector {
     quoteCode: string,
     quoteAction: QuoteActionType
   ): Observable<unknown> {
-    return this.adapter.performQuoteAction(userId, quoteCode, quoteAction);
+    return this.quoteAdapter.performQuoteAction(userId, quoteCode, quoteAction);
   }
 
   public addComment(
@@ -61,7 +61,7 @@ export class QuoteConnector {
     quoteCode: string,
     quoteComment: Comment
   ): Observable<unknown> {
-    return this.adapter.addComment(userId, quoteCode, quoteComment);
+    return this.quoteAdapter.addComment(userId, quoteCode, quoteComment);
   }
 
   public addDiscount(
@@ -69,16 +69,16 @@ export class QuoteConnector {
     quoteCode: string,
     discount: QuoteDiscount
   ): Observable<unknown> {
-    return this.adapter.addDiscount(userId, quoteCode, discount);
+    return this.quoteAdapter.addDiscount(userId, quoteCode, discount);
   }
 
-  public addCartEntryComment(
+  public addQuoteEntryComment(
     userId: string,
     quoteCode: string,
     entryNumber: string,
     comment: Comment
   ): Observable<unknown> {
-    return this.adapter.addCartEntryComment(
+    return this.quoteAdapter.addQuoteEntryComment(
       userId,
       quoteCode,
       entryNumber,
diff --git a/feature-libs/quote/core/facade/quote.service.spec.ts b/feature-libs/quote/core/facade/quote.service.spec.ts
index 15a7ce5d05f..d7b7d44b2c4 100644
--- a/feature-libs/quote/core/facade/quote.service.spec.ts
+++ b/feature-libs/quote/core/facade/quote.service.spec.ts
@@ -122,7 +122,7 @@ class MockQuoteConnector implements Partial<QuoteConnector> {
   createQuote = createSpy().and.returnValue(of(quote));
   editQuote = createSpy().and.returnValue(of(EMPTY));
   addComment = createSpy().and.returnValue(of(EMPTY));
-  addCartEntryComment = createSpy().and.returnValue(of(EMPTY));
+  addQuoteEntryComment = createSpy().and.returnValue(of(EMPTY));
   performQuoteAction = createSpy().and.returnValue(of(EMPTY));
   addDiscount = createSpy().and.returnValue(of(EMPTY));
 }
@@ -555,12 +555,12 @@ describe('QuoteService', () => {
       });
   });
 
-  it('should call addCartEntryComment command when an entry number is provided', () => {
+  it('should call addQuoteEntryComment command when an entry number is provided', () => {
     service
       .addQuoteComment(quote.code, quoteComment, '0')
       .pipe(take(1))
       .subscribe(() => {
-        expect(connector.addCartEntryComment).toHaveBeenCalledWith(
+        expect(connector.addQuoteEntryComment).toHaveBeenCalledWith(
           userId,
           quote.code,
           '0',
diff --git a/feature-libs/quote/core/facade/quote.service.ts b/feature-libs/quote/core/facade/quote.service.ts
index 62f2b2f117b..cf30e38ebbe 100644
--- a/feature-libs/quote/core/facade/quote.service.ts
+++ b/feature-libs/quote/core/facade/quote.service.ts
@@ -65,11 +65,11 @@ export class QuoteService implements QuoteFacade {
   protected quoteConnector = inject(QuoteConnector);
   protected eventService = inject(EventService);
   protected queryService = inject(QueryService);
-  protected config = inject(ViewConfig);
+  protected viewConfig = inject(ViewConfig);
   protected commandService = inject(CommandService);
   protected activeCartFacade = inject(ActiveCartFacade);
   protected routingService = inject(RoutingService);
-  protected multiCartService = inject(MultiCartFacade);
+  protected multiCartFacade = inject(MultiCartFacade);
   protected quoteCartService = inject(QuoteCartService);
   protected cartUtilsService = inject(CartUtilsService);
   protected globalMessageService = inject(GlobalMessageService);
@@ -106,7 +106,7 @@ export class QuoteService implements QuoteFacade {
           )
         ),
         tap(([_, userId, quote]) => {
-          this.multiCartService.loadCart({
+          this.multiCartFacade.loadCart({
             userId,
             cartId: quote.cartId as string,
             extraData: {
@@ -164,7 +164,7 @@ export class QuoteService implements QuoteFacade {
         take(1),
         switchMap((userId) => {
           if (payload.entryNumber) {
-            return this.quoteConnector.addCartEntryComment(
+            return this.quoteConnector.addQuoteEntryComment(
               userId,
               payload.quoteCode,
               payload.entryNumber,
@@ -307,7 +307,7 @@ export class QuoteService implements QuoteFacade {
     quoteId: string,
     actionType: QuoteActionType
   ) {
-    this.multiCartService.loadCart({
+    this.multiCartFacade.loadCart({
       userId: userId,
       cartId: cartId,
       extraData: {
@@ -403,7 +403,7 @@ export class QuoteService implements QuoteFacade {
             return this.quoteConnector.getQuotes(userId, {
               currentPage,
               sort,
-              pageSize: this.config.view?.defaultPageSize,
+              pageSize: this.viewConfig.view?.defaultPageSize,
             });
           }),
           tap(() => {
diff --git a/feature-libs/quote/core/quote-core.module.ts b/feature-libs/quote/core/quote-core.module.ts
index f1dfc1d45a2..ad1dc7f8978 100644
--- a/feature-libs/quote/core/quote-core.module.ts
+++ b/feature-libs/quote/core/quote-core.module.ts
@@ -5,12 +5,13 @@
  */
 
 import { NgModule } from '@angular/core';
-import { HttpErrorHandler } from '@spartacus/core';
+import { HttpErrorHandler, provideDefaultConfig } from '@spartacus/core';
 import { QuoteConnector } from './connectors/quote.connector';
+import { QuoteCartEventListener } from './event/quote-cart-event.listener';
 import { facadeProviders } from './facade/facade-providers';
 import { QuoteBadRequestHandler } from './http-interceptors/quote-bad-request.handler';
-import { QuoteCartEventListener } from './event/quote-cart-event.listener';
 import { QuoteNotFoundHandler } from './http-interceptors/quote-not-found.handler';
+import { defaultQuoteCoreConfig } from './config/default-quote.core.config';
 
 @NgModule({
   providers: [
@@ -26,6 +27,7 @@ import { QuoteNotFoundHandler } from './http-interceptors/quote-not-found.handle
       useExisting: QuoteNotFoundHandler,
       multi: true,
     },
+    provideDefaultConfig(defaultQuoteCoreConfig),
   ],
 })
 export class QuoteCoreModule {
diff --git a/feature-libs/quote/occ/adapters/occ-quote.adapter.spec.ts b/feature-libs/quote/occ/adapters/occ-quote.adapter.spec.ts
index 683dabc614f..8879d4e3f13 100644
--- a/feature-libs/quote/occ/adapters/occ-quote.adapter.spec.ts
+++ b/feature-libs/quote/occ/adapters/occ-quote.adapter.spec.ts
@@ -79,7 +79,7 @@ const MockOccModuleConfig: OccConfig = {
         performQuoteAction: '/users/${userId}/quotes/${quoteCode}/action',
         addComment: '/users/${userId}/quotes/${quoteCode}/comments',
         addDiscount: '/users/${userId}/quotes/${quoteCode}/discounts',
-        addCartEntryComment:
+        addQuoteEntryComment:
           '/users/${userId}/quotes/${quoteCode}/entries/${entryNumber}/comments',
       } as OccEndpoints,
     },
@@ -280,9 +280,9 @@ describe(`OccQuoteAdapter`, () => {
     );
   });
 
-  it('addCartEntryComment should add comment to product entry in quote cart', (done) => {
+  it('addQuoteEntryComment should add comment to product entry in quote cart', (done) => {
     service
-      .addCartEntryComment(
+      .addQuoteEntryComment(
         userId,
         mockQuote.code,
         productEntryNumber,
diff --git a/feature-libs/quote/occ/adapters/occ-quote.adapter.ts b/feature-libs/quote/occ/adapters/occ-quote.adapter.ts
index da146d8f15e..8ee86d93992 100644
--- a/feature-libs/quote/occ/adapters/occ-quote.adapter.ts
+++ b/feature-libs/quote/occ/adapters/occ-quote.adapter.ts
@@ -37,9 +37,9 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccQuoteAdapter implements QuoteAdapter {
-  protected http = inject(HttpClient);
-  protected occEndpoints = inject(OccEndpointsService);
-  protected converter = inject(ConverterService);
+  protected httpClient = inject(HttpClient);
+  protected occEndpointsService = inject(OccEndpointsService);
+  protected converterService = inject(ConverterService);
 
   getQuotes(
     userId: string,
@@ -56,11 +56,11 @@ export class OccQuoteAdapter implements QuoteAdapter {
       params['sort'] = pagination.sort.toString();
     }
 
-    return this.http
+    return this.httpClient
       .get<QuoteList>(this.getQuotesEndpoint(userId, params))
       .pipe(
         catchError((error) => throwError(normalizeHttpError(error))),
-        this.converter.pipeable(QUOTE_LIST_NORMALIZER)
+        this.converterService.pipeable(QUOTE_LIST_NORMALIZER)
       );
   }
 
@@ -68,43 +68,43 @@ export class OccQuoteAdapter implements QuoteAdapter {
     userId: string,
     params?: PaginationModel
   ): string {
-    return this.occEndpoints.buildUrl('getQuotes', {
+    return this.occEndpointsService.buildUrl('getQuotes', {
       urlParams: { userId },
       queryParams: params,
     });
   }
 
   createQuote(userId: string, quoteStarter: QuoteStarter): Observable<Quote> {
-    quoteStarter = this.converter.convert(
+    quoteStarter = this.converterService.convert(
       quoteStarter,
       QUOTE_STARTER_SERIALIZER
     );
 
-    return this.http
+    return this.httpClient
       .post<OccQuote>(this.getCreateQuoteEndpoint(userId), quoteStarter)
       .pipe(
         catchError((error) => throwError(normalizeHttpError(error))),
-        this.converter.pipeable(QUOTE_NORMALIZER)
+        this.converterService.pipeable(QUOTE_NORMALIZER)
       );
   }
 
   protected getCreateQuoteEndpoint(userId: string): string {
-    return this.occEndpoints.buildUrl('createQuote', {
+    return this.occEndpointsService.buildUrl('createQuote', {
       urlParams: { userId },
     });
   }
 
   getQuote(userId: string, quoteCode: string): Observable<Quote> {
-    return this.http
+    return this.httpClient
       .get<OccQuote>(this.getQuoteEndpoint(userId, quoteCode))
       .pipe(
         catchError((error) => throwError(normalizeHttpError(error))),
-        this.converter.pipeable(QUOTE_NORMALIZER)
+        this.converterService.pipeable(QUOTE_NORMALIZER)
       );
   }
 
   protected getQuoteEndpoint(userId: string, quoteCode: string): string {
-    return this.occEndpoints.buildUrl('getQuote', {
+    return this.occEndpointsService.buildUrl('getQuote', {
       urlParams: { userId, quoteCode },
     });
   }
@@ -114,18 +114,18 @@ export class OccQuoteAdapter implements QuoteAdapter {
     quoteCode: string,
     quoteMetadata: QuoteMetadata
   ): Observable<unknown> {
-    quoteMetadata = this.converter.convert(
+    quoteMetadata = this.converterService.convert(
       quoteMetadata,
       QUOTE_METADATA_SERIALIZER
     );
 
-    return this.http
+    return this.httpClient
       .patch<Quote>(this.getEditQuoteEndpoint(userId, quoteCode), quoteMetadata)
       .pipe(catchError((error) => throwError(normalizeHttpError(error))));
   }
 
   protected getEditQuoteEndpoint(userId: string, quoteCode: string): string {
-    return this.occEndpoints.buildUrl('editQuote', {
+    return this.occEndpointsService.buildUrl('editQuote', {
       urlParams: { userId, quoteCode },
     });
   }
@@ -135,9 +135,12 @@ export class OccQuoteAdapter implements QuoteAdapter {
     quoteCode: string,
     quoteAction: QuoteActionType
   ): Observable<unknown> {
-    quoteAction = this.converter.convert(quoteAction, QUOTE_ACTION_SERIALIZER);
+    quoteAction = this.converterService.convert(
+      quoteAction,
+      QUOTE_ACTION_SERIALIZER
+    );
 
-    return this.http
+    return this.httpClient
       .post<unknown>(this.getPerformQuoteActionEndpoint(userId, quoteCode), {
         action: quoteAction,
       })
@@ -148,7 +151,7 @@ export class OccQuoteAdapter implements QuoteAdapter {
     userId: string,
     quoteCode: string
   ): string {
-    return this.occEndpoints.buildUrl('performQuoteAction', {
+    return this.occEndpointsService.buildUrl('performQuoteAction', {
       urlParams: { userId, quoteCode },
     });
   }
@@ -158,12 +161,12 @@ export class OccQuoteAdapter implements QuoteAdapter {
     quoteCode: string,
     quoteComment: Comment
   ): Observable<unknown> {
-    quoteComment = this.converter.convert(
+    quoteComment = this.converterService.convert(
       quoteComment,
       QUOTE_COMMENT_SERIALIZER
     );
 
-    return this.http
+    return this.httpClient
       .post<unknown>(
         this.getAddCommentEndpoint(userId, quoteCode),
         quoteComment
@@ -172,7 +175,7 @@ export class OccQuoteAdapter implements QuoteAdapter {
   }
 
   protected getAddCommentEndpoint(userId: string, quoteCode: string): string {
-    return this.occEndpoints.buildUrl('addComment', {
+    return this.occEndpointsService.buildUrl('addComment', {
       urlParams: { userId, quoteCode },
     });
   }
@@ -182,12 +185,12 @@ export class OccQuoteAdapter implements QuoteAdapter {
     quoteCode: string,
     quoteDiscount: QuoteDiscount
   ): Observable<unknown> {
-    quoteDiscount = this.converter.convert(
+    quoteDiscount = this.converterService.convert(
       quoteDiscount,
       QUOTE_DISCOUNT_SERIALIZER
     );
 
-    return this.http
+    return this.httpClient
       .post<unknown>(
         this.getAddDiscountEndpoint(userId, quoteCode),
         quoteDiscount
@@ -196,33 +199,33 @@ export class OccQuoteAdapter implements QuoteAdapter {
   }
 
   protected getAddDiscountEndpoint(userId: string, quoteCode: string): string {
-    return this.occEndpoints.buildUrl('addDiscount', {
+    return this.occEndpointsService.buildUrl('addDiscount', {
       urlParams: { userId, quoteCode },
     });
   }
 
-  addCartEntryComment(
+  addQuoteEntryComment(
     userId: string,
     quoteCode: string,
     entryNumber: string,
     comment: Comment
   ): Observable<unknown> {
-    comment = this.converter.convert(comment, QUOTE_COMMENT_SERIALIZER);
+    comment = this.converterService.convert(comment, QUOTE_COMMENT_SERIALIZER);
 
-    return this.http
+    return this.httpClient
       .post<unknown>(
-        this.getAddCartEntryCommentEndpoint(userId, quoteCode, entryNumber),
+        this.getAddQuoteEntryCommentEndpoint(userId, quoteCode, entryNumber),
         comment
       )
       .pipe(catchError((error) => throwError(normalizeHttpError(error))));
   }
 
-  protected getAddCartEntryCommentEndpoint(
+  protected getAddQuoteEntryCommentEndpoint(
     userId: string,
     quoteCode: string,
     entryNumber: string
   ): string {
-    return this.occEndpoints.buildUrl('addCartEntryComment', {
+    return this.occEndpointsService.buildUrl('addQuoteEntryComment', {
       urlParams: { userId, quoteCode, entryNumber },
     });
   }
diff --git a/feature-libs/quote/occ/config/default-occ-quote-config.ts b/feature-libs/quote/occ/config/default-occ-quote-config.ts
index dbfaf1e32b3..63ae37ed84b 100644
--- a/feature-libs/quote/occ/config/default-occ-quote-config.ts
+++ b/feature-libs/quote/occ/config/default-occ-quote-config.ts
@@ -18,7 +18,7 @@ export const defaultOccQuoteConfig: OccConfig = {
         performQuoteAction: 'users/${userId}/quotes/${quoteCode}/action',
         addComment: 'users/${userId}/quotes/${quoteCode}/comments',
         addDiscount: 'users/${userId}/quotes/${quoteCode}/discounts',
-        addCartEntryComment:
+        addQuoteEntryComment:
           'users/${userId}/quotes/${quoteCode}/entries/${entryNumber}/comments',
       },
     },
diff --git a/feature-libs/quote/occ/converters/occ-quote-action-normalizer.ts b/feature-libs/quote/occ/converters/occ-quote-action-normalizer.ts
index 351f629b5fc..2f7cd8fe07f 100644
--- a/feature-libs/quote/occ/converters/occ-quote-action-normalizer.ts
+++ b/feature-libs/quote/occ/converters/occ-quote-action-normalizer.ts
@@ -20,7 +20,7 @@ import { take } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
 export class OccQuoteActionNormalizer implements Converter<OccQuote, Quote> {
-  protected quoteConfig = inject(QuoteCoreConfig);
+  protected quoteCoreConfig = inject(QuoteCoreConfig);
   protected quoteCartService = inject(QuoteCartService);
 
   convert(source: OccQuote, target?: Quote): Quote {
@@ -43,16 +43,12 @@ export class OccQuoteActionNormalizer implements Converter<OccQuote, Quote> {
       !!source.allowedActions?.includes(QuoteActionType.EDIT) &&
       !switchToEditModeRequired;
 
-    //TODO CONFIG_INTEGRATION have this code in a dedicated entry normalizer
-    //TODO CONFIG_INTEGRATION introduce constant for quote in model (no enum)
-    target.entries?.forEach((entry) => (entry.quoteCode = source.code));
-
     return target;
   }
 
   protected getActionCategory(type: QuoteActionType): QuoteAction {
     const primaryActions: QuoteActionType[] =
-      this.quoteConfig.quote?.actions?.primaryActions || [];
+      this.quoteCoreConfig.quote?.actions?.primaryActions || [];
 
     return { type, isPrimary: primaryActions.includes(type) };
   }
@@ -62,7 +58,8 @@ export class OccQuoteActionNormalizer implements Converter<OccQuote, Quote> {
     list: QuoteActionType[],
     quoteId: string
   ) {
-    const order = this.quoteConfig.quote?.actions?.actionsOrderByState?.[state];
+    const order =
+      this.quoteCoreConfig.quote?.actions?.actionsOrderByState?.[state];
     if (order) {
       //deep copy order list
       const clonedActionList = structuredClone(order);
diff --git a/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.spec.ts b/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.spec.ts
index 4a016e20222..2627e5d803e 100644
--- a/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.spec.ts
+++ b/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.spec.ts
@@ -3,6 +3,19 @@ import { ConverterService, PRODUCT_NORMALIZER } from '@spartacus/core';
 import { QuoteState } from '@spartacus/quote/root';
 import { OccQuoteEntryNormalizer } from './occ-quote-entry-normalizer';
 
+const product = { code: 'testproductcode 1' };
+const price = { value: 123 };
+const quote = {
+  allowedActions: [],
+  code: 'testquote',
+  state: QuoteState.BUYER_DRAFT,
+  comments: [],
+  description: 'test description',
+  entries: [{ product }],
+  name: 'test name',
+  totalPrice: price,
+};
+
 class MockConverterService {
   convert() {}
 }
@@ -29,21 +42,14 @@ describe('OccQuoteEntryNormalizer', () => {
   });
 
   it('should convert quote entries', () => {
-    const product = { code: 'testproductcode 1' };
-    const price = { value: 123 };
-    const quote = {
-      allowedActions: [],
-      code: 'testquote',
-      state: QuoteState.BUYER_DRAFT,
-      comments: [],
-      description: 'test description',
-      entries: [{ product }],
-      name: 'test name',
-      totalPrice: price,
-    };
-
     const result = occQuoteEntryNormalizer.convert(quote);
     expect(result.code).toBe(quote.code);
+    expect(result.entries?.length).toBe(1);
     expect(converter.convert).toHaveBeenCalledWith(product, PRODUCT_NORMALIZER);
   });
+
+  it('should map quote code to each entry', () => {
+    const result = occQuoteEntryNormalizer.convert(quote);
+    expect((result.entries ?? [])[0].quoteCode).toBe(quote.code);
+  });
 });
diff --git a/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.ts b/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.ts
index a379f08ae75..c83eb69b91f 100644
--- a/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.ts
+++ b/feature-libs/quote/occ/converters/occ-quote-entry-normalizer.ts
@@ -14,7 +14,7 @@ import {
 
 @Injectable({ providedIn: 'root' })
 export class OccQuoteEntryNormalizer implements Converter<OccQuote, Quote> {
-  protected converter = inject(ConverterService);
+  protected converterService = inject(ConverterService);
 
   convert(source: OccQuote, target?: Quote): Quote {
     if (!target) {
@@ -24,7 +24,11 @@ export class OccQuoteEntryNormalizer implements Converter<OccQuote, Quote> {
     if (source.entries) {
       target.entries = source.entries.map((entry) => ({
         ...entry,
-        product: this.converter.convert(entry.product, PRODUCT_NORMALIZER),
+        quoteCode: source.code,
+        product: this.converterService.convert(
+          entry.product,
+          PRODUCT_NORMALIZER
+        ),
       }));
     }
     return target;
diff --git a/feature-libs/quote/occ/model/occ-quote-endpoints.model.ts b/feature-libs/quote/occ/model/occ-quote-endpoints.model.ts
index 2af41a85dd6..c53606d8921 100644
--- a/feature-libs/quote/occ/model/occ-quote-endpoints.model.ts
+++ b/feature-libs/quote/occ/model/occ-quote-endpoints.model.ts
@@ -45,7 +45,7 @@ export interface QuoteOccEndpoints {
   /**
    * Add a comment to a line item of a quote.
    */
-  addCartEntryComment?: string | OccEndpoint;
+  addQuoteEntryComment?: string | OccEndpoint;
 }
 
 declare module '@spartacus/core' {
diff --git a/feature-libs/quote/quote-aware/ng-package.json b/feature-libs/quote/quote-aware/ng-package.json
deleted file mode 100644
index 38e01ac17de..00000000000
--- a/feature-libs/quote/quote-aware/ng-package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "lib": {
-    "entryFile": "./public_api.ts"
-  }
-}
diff --git a/feature-libs/quote/quote-aware/quote-aware.module.ts b/feature-libs/quote/quote-aware/quote-aware.module.ts
deleted file mode 100644
index 8b55a37161e..00000000000
--- a/feature-libs/quote/quote-aware/quote-aware.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { NgModule } from '@angular/core';
-import { QuoteAwareComponentModule } from './component/quote-aware.component.module';
-
-@NgModule({
-  imports: [QuoteAwareComponentModule],
-})
-export class QuoteAwareModule {}
diff --git a/feature-libs/quote/root/feature-name.ts b/feature-libs/quote/root/feature-name.ts
index 1b01cae1c95..54c0bfc8106 100644
--- a/feature-libs/quote/root/feature-name.ts
+++ b/feature-libs/quote/root/feature-name.ts
@@ -6,3 +6,4 @@
 
 export const QUOTE_FEATURE = 'quote';
 export const QUOTE_AWARE_FEATURE = 'quote_aware';
+export const QUOTE_REQUEST_FEATURE = 'quote_request';
diff --git a/feature-libs/quote/root/quote-root.module.ts b/feature-libs/quote/root/quote-root.module.ts
index a5260534d47..dc964db2fe4 100644
--- a/feature-libs/quote/root/quote-root.module.ts
+++ b/feature-libs/quote/root/quote-root.module.ts
@@ -17,7 +17,11 @@ import {
   LayoutConfig,
   PageLayoutComponent,
 } from '@spartacus/storefront';
-import { QUOTE_AWARE_FEATURE, QUOTE_FEATURE } from './feature-name';
+import {
+  QUOTE_AWARE_FEATURE,
+  QUOTE_FEATURE,
+  QUOTE_REQUEST_FEATURE,
+} from './feature-name';
 
 export function defaultQuoteComponentsConfig() {
   return {
@@ -32,7 +36,6 @@ export function defaultQuoteComponentsConfig() {
           'QuoteHeaderPriceComponent',
           'QuoteHeaderSellerEditComponent',
           'QuoteItemsComponent',
-          'QuoteRequestComponent',
         ],
       },
     },
@@ -49,6 +52,16 @@ export function defaultQuoteAwareComponentsConfig() {
   };
 }
 
+export function defaultQuoteRequestComponentsConfig() {
+  return {
+    featureModules: {
+      [QUOTE_REQUEST_FEATURE]: {
+        cmsComponents: ['QuoteRequestComponent'],
+      },
+    },
+  };
+}
+
 export const defaultQuoteRoutingConfig: RoutingConfig = {
   routing: {
     routes: {
@@ -101,6 +114,7 @@ export const defaultQuoteConfigLayoutConfig: LayoutConfig = {
   providers: [
     provideDefaultConfigFactory(defaultQuoteComponentsConfig),
     provideDefaultConfigFactory(defaultQuoteAwareComponentsConfig),
+    provideDefaultConfigFactory(defaultQuoteRequestComponentsConfig),
     provideDefaultConfig(defaultQuoteRoutingConfig),
     provideDefaultConfig(defaultQuoteConfigLayoutConfig),
   ],
diff --git a/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap b/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap
index 55e380896b5..a8d520932cb 100644
--- a/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/quote/schematics/add-quote/__snapshots__/index_spec.ts.snap
@@ -4,19 +4,23 @@ exports[`Spartacus Quote schematics: ng-add Quote feature eager loading should i
 "import { NgModule } from '@angular/core';
 import { I18nConfig, provideConfig } from "@spartacus/core";
 import { QuoteModule } from "@spartacus/quote";
-import { QuoteTranslationChunksConfig, QuoteTranslations } from "@spartacus/quote/assets";
+import { quoteTranslationChunksConfig, quoteTranslations } from "@spartacus/quote/assets";
+import { QuoteAwareComponentModule } from "@spartacus/quote/components/aware";
+import { QuoteRequestButtonModule } from "@spartacus/quote/components/request-button";
 import { QuoteRootModule } from "@spartacus/quote/root";
 
 @NgModule({
   declarations: [],
   imports: [
     QuoteRootModule,
-    QuoteModule
+    QuoteModule,
+    QuoteAwareComponentModule,
+    QuoteRequestButtonModule
   ],
   providers: [provideConfig(<I18nConfig>{
     i18n: {
-      resources: QuoteTranslations,
-      chunks: QuoteTranslationChunksConfig,
+      resources: quoteTranslations,
+      chunks: quoteTranslationChunksConfig,
     },
   })]
 })
@@ -27,8 +31,8 @@ export class QuoteFeatureModule { }
 exports[`Spartacus Quote schematics: ng-add Quote feature general setup should add the feature using the lazy loading syntax 1`] = `
 "import { NgModule } from '@angular/core';
 import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
-import { QuoteTranslationChunksConfig, QuoteTranslations } from "@spartacus/quote/assets";
-import { QuoteRootModule, QUOTE_FEATURE } from "@spartacus/quote/root";
+import { quoteTranslationChunksConfig, quoteTranslations } from "@spartacus/quote/assets";
+import { QuoteRootModule, QUOTE_AWARE_FEATURE, QUOTE_FEATURE, QUOTE_REQUEST_FEATURE } from "@spartacus/quote/root";
 
 @NgModule({
   declarations: [],
@@ -43,10 +47,26 @@ import { QuoteRootModule, QUOTE_FEATURE } from "@spartacus/quote/root";
       },
     }
   }),
+  provideConfig(<CmsConfig>{
+    featureModules: {
+      [QUOTE_AWARE_FEATURE]: {
+        module: () =>
+          import('@spartacus/quote/components/aware').then((m) => m.QuoteAwareComponentModule),
+      },
+    }
+  }),
+  provideConfig(<CmsConfig>{
+    featureModules: {
+      [QUOTE_REQUEST_FEATURE]: {
+        module: () =>
+          import('@spartacus/quote/components/request-button').then((m) => m.QuoteRequestButtonModule),
+      },
+    }
+  }),
   provideConfig(<I18nConfig>{
     i18n: {
-      resources: QuoteTranslations,
-      chunks: QuoteTranslationChunksConfig,
+      resources: quoteTranslations,
+      chunks: quoteTranslationChunksConfig,
     },
   })
   ]
diff --git a/feature-libs/quote/schematics/constants.ts b/feature-libs/quote/schematics/constants.ts
index cf68d397619..52477accd55 100644
--- a/feature-libs/quote/schematics/constants.ts
+++ b/feature-libs/quote/schematics/constants.ts
@@ -11,7 +11,6 @@ export const QUOTE_MODULE_NAME = 'quote';
 
 export const QUOTE_SCSS_FILE_NAME = 'quote.scss';
 
-export const QUOTE_FEATURE_NAME_CONSTANT = 'QUOTE_FEATURE';
 export const SPARTACUS_QUOTE_ROOT = `${SPARTACUS_QUOTE}/root`;
 export const SPARTACUS_QUOTE_ASSETS = `${SPARTACUS_QUOTE}/assets`;
 export const QUOTE_TRANSLATIONS = 'quoteTranslations';
diff --git a/feature-libs/quote/tsconfig.schematics.json b/feature-libs/quote/tsconfig.schematics.json
index 66ecd404891..4fa08974773 100644
--- a/feature-libs/quote/tsconfig.schematics.json
+++ b/feature-libs/quote/tsconfig.schematics.json
@@ -405,15 +405,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/requested-delivery-date/tsconfig.schematics.json b/feature-libs/requested-delivery-date/tsconfig.schematics.json
index 7fed492a7f6..8714945cf6d 100644
--- a/feature-libs/requested-delivery-date/tsconfig.schematics.json
+++ b/feature-libs/requested-delivery-date/tsconfig.schematics.json
@@ -402,15 +402,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index d8b57a1e836..19e0caec2ff 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
index fa6ce48d3ae..98ce0b069f0 100644
--- a/integration-libs/segment-refs/tsconfig.schematics.json
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -389,15 +389,18 @@
         "../../feature-libs/qualtrics/root/public_api"
       ],
       "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
       "@spartacus/quote/components": [
         "../../feature-libs/quote/components/public_api"
       ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
       "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
       "@spartacus/quote": ["../../feature-libs/quote/public_api"],
       "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
diff --git a/package-lock.json b/package-lock.json
index a15cbf50258..b53ff2110bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,7 +110,7 @@
         "ng-packagr": "^15.1.2",
         "nx": "15.9.2",
         "parse5": "^6.0.1",
-        "postcss": "^8.4.22",
+        "postcss": "^8.4.31",
         "postcss-scss": "^4.0.6",
         "prettier": "~2.4.1",
         "rimraf": "^5.0.0",
@@ -17646,7 +17646,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.22",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -17661,7 +17663,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
diff --git a/package.json b/package.json
index 901e9c1d47e..451c2565783 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "build:digital-payments": "npm --prefix integration-libs/digital-payments run build:schematics && nx build digital-payments --configuration production",
     "build:epd-visualization": "npm --prefix integration-libs/epd-visualization run build:schematics && nx build epd-visualization --configuration production",
     "build:order": "npm --prefix feature-libs/order run build:schematics && nx build order --configuration production",
-    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:pdf-invoices npm:build:product npm:build:product-configurator npm:build:requested-delivery-date npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store && npm run build:setup",
+    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:pdf-invoices npm:build:product npm:build:product-configurator npm:build:requested-delivery-date npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store npm:build:quote && npm run build:setup",
     "build:organization": "npm --prefix feature-libs/organization run build:schematics && nx build organization --configuration production",
     "build:pdf-invoices": "npm --prefix feature-libs/pdf-invoices run build:schematics && nx build pdf-invoices --configuration production",
     "build:pickup-in-store": "npm --prefix feature-libs/pickup-in-store run build:schematics && nx build pickup-in-store --configuration production",
@@ -65,7 +65,7 @@
     "e2e:run:ci:epd-visualization": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:epd-visualization",
     "e2e:run:ci:ccv2": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:ccv2",
     "e2e:run:ci:ccv2-b2b": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:ccv2-b2b",
-    "e2e:run:ci:ccv2-cpq": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:ccv2-cpq",
+    "e2e:run:ci:ccv2-product-configurator": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:ccv2-product-configurator",
     "e2e:run:ci:mcs": "npm --prefix ./projects/storefrontapp-e2e-cypress run run cy:run:ci:mcs",
     "e2e:run:ci:cdc-b2b": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:cdc-b2b",
     "e2e:run:ci:segment-refs": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:segment-refs",
@@ -203,7 +203,7 @@
     "ng-packagr": "^15.1.2",
     "nx": "^15.9.2",
     "parse5": "^6.0.1",
-    "postcss": "^8.4.22",
+    "postcss": "^8.4.31",
     "postcss-scss": "^4.0.6",
     "prettier": "~2.4.1",
     "rimraf": "^5.0.0",
diff --git a/projects/schematics/src/shared/lib-configs/quote-schematics-config.ts b/projects/schematics/src/shared/lib-configs/quote-schematics-config.ts
index 0f937761194..e325dfde2a3 100644
--- a/projects/schematics/src/shared/lib-configs/quote-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/quote-schematics-config.ts
@@ -8,8 +8,10 @@ import {
   CART_BASE_FEATURE_NAME,
   QUOTE_FEATURE_NAME,
   SPARTACUS_QUOTE,
+  SPARTACUS_QUOTE_AWARE,
   SPARTACUS_QUOTE_ASSETS,
   SPARTACUS_QUOTE_ROOT,
+  SPARTACUS_QUOTE_REQUEST,
 } from '../libs-constants';
 import { SchematicConfig } from '../utils';
 
@@ -17,10 +19,14 @@ export const QUOTE_FOLDER_NAME = 'quote';
 export const QUOTE_MODULE_NAME = 'Quote';
 
 export const QUOTE_FEATURE_NAME_CONSTANT = 'QUOTE_FEATURE';
+export const QUOTE_FEATURE_AWARE_NAME_CONSTANT = 'QUOTE_AWARE_FEATURE';
+export const QUOTE_FEATURE_REQUEST_NAME_CONSTANT = 'QUOTE_REQUEST_FEATURE';
 export const QUOTE_MODULE = 'QuoteModule';
+export const QUOTE_AWARE_MODULE = 'QuoteAwareComponentModule';
+export const QUOTE_REQUEST_MODULE = 'QuoteRequestButtonModule';
 export const QUOTE_ROOT_MODULE = 'QuoteRootModule';
-export const QUOTE_TRANSLATIONS = 'QuoteTranslations';
-export const QUOTE_TRANSLATION_CHUNKS_CONFIG = 'QuoteTranslationChunksConfig';
+export const QUOTE_TRANSLATIONS = 'quoteTranslations';
+export const QUOTE_TRANSLATION_CHUNKS_CONFIG = 'quoteTranslationChunksConfig';
 export const QUOTE_SCSS_FILE_NAME = 'quote.scss';
 
 export const QUOTE_SCHEMATICS_CONFIG: SchematicConfig = {
@@ -30,17 +36,31 @@ export const QUOTE_SCHEMATICS_CONFIG: SchematicConfig = {
   },
   folderName: QUOTE_FOLDER_NAME,
   moduleName: QUOTE_MODULE_NAME,
-  featureModule: {
-    name: QUOTE_MODULE,
-    importPath: SPARTACUS_QUOTE,
-  },
+  featureModule: [
+    {
+      name: QUOTE_MODULE,
+      importPath: SPARTACUS_QUOTE,
+    },
+    {
+      name: QUOTE_AWARE_MODULE,
+      importPath: SPARTACUS_QUOTE_AWARE,
+    },
+    {
+      name: QUOTE_REQUEST_MODULE,
+      importPath: SPARTACUS_QUOTE_REQUEST,
+    },
+  ],
   rootModule: {
     name: QUOTE_ROOT_MODULE,
     importPath: SPARTACUS_QUOTE_ROOT,
   },
   lazyLoadingChunk: {
     moduleSpecifier: SPARTACUS_QUOTE_ROOT,
-    namedImports: [QUOTE_FEATURE_NAME_CONSTANT],
+    namedImports: [
+      QUOTE_FEATURE_NAME_CONSTANT,
+      QUOTE_FEATURE_AWARE_NAME_CONSTANT,
+      QUOTE_FEATURE_REQUEST_NAME_CONSTANT,
+    ],
   },
   styles: {
     scssFileName: QUOTE_SCSS_FILE_NAME,
diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
index a84b1d00b19..30d8d527f1b 100644
--- a/projects/schematics/src/shared/libs-constants.ts
+++ b/projects/schematics/src/shared/libs-constants.ts
@@ -198,6 +198,9 @@ export const SPARTACUS_EPD_VISUALIZATION_ROOT = `@spartacus/epd-visualization/ro
 export const SPARTACUS_EPD_VISUALIZATION_ASSETS = `@spartacus/epd-visualization/assets`;
 
 export const SPARTACUS_QUOTE = '@spartacus/quote';
+export const SPARTACUS_QUOTE_AWARE = '@spartacus/quote/components/aware';
+export const SPARTACUS_QUOTE_REQUEST =
+  '@spartacus/quote/components/request-button';
 export const SPARTACUS_QUOTE_ROOT = `@spartacus/quote/root`;
 export const SPARTACUS_QUOTE_ASSETS = `@spartacus/quote/assets`;
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/quote.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/quote.ts
index 3240124f7a4..e506bbbcbd8 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/quote.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/quote.ts
@@ -471,7 +471,7 @@ export function navigateToQuoteListFromQuoteDetails() {
     cy.get('section > ul > li')
       .next()
       .within(() => {
-        cy.get('button').contains('Quotes').first().click();
+        cy.get('a').contains('Quotes').first().click();
       });
   });
 }
diff --git a/projects/storefrontapp-e2e-cypress/package.json b/projects/storefrontapp-e2e-cypress/package.json
index 9b05314ba7d..3564e72df04 100644
--- a/projects/storefrontapp-e2e-cypress/package.json
+++ b/projects/storefrontapp-e2e-cypress/package.json
@@ -23,7 +23,7 @@
     "cy:run:ci:core:b2b": "cypress run --config-file cypress.config.ci.ts --env BASE_SITE=powertools-spa,OCC_PREFIX_USER_ENDPOINT=orgUsers --record --key $CYPRESS_KEY --tag \"b2b,core\" --parallel --ci-build-id $BUILD_NUMBER --group B2B --spec \"cypress/e2e/b2b/regression/**/*.core-e2e.cy.ts\"",
     "cy:run:ci:ccv2": "cypress run --config-file cypress.config.ci.ts --config baseUrl=$ENDPOINT_URL_PUBLIC_SPARTACUS --reporter junit --reporter-options mochaFile=results/spartacus-test-results-[hash].xml --env API_URL=$ENDPOINT_URL_PUBLIC_API --spec $E2ES_TO_RUN",
     "cy:run:ci:ccv2-b2b": "cypress run --config-file cypress.config.ci.ts --config baseUrl=$ENDPOINT_URL_PUBLIC_SPARTACUS --reporter junit --reporter-options mochaFile=results/spartacus-test-results-[hash].xml --env API_URL=$ENDPOINT_URL_PUBLIC_API,BASE_SITE=powertools-spa,OCC_PREFIX_USER_ENDPOINT=orgUsers --spec \"cypress/e2e/cx_ccv2/regression/b2b/**/*.e2e.cy.ts\"",
-    "cy:run:ci:ccv2-cpq": "cypress run --config-file cypress.config.ci.ts --config baseUrl=$ENDPOINT_URL_PUBLIC_SPARTACUS --reporter junit --reporter-options mochaFile=results/spartacus-test-results-[hash].xml --env API_URL=$ENDPOINT_URL_PUBLIC_API,BASE_SITE=powertools-spa,OCC_PREFIX_USER_ENDPOINT=orgUsers --spec \"cypress/e2e/**/cpq-configuration.ccv2-e2e.cy.ts\"",
+    "cy:run:ci:ccv2-product-configurator": "cypress run --config-file cypress.config.ci.ts --config baseUrl=$ENDPOINT_URL_PUBLIC_SPARTACUS --reporter junit --reporter-options mochaFile=results/spartacus-test-results-[hash].xml --env API_URL=$ENDPOINT_URL_PUBLIC_API,BASE_SITE=$E2E_BASE_SITE,OCC_PREFIX_USER_ENDPOINT=orgUsers --spec $E2ES_TO_RUN",
     "cy:run:ci:mcs": "cypress run --config-file cypress.config.ci.ts --config baseUrl=$ENDPOINT_URL_PUBLIC_SPARTACUS --reporter junit --reporter-options mochaFile=results/spartacus-test-results-[hash].xml --env API_URL=$ENDPOINT_URL_PUBLIC_API --spec \"cypress/e2e/cx_mcs/regression/b2c/**/*e2e.cy.ts\"",
     "cy:run:ci:ssr": "cypress run --config-file cypress.config.ci.ts --config baseUrl=http://localhost:4000 --record --key $CYPRESS_KEY --tag \"ssr,all\" --parallel --ci-build-id $BUILD_NUMBER --group SSR --spec \"cypress/e2e/ssr/pages.core-e2e.cy.ts\" --reporter junit --reporter-options mochaFile=results/e2e-test-ssr-[hash].xml",
     "cy:run:ci:cds": "cypress run --config-file cypress.config.ci.ts --record --key $CYPRESS_KEY --tag \"2011,b2c,all-cds\" --group CDS --spec \"cypress/e2e/vendor/cds/**/*.core-e2e.cy.ts\"",
diff --git a/projects/storefrontapp/src/app/spartacus/features/quote-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/quote-feature.module.ts
index ce655f0499a..31a5eac5edc 100644
--- a/projects/storefrontapp/src/app/spartacus/features/quote-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/quote-feature.module.ts
@@ -13,6 +13,7 @@ import {
 import {
   QUOTE_AWARE_FEATURE,
   QUOTE_FEATURE,
+  QUOTE_REQUEST_FEATURE,
   QuoteRootModule,
 } from '@spartacus/quote/root';
 
@@ -34,8 +35,18 @@ import {
       featureModules: {
         [QUOTE_AWARE_FEATURE]: {
           module: () =>
-            import('@spartacus/quote/quote-aware').then(
-              (m) => m.QuoteAwareModule
+            import('@spartacus/quote/components/aware').then(
+              (m) => m.QuoteAwareComponentModule
+            ),
+        },
+      },
+    }),
+    provideConfig({
+      featureModules: {
+        [QUOTE_REQUEST_FEATURE]: {
+          module: () =>
+            import('@spartacus/quote/components/request-button').then(
+              (m) => m.QuoteRequestButtonModule
             ),
         },
       },
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index 0961c264611..6828664f09a 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -261,6 +261,16 @@
       "@spartacus/qualtrics/components": ["dist/qualtrics/components"],
       "@spartacus/qualtrics": ["dist/qualtrics"],
       "@spartacus/qualtrics/root": ["dist/qualtrics/root"],
+      "@spartacus/quote/assets": ["dist/quote/assets"],
+      "@spartacus/quote/components/aware": ["dist/quote/components/aware"],
+      "@spartacus/quote/components": ["dist/quote/components"],
+      "@spartacus/quote/components/request-button": [
+        "dist/quote/components/request-button"
+      ],
+      "@spartacus/quote/core": ["dist/quote/core"],
+      "@spartacus/quote": ["dist/quote"],
+      "@spartacus/quote/occ": ["dist/quote/occ"],
+      "@spartacus/quote/root": ["dist/quote/root"],
       "@spartacus/requested-delivery-date/assets": [
         "dist/requested-delivery-date/assets"
       ],
@@ -308,17 +318,7 @@
       "@spartacus/user/profile": ["dist/user/profile"],
       "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
       "@spartacus/user/profile/root": ["dist/user/profile/root"],
-
-      "@spartacus/quote": ["dist/quote"],
-      "@spartacus/quote/assets": ["dist/quote/assets"],
-      "@spartacus/quote/components": ["dist/quote/components"],
-      "@spartacus/quote/core": ["dist/quote/core"],
-      "@spartacus/quote/occ": ["dist/quote/occ"],
-      "@spartacus/quote/root": ["dist/quote/root"],
-      "@spartacus/quote/quote-aware": ["dist/quote/quote-aware"],
-
       "@spartacus/cdc/assets": ["dist/cdc/assets"],
-
       "@spartacus/cdc/components": ["dist/cdc/components"],
       "@spartacus/cdc/core": ["dist/cdc/core"],
       "@spartacus/cdc": ["dist/cdc"],
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index 439cc33a347..08154e9e25a 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -390,6 +390,20 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
+      "@spartacus/quote/components": [
+        "../../feature-libs/quote/components/public_api"
+      ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
+      "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
+      "@spartacus/quote": ["../../feature-libs/quote/public_api"],
+      "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
+      "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
       ],
@@ -481,21 +495,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
-
-      "@spartacus/quote": ["../../feature-libs/quote/public_api"],
-      "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
-      "@spartacus/quote/components": [
-        "../../feature-libs/quote/components/public_api"
-      ],
-      "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
-      "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
-      "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
-      "@spartacus/quote/quote-aware": [
-        "../../feature-libs/quote/quote-aware/public_api"
-      ],
-
       "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index cb56f26d25c..2958adf350f 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -295,11 +295,16 @@
       "@spartacus/qualtrics": ["../../dist/qualtrics"],
       "@spartacus/qualtrics/root": ["../../dist/qualtrics/root"],
       "@spartacus/quote/assets": ["../../dist/quote/assets"],
+      "@spartacus/quote/components/aware": [
+        "../../dist/quote/components/aware"
+      ],
       "@spartacus/quote/components": ["../../dist/quote/components"],
+      "@spartacus/quote/components/request-button": [
+        "../../dist/quote/components/request-button"
+      ],
       "@spartacus/quote/core": ["../../dist/quote/core"],
       "@spartacus/quote": ["../../dist/quote"],
       "@spartacus/quote/occ": ["../../dist/quote/occ"],
-      "@spartacus/quote/quote-aware": ["../../dist/quote/quote-aware"],
       "@spartacus/quote/root": ["../../dist/quote/root"],
       "@spartacus/requested-delivery-date/assets": [
         "../../dist/requested-delivery-date/assets"
diff --git a/projects/storefrontlib/shared/components/card/card.component.html b/projects/storefrontlib/shared/components/card/card.component.html
index adb09a43824..2dbdbc66c00 100644
--- a/projects/storefrontlib/shared/components/card/card.component.html
+++ b/projects/storefrontlib/shared/components/card/card.component.html
@@ -60,7 +60,7 @@
                 showText;
                 context: {
                   content: content,
-                  truncateText: truncateText,
+                  truncateText: truncateParagraphText,
                   charactersLimit: charactersLimit,
                   class: 'cx-card-paragraph-text',
                   text: text
diff --git a/projects/storefrontlib/shared/components/card/card.component.spec.ts b/projects/storefrontlib/shared/components/card/card.component.spec.ts
index 7511ccbbc1a..76cf1a83f41 100644
--- a/projects/storefrontlib/shared/components/card/card.component.spec.ts
+++ b/projects/storefrontlib/shared/components/card/card.component.spec.ts
@@ -243,7 +243,7 @@ describe('CardComponent', () => {
     };
     component.content = mockCard;
     component.charactersLimit = 4;
-    component.truncateText = true;
+    component.truncateParagraphText = true;
     fixture.detectChanges();
     const truncatedPopovers = getTruncatedPopover(el);
 
diff --git a/projects/storefrontlib/shared/components/card/card.component.ts b/projects/storefrontlib/shared/components/card/card.component.ts
index 33902065809..6cab956db30 100644
--- a/projects/storefrontlib/shared/components/card/card.component.ts
+++ b/projects/storefrontlib/shared/components/card/card.component.ts
@@ -67,6 +67,9 @@ export class CardComponent implements OnInit {
   @Input()
   truncateText = false;
 
+  @Input()
+  truncateParagraphText = false;
+
   @Input()
   charactersLimit = 100;
 
diff --git a/projects/storefrontstyles/scss/_versioning.scss b/projects/storefrontstyles/scss/_versioning.scss
index a8a375e9cef..4ef6729fd31 100644
--- a/projects/storefrontstyles/scss/_versioning.scss
+++ b/projects/storefrontstyles/scss/_versioning.scss
@@ -24,7 +24,7 @@
 // or `$styleVersion` are enabled.
 $_fullVersion: (
   major: 6,
-  minor: 5,
+  minor: 6,
   patch: 0,
 );
 
diff --git a/run-spartacus-product-configurator-e2es.sh b/run-spartacus-product-configurator-e2es.sh
new file mode 100755
index 00000000000..9d772e111b0
--- /dev/null
+++ b/run-spartacus-product-configurator-e2es.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# This script is invoked from https://github.tools.sap/cx-commerce/wonderful-testing-framework/blob/main/resources/wtf/config.yaml
+# By default, the e2es for b2c product-configurator will be executed without parameters. 
+# Supported options include "cpq", "b2c" and "b2c_flaky"
+# To execute the test locally, include a second parameter "local". The cpq tests will run locally against ccv2 p3 and the b2c tests against ccv2 s7
+
+param=${1:-"b2c"} # Default to "b2c" if no parameter provided
+
+if [ "$2" = "local" ]; then
+    export ENDPOINT_URL_PUBLIC_SPARTACUS="https://spartacusstore.cg79x9wuu9-eccommerc1-s7-public.model-t.myhybris.cloud"
+    export ENDPOINT_URL_PUBLIC_API="https://api.cg79x9wuu9-eccommerc1-s7-public.model-t.myhybris.cloud"
+    export ENDPOINT_URL_PUBLIC_SPA_POWERTOOLS="https://b2bspastore.cg79x9wuu9-eccommerc1-p3-public.model-t.myhybris.cloud"
+    [ "$param" = "cpq" ] && export ENDPOINT_URL_PUBLIC_API="https://api.cg79x9wuu9-eccommerc1-p3-public.model-t.myhybris.cloud"
+fi
+
+# Update variables based on the provided parameter
+case "$param" in
+  "cpq")
+    export E2E_BASE_SITE="powertools-spa"
+    export ENDPOINT_URL_PUBLIC_SPARTACUS=$ENDPOINT_URL_PUBLIC_SPA_POWERTOOLS 
+    export E2ES_TO_RUN="'cypress/e2e/**/cpq-configuration.ccv2-e2e.cy.ts'"
+    ;;
+  "b2c")
+    export E2E_BASE_SITE="electronics-spa"
+    export E2ES_TO_RUN="'cypress/e2e/**/product_configurator/*-configurator*e2e.cy.ts'"
+    ;;
+  "b2c_flaky")
+    export E2E_BASE_SITE="electronics-spa"
+    export E2ES_TO_RUN="'cypress/e2e/**/*-configurator*e2e*flaky.cy.ts'"
+    ;;
+  *)
+    echo "Invalid parameter. Please provide a valid parameter."
+    exit 1
+    ;;
+esac
+
+# Install cypress standalone dependencies
+(cd projects/storefrontapp-e2e-cypress && npm install)
+
+# run spartacus ccv2 e2es for product-configurator
+npm run e2e:run:ci:ccv2-product-configurator
\ No newline at end of file
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index 98ccf6a5d7d..494318e77f3 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -191,29 +191,6 @@
       "@spartacus/checkout/scheduled-replenishment/root": [
         "feature-libs/checkout/scheduled-replenishment/root/public_api"
       ],
-      "@spartacus/quote/assets": [
-        "feature-libs/quote/assets/public_api"
-      ],
-      "@spartacus/quote/components": [
-        "feature-libs/quote/components/public_api"
-      ],
-      "@spartacus/quote/core": [
-        "feature-libs/quote/core/public_api"
-      ],
-      "@spartacus/quote": [
-        "feature-libs/quote/public_api"
-      ],
-      "@spartacus/quote/occ": [
-        "feature-libs/quote/occ/public_api"
-      ],
-      "@spartacus/quote/root": [
-        "feature-libs/quote/root/public_api"
-      ],
-      "@spartacus/quote/quote-aware": [
-        "feature-libs/quote/quote-aware/public_api"
-      ],      
-      "@spartacus/order/assets": [
-        "feature-libs/order/assets/public_api"],
       "@spartacus/customer-ticketing/assets": [
         "feature-libs/customer-ticketing/assets/public_api"
       ],
@@ -469,6 +446,30 @@
       "@spartacus/qualtrics/root": [
         "feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/quote/assets": [
+        "feature-libs/quote/assets/public_api"
+      ],
+      "@spartacus/quote/components/aware": [
+        "feature-libs/quote/components/aware/public_api"
+      ],
+      "@spartacus/quote/components": [
+        "feature-libs/quote/components/public_api"
+      ],
+      "@spartacus/quote/components/request-button": [
+        "feature-libs/quote/components/request-button/public_api"
+      ],
+      "@spartacus/quote/core": [
+        "feature-libs/quote/core/public_api"
+      ],
+      "@spartacus/quote": [
+        "feature-libs/quote/public_api"
+      ],
+      "@spartacus/quote/occ": [
+        "feature-libs/quote/occ/public_api"
+      ],
+      "@spartacus/quote/root": [
+        "feature-libs/quote/root/public_api"
+      ],
       "@spartacus/requested-delivery-date/assets": [
         "feature-libs/requested-delivery-date/assets/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index 626dcce7c61..196a515fbb0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,8 +9,13 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "target": "ES2022",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["ES2022", "dom"],
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "ES2022",
+      "dom"
+    ],
     "strictPropertyInitialization": false,
     "strict": true,
     "noUnusedLocals": true,
@@ -19,15 +24,33 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "paths": {
-      "@spartacus/schematics": ["projects/schematics/index"],
-      "@spartacus/setup": ["core-libs/setup/public_api"],
-      "@spartacus/setup/ssr": ["core-libs/setup/ssr/public_api"],
-      "@spartacus/asm/assets": ["feature-libs/asm/assets/public_api"],
-      "@spartacus/asm/components": ["feature-libs/asm/components/public_api"],
-      "@spartacus/asm/core": ["feature-libs/asm/core/public_api"],
-      "@spartacus/asm": ["feature-libs/asm/public_api"],
-      "@spartacus/asm/occ": ["feature-libs/asm/occ/public_api"],
-      "@spartacus/asm/root": ["feature-libs/asm/root/public_api"],
+      "@spartacus/schematics": [
+        "projects/schematics/index"
+      ],
+      "@spartacus/setup": [
+        "core-libs/setup/public_api"
+      ],
+      "@spartacus/setup/ssr": [
+        "core-libs/setup/ssr/public_api"
+      ],
+      "@spartacus/asm/assets": [
+        "feature-libs/asm/assets/public_api"
+      ],
+      "@spartacus/asm/components": [
+        "feature-libs/asm/components/public_api"
+      ],
+      "@spartacus/asm/core": [
+        "feature-libs/asm/core/public_api"
+      ],
+      "@spartacus/asm": [
+        "feature-libs/asm/public_api"
+      ],
+      "@spartacus/asm/occ": [
+        "feature-libs/asm/occ/public_api"
+      ],
+      "@spartacus/asm/root": [
+        "feature-libs/asm/root/public_api"
+      ],
       "@spartacus/cart/base/assets": [
         "feature-libs/cart/base/assets/public_api"
       ],
@@ -40,10 +63,18 @@
       "@spartacus/cart/base/components": [
         "feature-libs/cart/base/components/public_api"
       ],
-      "@spartacus/cart/base/core": ["feature-libs/cart/base/core/public_api"],
-      "@spartacus/cart/base": ["feature-libs/cart/base/public_api"],
-      "@spartacus/cart/base/occ": ["feature-libs/cart/base/occ/public_api"],
-      "@spartacus/cart/base/root": ["feature-libs/cart/base/root/public_api"],
+      "@spartacus/cart/base/core": [
+        "feature-libs/cart/base/core/public_api"
+      ],
+      "@spartacus/cart/base": [
+        "feature-libs/cart/base/public_api"
+      ],
+      "@spartacus/cart/base/occ": [
+        "feature-libs/cart/base/occ/public_api"
+      ],
+      "@spartacus/cart/base/root": [
+        "feature-libs/cart/base/root/public_api"
+      ],
       "@spartacus/cart/import-export/assets": [
         "feature-libs/cart/import-export/assets/public_api"
       ],
@@ -59,7 +90,9 @@
       "@spartacus/cart/import-export/root": [
         "feature-libs/cart/import-export/root/public_api"
       ],
-      "@spartacus/cart": ["feature-libs/cart/public_api"],
+      "@spartacus/cart": [
+        "feature-libs/cart/public_api"
+      ],
       "@spartacus/cart/quick-order/assets": [
         "feature-libs/cart/quick-order/assets/public_api"
       ],
@@ -84,7 +117,9 @@
       "@spartacus/cart/saved-cart/core": [
         "feature-libs/cart/saved-cart/core/public_api"
       ],
-      "@spartacus/cart/saved-cart": ["feature-libs/cart/saved-cart/public_api"],
+      "@spartacus/cart/saved-cart": [
+        "feature-libs/cart/saved-cart/public_api"
+      ],
       "@spartacus/cart/saved-cart/occ": [
         "feature-libs/cart/saved-cart/occ/public_api"
       ],
@@ -103,7 +138,9 @@
       "@spartacus/cart/wish-list/core": [
         "feature-libs/cart/wish-list/core/public_api"
       ],
-      "@spartacus/cart/wish-list": ["feature-libs/cart/wish-list/public_api"],
+      "@spartacus/cart/wish-list": [
+        "feature-libs/cart/wish-list/public_api"
+      ],
       "@spartacus/cart/wish-list/root": [
         "feature-libs/cart/wish-list/root/public_api"
       ],
@@ -116,7 +153,9 @@
       "@spartacus/checkout/b2b/core": [
         "feature-libs/checkout/b2b/core/public_api"
       ],
-      "@spartacus/checkout/b2b": ["feature-libs/checkout/b2b/public_api"],
+      "@spartacus/checkout/b2b": [
+        "feature-libs/checkout/b2b/public_api"
+      ],
       "@spartacus/checkout/b2b/occ": [
         "feature-libs/checkout/b2b/occ/public_api"
       ],
@@ -132,14 +171,18 @@
       "@spartacus/checkout/base/core": [
         "feature-libs/checkout/base/core/public_api"
       ],
-      "@spartacus/checkout/base": ["feature-libs/checkout/base/public_api"],
+      "@spartacus/checkout/base": [
+        "feature-libs/checkout/base/public_api"
+      ],
       "@spartacus/checkout/base/occ": [
         "feature-libs/checkout/base/occ/public_api"
       ],
       "@spartacus/checkout/base/root": [
         "feature-libs/checkout/base/root/public_api"
       ],
-      "@spartacus/checkout": ["feature-libs/checkout/public_api"],
+      "@spartacus/checkout": [
+        "feature-libs/checkout/public_api"
+      ],
       "@spartacus/checkout/scheduled-replenishment/assets": [
         "feature-libs/checkout/scheduled-replenishment/assets/public_api"
       ],
@@ -170,14 +213,24 @@
       "@spartacus/customer-ticketing/root": [
         "feature-libs/customer-ticketing/root/public_api"
       ],
-      "@spartacus/order/assets": ["feature-libs/order/assets/public_api"],
+      "@spartacus/order/assets": [
+        "feature-libs/order/assets/public_api"
+      ],
       "@spartacus/order/components": [
         "feature-libs/order/components/public_api"
       ],
-      "@spartacus/order/core": ["feature-libs/order/core/public_api"],
-      "@spartacus/order": ["feature-libs/order/public_api"],
-      "@spartacus/order/occ": ["feature-libs/order/occ/public_api"],
-      "@spartacus/order/root": ["feature-libs/order/root/public_api"],
+      "@spartacus/order/core": [
+        "feature-libs/order/core/public_api"
+      ],
+      "@spartacus/order": [
+        "feature-libs/order/public_api"
+      ],
+      "@spartacus/order/occ": [
+        "feature-libs/order/occ/public_api"
+      ],
+      "@spartacus/order/root": [
+        "feature-libs/order/root/public_api"
+      ],
       "@spartacus/organization/account-summary/assets": [
         "feature-libs/organization/account-summary/assets/public_api"
       ],
@@ -214,7 +267,9 @@
       "@spartacus/organization/administration/root": [
         "feature-libs/organization/administration/root/public_api"
       ],
-      "@spartacus/organization": ["feature-libs/organization/public_api"],
+      "@spartacus/organization": [
+        "feature-libs/organization/public_api"
+      ],
       "@spartacus/organization/order-approval/assets": [
         "feature-libs/organization/order-approval/assets/public_api"
       ],
@@ -287,7 +342,9 @@
       "@spartacus/pickup-in-store/core": [
         "feature-libs/pickup-in-store/core/public_api"
       ],
-      "@spartacus/pickup-in-store": ["feature-libs/pickup-in-store/public_api"],
+      "@spartacus/pickup-in-store": [
+        "feature-libs/pickup-in-store/public_api"
+      ],
       "@spartacus/pickup-in-store/occ": [
         "feature-libs/pickup-in-store/occ/public_api"
       ],
@@ -366,7 +423,9 @@
       "@spartacus/product/image-zoom/root": [
         "feature-libs/product/image-zoom/root/public_api"
       ],
-      "@spartacus/product": ["feature-libs/product/public_api"],
+      "@spartacus/product": [
+        "feature-libs/product/public_api"
+      ],
       "@spartacus/product/variants/assets": [
         "feature-libs/product/variants/assets/public_api"
       ],
@@ -385,8 +444,36 @@
       "@spartacus/qualtrics/components": [
         "feature-libs/qualtrics/components/public_api"
       ],
-      "@spartacus/qualtrics": ["feature-libs/qualtrics/public_api"],
-      "@spartacus/qualtrics/root": ["feature-libs/qualtrics/root/public_api"],
+      "@spartacus/qualtrics": [
+        "feature-libs/qualtrics/public_api"
+      ],
+      "@spartacus/qualtrics/root": [
+        "feature-libs/qualtrics/root/public_api"
+      ],
+      "@spartacus/quote/assets": [
+        "feature-libs/quote/assets/public_api"
+      ],
+      "@spartacus/quote/components/aware": [
+        "feature-libs/quote/components/aware/public_api"
+      ],
+      "@spartacus/quote/components": [
+        "feature-libs/quote/components/public_api"
+      ],
+      "@spartacus/quote/components/request-button": [
+        "feature-libs/quote/components/request-button/public_api"
+      ],
+      "@spartacus/quote/core": [
+        "feature-libs/quote/core/public_api"
+      ],
+      "@spartacus/quote": [
+        "feature-libs/quote/public_api"
+      ],
+      "@spartacus/quote/occ": [
+        "feature-libs/quote/occ/public_api"
+      ],
+      "@spartacus/quote/root": [
+        "feature-libs/quote/root/public_api"
+      ],
       "@spartacus/requested-delivery-date/assets": [
         "feature-libs/requested-delivery-date/assets/public_api"
       ],
@@ -402,9 +489,15 @@
       "@spartacus/requested-delivery-date/root": [
         "feature-libs/requested-delivery-date/root/public_api"
       ],
-      "@spartacus/smartedit/core": ["feature-libs/smartedit/core/public_api"],
-      "@spartacus/smartedit": ["feature-libs/smartedit/public_api"],
-      "@spartacus/smartedit/root": ["feature-libs/smartedit/root/public_api"],
+      "@spartacus/smartedit/core": [
+        "feature-libs/smartedit/core/public_api"
+      ],
+      "@spartacus/smartedit": [
+        "feature-libs/smartedit/public_api"
+      ],
+      "@spartacus/smartedit/root": [
+        "feature-libs/smartedit/root/public_api"
+      ],
       "@spartacus/storefinder/assets": [
         "feature-libs/storefinder/assets/public_api"
       ],
@@ -414,12 +507,18 @@
       "@spartacus/storefinder/core": [
         "feature-libs/storefinder/core/public_api"
       ],
-      "@spartacus/storefinder": ["feature-libs/storefinder/public_api"],
-      "@spartacus/storefinder/occ": ["feature-libs/storefinder/occ/public_api"],
+      "@spartacus/storefinder": [
+        "feature-libs/storefinder/public_api"
+      ],
+      "@spartacus/storefinder/occ": [
+        "feature-libs/storefinder/occ/public_api"
+      ],
       "@spartacus/storefinder/root": [
         "feature-libs/storefinder/root/public_api"
       ],
-      "@spartacus/tracking": ["feature-libs/tracking/public_api"],
+      "@spartacus/tracking": [
+        "feature-libs/tracking/public_api"
+      ],
       "@spartacus/tracking/personalization/core": [
         "feature-libs/tracking/personalization/core/public_api"
       ],
@@ -438,7 +537,9 @@
       "@spartacus/tracking/tms/gtm": [
         "feature-libs/tracking/tms/gtm/public_api"
       ],
-      "@spartacus/tracking/tms": ["feature-libs/tracking/tms/public_api"],
+      "@spartacus/tracking/tms": [
+        "feature-libs/tracking/tms/public_api"
+      ],
       "@spartacus/user/account/assets": [
         "feature-libs/user/account/assets/public_api"
       ],
@@ -448,14 +549,18 @@
       "@spartacus/user/account/core": [
         "feature-libs/user/account/core/public_api"
       ],
-      "@spartacus/user/account": ["feature-libs/user/account/public_api"],
+      "@spartacus/user/account": [
+        "feature-libs/user/account/public_api"
+      ],
       "@spartacus/user/account/occ": [
         "feature-libs/user/account/occ/public_api"
       ],
       "@spartacus/user/account/root": [
         "feature-libs/user/account/root/public_api"
       ],
-      "@spartacus/user": ["feature-libs/user/public_api"],
+      "@spartacus/user": [
+        "feature-libs/user/public_api"
+      ],
       "@spartacus/user/profile/assets": [
         "feature-libs/user/profile/assets/public_api"
       ],
@@ -465,54 +570,45 @@
       "@spartacus/user/profile/core": [
         "feature-libs/user/profile/core/public_api"
       ],
-      "@spartacus/user/profile": ["feature-libs/user/profile/public_api"],
+      "@spartacus/user/profile": [
+        "feature-libs/user/profile/public_api"
+      ],
       "@spartacus/user/profile/occ": [
         "feature-libs/user/profile/occ/public_api"
       ],
       "@spartacus/user/profile/root": [
         "feature-libs/user/profile/root/public_api"
       ],
-      "@spartacus/quote": ["feature-libs/quote/public_api"],
-      "@spartacus/quote/assets": [
-        "feature-libs/quote/assets/public_api"
-      ],
-      "@spartacus/quote/components": [
-        "feature-libs/quote/components/public_api"
-      ],
-      "@spartacus/quote/core": [
-        "feature-libs/quote/core/public_api"
-      ],
-      "@spartacus/quote/occ": [
-        "feature-libs/quote/occ/public_api"
-      ],
-      "@spartacus/quote/root": [
-        "feature-libs/quote/root/public_api"
-      ],
-      "@spartacus/quote/quote-aware": [
-        "feature-libs/quote/quote-aware/public_api"
-      ],
       "@spartacus/cdc/assets": [
         "integration-libs/cdc/assets/public_api"
       ],
       "@spartacus/cdc/components": [
         "integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/core": ["integration-libs/cdc/core/public_api"],
-      "@spartacus/cdc": ["integration-libs/cdc/public_api"],
+      "@spartacus/cdc/core": [
+        "integration-libs/cdc/core/public_api"
+      ],
+      "@spartacus/cdc": [
+        "integration-libs/cdc/public_api"
+      ],
       "@spartacus/cdc/organization/administration": [
         "integration-libs/cdc/organization/administration/public_api"
       ],
       "@spartacus/cdc/organization/user-registration": [
         "integration-libs/cdc/organization/user-registration/public_api"
       ],
-      "@spartacus/cdc/root": ["integration-libs/cdc/root/public_api"],
+      "@spartacus/cdc/root": [
+        "integration-libs/cdc/root/public_api"
+      ],
       "@spartacus/cdc/user-account": [
         "integration-libs/cdc/user-account/public_api"
       ],
       "@spartacus/cdc/user-profile": [
         "integration-libs/cdc/user-profile/public_api"
       ],
-      "@spartacus/cds": ["integration-libs/cds/public_api"],
+      "@spartacus/cds": [
+        "integration-libs/cds/public_api"
+      ],
       "@spartacus/digital-payments/assets": [
         "integration-libs/digital-payments/assets/public_api"
       ],
@@ -537,20 +633,37 @@
       "@spartacus/epd-visualization/root": [
         "integration-libs/epd-visualization/root/public_api"
       ],
-      "@spartacus/s4om/assets": ["integration-libs/s4om/assets/public_api"],
-      "@spartacus/s4om": ["integration-libs/s4om/public_api"],
-      "@spartacus/s4om/root": ["integration-libs/s4om/root/public_api"],
-      "@spartacus/segment-refs": ["integration-libs/segment-refs/public_api"],
+      "@spartacus/s4om/assets": [
+        "integration-libs/s4om/assets/public_api"
+      ],
+      "@spartacus/s4om": [
+        "integration-libs/s4om/public_api"
+      ],
+      "@spartacus/s4om/root": [
+        "integration-libs/s4om/root/public_api"
+      ],
+      "@spartacus/segment-refs": [
+        "integration-libs/segment-refs/public_api"
+      ],
       "@spartacus/segment-refs/root": [
         "integration-libs/segment-refs/root/public_api"
       ],
-      "@spartacus/assets": ["projects/assets/src/public_api"],
-      "@spartacus/core": ["projects/core/public_api"],
-      "@spartacus/storefront": ["projects/storefrontlib/public_api"]
+      "@spartacus/assets": [
+        "projects/assets/src/public_api"
+      ],
+      "@spartacus/core": [
+        "projects/core/public_api"
+      ],
+      "@spartacus/storefront": [
+        "projects/storefrontlib/public_api"
+      ]
     },
     "useDefineForClassFields": false
   },
-  "exclude": ["./dist", "./projects/storefrontapp-e2e-cypress"],
+  "exclude": [
+    "./dist",
+    "./projects/storefrontapp-e2e-cypress"
+  ],
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
@@ -560,4 +673,4 @@
     "strictTemplates": true,
     "strictInputAccessModifiers": true
   }
-}
+}
\ No newline at end of file