diff --git a/core-customize/hybris/config/localextensions.xml b/core-customize/hybris/config/localextensions.xml
index fe8898a94..6101a5af7 100644
--- a/core-customize/hybris/config/localextensions.xml
+++ b/core-customize/hybris/config/localextensions.xml
@@ -1,322 +1,278 @@
 <hybrisconfig xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='../bin/platform/resources/schemas/extensions.xsd'>
-	<extensions>
-		<!-- Uncomment the following if you have enabled Cloud Extension Pack-->
-		<!--<path dir='${HYBRIS_BIN_DIR}/modules-cep'  autoload='false' />-->
+  <extensions>
+    <!-- Uncomment the following if you have enabled Cloud Extension Pack-->
+    <!--<path dir='${HYBRIS_BIN_DIR}/modules-cep'  autoload='false' />-->
+    
+    <path dir='${HYBRIS_BIN_DIR}' autoload='false' />
+	  <extension name= 'adaptivesearch' />
+	  <extension name= 'adaptivesearchbackoffice' />
+	  <extension name= 'adaptivesearchfacades' />
+	  <extension name= 'adaptivesearchsolr' />
+	  <extension name= 'adaptivesearchwebservices' />
+	  <extension name= 'apiregistrybackoffice' />
+	  <extension name= 'apiregistryservices' />
+	  <extension name= 'assistedservicecustomerinterestsfacades' />
+	  <extension name= 'assistedservicefacades' />
+	  <extension name= 'assistedservicepromotionfacades' />
+	  <extension name= 'assistedserviceservices' />
+	  <extension name= 'assistedservicewebservices' />
+	  <extension name= 'assistedserviceyprofilefacades' />
+	  <extension name= 'yaasyprofileconnect' />
+	  <extension name= 'b2bacceleratorfacades' />
+	  <extension name= 'b2bacceleratorservices' />
+	  <extension name= 'b2bocc' />
+	  <extension name= 'b2bocctests' />
+	  <extension name= 'b2bwebservicescommons' />
+	  <extension name= 'powertoolsstore' />
+	  <extension name= 'savedorderforms' />
+	  <extension name= 'savedorderformsocc' />
+	  <extension name= 'b2bapprovalprocess' />
+	  <extension name= 'b2bapprovalprocessfacades' />
+	  <extension name= 'b2bcommerce' />
+	  <extension name= 'b2bcommercebackoffice' />
+	  <extension name= 'b2bcommercefacades' />
+	  <extension name= 'b2bpunchout' />
+      <extension name= 'b2bpunchoutbackoffice' />
+      <extension name= 'b2bpunchoutocc' />
+      <extension name= 'b2bpunchoutocctests' />
+	  <extension name= 'apparelstore' />
+	  <extension name= 'electronicsstore' />
+	  <extension name= 'wishlist' />
+	  <extension name= 'classificationgroupsservices' />
+	  <extension name= 'mediaconversionbackoffice' />
+	  <extension name= 'patchesbackoffice' />
+	  <extension name= 'pcmbackoffice' />
+	  <extension name= 'backoffice' />
+	  <extension name= 'platformbackoffice' />
+	  <extension name= 'ybackoffice' />
+	  <extension name= 'yacceleratorbackoffice' />
+	  <extension name= 'yacceleratorcore' />
+	  <extension name= 'yacceleratorfacades' />
+	  <extension name= 'yacceleratorinitialdata' />
+	  <extension name= 'yacceleratorstorefront' />
+	  <extension name= 'basecommerce' />
+	  <extension name= 'basecommercebackoffice' />
+	  <extension name= 'customerreview' />
+	  <extension name= 'payment' />
+	  <extension name= 'promotions' />
+	  <extension name= 'promotionsbackoffice' />
+	  <extension name= 'voucher' />
+	  <extension name= 'voucherbackoffice' />
+	  <extension name= 'profileservices' />
+	  <extension name= 'merchandisingcmswebservices' />
+	  <extension name= 'merchandisingservices' />
+	  <extension name= 'merchandisingservicesbackoffice' />
+	  <extension name= 'merchandisingsmartedit' />
+	  <extension name= 'chinesecommercewebservicescommons' />
+      <extension name= 'chineseaddressbackoffice' />
+      <extension name= 'chineseaddressfacades' />
+      <extension name= 'chineseaddressocc' />
+      <extension name= 'chineseaddressservices' />
+	  <extension name= 'commercefacades' />
+	  <extension name= 'commerceservices' />
+	  <extension name= 'commerceservicesbackoffice' />
+	  <extension name= 'commercewebservices' />
+	  <extension name= 'commercewebservicescommons' />
+	  <extension name= 'commercewebservicestests' />
+	  <extension name= 'yocc' />
+	  <extension name= 'yocctests' />
+	  <extension name= 'configurablebundlebackoffice' />
+	  <extension name= 'configurablebundlefacades' />
+	  <extension name= 'configurablebundleocc' />
+	  <extension name= 'configurablebundleocctests' />
+	  <extension name= 'configurablebundleservices' />
+	  <extension name= 'sapproductconfigb2bservices' />
+	  <extension name= 'sapproductconfigfacades' />
+	  <extension name= 'sapproductconfigocc' />
+	  <extension name= 'sapproductconfigocctests' />
+	  <extension name= 'sapproductconfigrules' />
+	  <extension name= 'sapproductconfigrulesbackoffice' />
+	  <extension name= 'sapproductconfigruntimeinterface' />
+	  <extension name= 'sapproductconfigruntimemock' />
+	  <extension name= 'sapproductconfigservices' />
+	  <extension name= 'consignmenttrackingbackoffice' />
+	  <extension name= 'consignmenttrackingfacades' />
+	  <extension name= 'consignmenttrackingmock' />
+	  <extension name= 'consignmenttrackingocc' />
+	  <extension name= 'consignmenttrackingservices' />
+	  <extension name= 'acceleratorbackoffice' />
+	  <extension name= 'acceleratorcms' />
+	  <extension name= 'acceleratorfacades' />
+	  <extension name= 'acceleratorocc' />
+	  <extension name= 'acceleratorservices' />
+	  <extension name= 'couponbackoffice' />
+	  <extension name= 'couponfacades' />
+	  <extension name= 'couponservices' />
+	  <extension name= 'couponwebservices' />
+	  <extension name= 'customercouponbackoffice' />
+	  <extension name= 'customercouponfacades' />
+	  <extension name= 'customercouponocc' />
+	  <extension name= 'customercouponservices' />
+	  <extension name= 'customerinterestsfacades' />
+	  <extension name= 'customerinterestsocc' />
+	  <extension name= 'customerinterestsservices' />
+	  <extension name= 'customersupportbackoffice' />
+	  <extension name= 'customerticketingfacades' />
+	  <extension name= 'customerticketingocc' />
+	  <extension name= 'customerticketingocctests' />
+	  <extension name= 'ticketsystem' />
+	  <extension name= 'ticketsystembackoffice' />
+	  <extension name= 'datahubadapter' />
+	  <extension name= 'datahubclient' />
+	  <extension name= 'dataimportcommons' />
+	  <extension name= 'entitlementbackoffice' />
+	  <extension name= 'entitlementfacades' />
+	  <extension name= 'entitlementservices' />
+	  <extension name= 'inboundservices' />
+	  <extension name= 'integrationbackoffice' />
+	  <extension name= 'integrationbackofficetest' />
+	  <extension name= 'integrationmonitoringbackoffice' />
+	  <extension name= 'integrationservices' />
+	  <extension name= 'odata2services' />
+	  <extension name= 'odata2webservices' />
+	  <extension name= 'outboundservices' />
+	  <extension name= 'outboundsync' />
+	  <extension name= 'outboundsyncbackoffice' />
+	  <extension name= 'webhookbackoffice' />
+	  <extension name= 'webhookservices' />
+	  <extension name= 'messagecentercsfacades' />
+	  <extension name= 'messagecentercsocc' />
+	  <extension name= 'messagecentercsservices' />
+	  <extension name= 'notificationfacades' />
+	  <extension name= 'notificationocc' />
+	  <extension name= 'notificationservices' />
+	  <extension name= 'npmancillary' />
+	  <extension name= 'b2bordermanagementfacades' />
+	  <extension name= 'b2bordermanagementwebservices' />
+	  <extension name= 'ordermanagementfacades' />
+	  <extension name= 'ordermanagementwebservices' />
+	  <extension name= 'warehousing' />
+	  <extension name= 'warehousingbackoffice' />
+	  <extension name= 'warehousingfacades' />
+	  <extension name= 'warehousingwebservices' />
+	  <extension name= 'yacceleratorordermanagement' />
+	  <extension name= 'personalizationcms' />
+	  <extension name= 'personalizationcmsbackoffice' />
+	  <extension name= 'personalizationcmsweb' />
+	  <extension name= 'personalizationfacades' />
+	  <extension name= 'personalizationintegration' />
+	  <extension name= 'personalizationintegrationbackoffice' />
+	  <extension name= 'personalizationservices' />
+	  <extension name= 'personalizationservicesbackoffice' />
+	  <extension name= 'personalizationsmartedit' />
+	  <extension name= 'personalizationwebservices' />
+	  <extension name= 'previewpersonalizationweb' />
+	  <extension name= 'personalizationyprofile' />
+	  <extension name= 'personalizationpromotions' />
+	  <extension name= 'personalizationpromotionsbackoffice' />
+	  <extension name= 'personalizationpromotionssmartedit' />
+	  <extension name= 'personalizationpromotionsweb' />
+	  <extension name= 'personalizationsearch' />
+	  <extension name= 'personalizationsearchbackoffice' />
+	  <extension name= 'personalizationsearchsmartedit' />
+	  <extension name= 'personalizationsearchweb' />
+	  <extension name= 'adminapi' />
+	  <extension name= 'auditreportservices' />
+	  <extension name= 'azuredtu' />							 
+	  <extension name= 'deltadetection' />
+	  <extension name= 'embeddedserver' />
+	  <extension name= 'groovynature' />
+	  <extension name= 'mediaconversion' />
+	  <extension name= 'patches' />
+	  <extension name= 'springintegrationlibs' />
+	  <extension name= 'tomcatembeddedserver' />
+	  <extension name= 'yempty' />
+	  <extension name= 'yhacext' />
+	  <extension name= 'yvoid' />
+	  <extension name= 'oauth2' />
+	  <extension name= 'promotionenginebackoffice' />
+	  <extension name= 'promotionengineservices' />
+	  <extension name= 'droolsruleengineservices' />
+	  <extension name= 'ordercalculation' />
+	  <extension name= 'rulebuilderbackoffice' />
+	  <extension name= 'ruledefinitions' />
+	  <extension name= 'ruleengine' />
+	  <extension name= 'ruleenginebackoffice' />
+	  <extension name= 'ruleengineservices' />
+	  <extension name= 'kymaintegrationbackoffice' />
+	  <extension name= 'kymaintegrationservices' />
+	  <extension name= 'backofficesolrsearch' />
+	  <extension name= 'solrfacetsearch' />
+	  <extension name= 'solrfacetsearchbackoffice' />
+	  <extension name= 'solrserver' />
+	  <extension name= 'backofficesearchservices' />
+	  <extension name= 'searchbackoffice' />
+	  <extension name= 'searchprovidercssearchbackoffice' />
+	  <extension name= 'searchprovidercssearchservices' />
+	  <extension name= 'searchservices' />
+	  <extension name= 'selectivecartfacades' />
+	  <extension name= 'selectivecartservices' />
+	  <extension name= 'cmssmartedit' />
+	  <extension name= 'cmssmarteditwebservices' />
+	  <extension name= 'smartedit' />
+	  <extension name= 'smartedittools' />
+	  <extension name= 'smarteditwebservices' />
+	  <extension name= 'stocknotificationfacades' />
+	  <extension name= 'stocknotificationservices' />
+	  <extension name= 'subscriptionbundlebackoffice' />
+	  <extension name= 'subscriptionbundlefacades' />
+	  <extension name= 'subscriptionbundleservices' />
+	  <extension name= 'subscriptionbackoffice' />
+	  <extension name= 'subscriptionfacades' />
+	  <extension name= 'subscriptionservices' />
+	  <extension name= 'textfieldconfiguratortemplatebackoffice' />
+	  <extension name= 'textfieldconfiguratortemplatefacades' />
+	  <extension name= 'textfieldconfiguratortemplateocc' />
+	  <extension name= 'textfieldconfiguratortemplateocctests' />
+	  <extension name= 'textfieldconfiguratortemplateservices' />
+	  <extension name= 'timedaccesspromotionenginebackoffice' />
+	  <extension name= 'timedaccesspromotionenginefacades' />
+	  <extension name= 'timedaccesspromotionengineocc' />
+	  <extension name= 'timedaccesspromotionengineservices' />
+	  <extension name= 'cms2' />
+	  <extension name= 'cms2lib' />
+	  <extension name= 'cmsbackoffice' />
+	  <extension name= 'cmsfacades' />
+	  <extension name= 'cmsocc' />
+	  <extension name= 'cmswebservices' />
+	  <extension name= 'previewwebservices' />
+	  <extension name= 'permissionsfacades' />
+	  <extension name= 'permissionswebservices' />
+	  <extension name= 'webservicescommons' />
+	  <extension name= 'ywebservices' />
+	  <extension name= 'orbeonweb' />
+	  <extension name= 'xyformsbackoffice' />
+	  <extension name= 'xyformsfacades' />
+	  <extension name= 'xyformsservices' />
+	  <extension name= 'xyformsweb' />
 
-		<path dir='${HYBRIS_BIN_DIR}' autoload='false' />
-		<extension name= 'adaptivesearch' />
-		<extension name= 'adaptivesearchbackoffice' />
-		<extension name= 'adaptivesearchfacades' />
-		<extension name= 'adaptivesearchsolr' />
-		<extension name= 'adaptivesearchwebservices' />
-		<extension name= 'apiregistrybackoffice' />
-		<extension name= 'apiregistryservices' />
-		<extension name= 'assistedservicecustomerinterestsfacades' />
-		<extension name= 'assistedservicefacades' />
-		<extension name= 'assistedservicepromotionfacades' />
-		<extension name= 'assistedserviceservices' />
-		<extension name= 'assistedservicewebservices' />
-		<extension name= 'assistedserviceyprofilefacades' />
-		<extension name= 'yaasyprofileconnect' />
-		<extension name= 'b2bacceleratorfacades' />
-		<extension name= 'b2bacceleratorservices' />
-		<extension name= 'b2bocc' />
-		<extension name= 'b2bocctests' />
-		<extension name= 'b2bwebservicescommons' />
-		<extension name= 'powertoolsstore' />
-		<extension name= 'savedorderforms' />
-		<extension name= 'savedorderformsocc' />
-		<extension name= 'b2bapprovalprocess' />
-		<extension name= 'b2bapprovalprocessfacades' />
-		<extension name= 'b2bcommerce' />
-		<extension name= 'b2bcommercebackoffice' />
-		<extension name= 'b2bcommercefacades' />
-		<extension name= 'b2bpunchout' />
-		<extension name= 'b2bpunchoutbackoffice' />
-		<extension name= 'b2bpunchoutocc' />
-		<extension name= 'b2bpunchoutocctests' />
-		<extension name= 'apparelstore' />
-		<extension name= 'electronicsstore' />
-		<extension name= 'wishlist' />
-		<extension name= 'classificationgroupsservices' />
-		<extension name= 'mediaconversionbackoffice' />
-		<extension name= 'patchesbackoffice' />
-		<extension name= 'pcmbackoffice' />
-		<extension name= 'backoffice' />
-		<extension name= 'platformbackoffice' />
-		<extension name= 'ybackoffice' />
-		<extension name= 'yacceleratorbackoffice' />
-		<extension name= 'yacceleratorcore' />
-		<extension name= 'yacceleratorfacades' />
-		<extension name= 'yacceleratorinitialdata' />
-		<extension name= 'yacceleratorstorefront' />
-		<extension name= 'basecommerce' />
-		<extension name= 'basecommercebackoffice' />
-		<extension name= 'customerreview' />
-		<extension name= 'payment' />
-		<extension name= 'promotions' />
-		<extension name= 'promotionsbackoffice' />
-		<extension name= 'voucher' />
-		<extension name= 'voucherbackoffice' />
-		<extension name= 'profileservices' />
-		<extension name= 'merchandisingcmswebservices' />
-		<extension name= 'merchandisingservices' />
-		<extension name= 'merchandisingservicesbackoffice' />
-		<extension name= 'merchandisingsmartedit' />
-		<extension name= 'chinesecommercewebservicescommons' />
-		<extension name= 'chineseaddressbackoffice' />
-		<extension name= 'chineseaddressfacades' />
-		<extension name= 'chineseaddressocc' />
-		<extension name= 'chineseaddressservices' />
-		<extension name= 'commercefacades' />
-		<extension name= 'commerceservices' />
-		<extension name= 'commerceservicesbackoffice' />
-		<extension name= 'commercewebservices' />
-		<extension name= 'commercewebservicescommons' />
-		<extension name= 'commercewebservicestests' />
-		<extension name= 'yocc' />
-		<extension name= 'yocctests' />
-		<extension name= 'configurablebundlebackoffice' />
-		<extension name= 'configurablebundlefacades' />
-		<extension name= 'configurablebundleocc' />
-		<extension name= 'configurablebundleocctests' />
-		<extension name= 'configurablebundleservices' />
-		<extension name= 'sapproductconfigb2bservices' />
-		<extension name= 'sapproductconfigfacades' />
-		<extension name= 'sapproductconfigocc' />
-		<extension name= 'sapproductconfigocctests' />
-		<extension name= 'sapproductconfigrules' />
-		<extension name= 'sapproductconfigrulesbackoffice' />
-		<extension name= 'sapproductconfigruntimeinterface' />
-		<extension name= 'sapproductconfigruntimemock' />
-		<extension name= 'sapproductconfigservices' />
-		<extension name= 'consignmenttrackingbackoffice' />
-		<extension name= 'consignmenttrackingfacades' />
-		<extension name= 'consignmenttrackingmock' />
-		<extension name= 'consignmenttrackingocc' />
-		<extension name= 'consignmenttrackingservices' />
-		<extension name= 'acceleratorbackoffice' />
-		<extension name= 'acceleratorcms' />
-		<extension name= 'acceleratorfacades' />
-		<extension name= 'acceleratorocc' />
-		<extension name= 'acceleratorservices' />
-		<extension name= 'couponbackoffice' />
-		<extension name= 'couponfacades' />
-		<extension name= 'couponservices' />
-		<extension name= 'couponwebservices' />
-		<extension name= 'customercouponbackoffice' />
-		<extension name= 'customercouponfacades' />
-		<extension name= 'customercouponocc' />
-		<extension name= 'customercouponservices' />
-		<extension name= 'customerinterestsfacades' />
-		<extension name= 'customerinterestsocc' />
-		<extension name= 'customerinterestsservices' />
-		<extension name= 'customersupportbackoffice' />
-		<extension name= 'customerticketingfacades' />
-		<extension name= 'customerticketingocc' />
-		<extension name= 'customerticketingocctests' />
-		<extension name= 'ticketsystem' />
-		<extension name= 'ticketsystembackoffice' />
-		<extension name= 'datahubadapter' />
-		<extension name= 'datahubclient' />
-		<extension name= 'dataimportcommons' />
-		<extension name= 'entitlementbackoffice' />
-		<extension name= 'entitlementfacades' />
-		<extension name= 'entitlementservices' />
-		<extension name= 'inboundservices' />
-		<extension name= 'integrationbackoffice' />
-		<extension name= 'integrationbackofficetest' />
-		<extension name= 'integrationmonitoringbackoffice' />
-		<extension name= 'integrationservices' />
-		<extension name= 'odata2services' />
-		<extension name= 'odata2webservices' />
-		<extension name= 'outboundservices' />
-		<extension name= 'outboundsync' />
-		<extension name= 'outboundsyncbackoffice' />
-		<extension name= 'webhookbackoffice' />
-		<extension name= 'webhookservices' />
-		<extension name= 'messagecentercsfacades' />
-		<extension name= 'messagecentercsocc' />
-		<extension name= 'messagecentercsservices' />
-		<extension name= 'notificationfacades' />
-		<extension name= 'notificationocc' />
-		<extension name= 'notificationservices' />
-		<extension name= 'npmancillary' />
-		<extension name= 'b2bordermanagementfacades' />
-		<extension name= 'b2bordermanagementwebservices' />
-		<extension name= 'ordermanagementfacades' />
-		<extension name= 'ordermanagementwebservices' />
-		<extension name= 'warehousing' />
-		<extension name= 'warehousingbackoffice' />
-		<extension name= 'warehousingfacades' />
-		<extension name= 'warehousingwebservices' />
-		<extension name= 'yacceleratorordermanagement' />
-		<extension name= 'personalizationcms' />
-		<extension name= 'personalizationcmsbackoffice' />
-		<extension name= 'personalizationcmsweb' />
-		<extension name= 'personalizationfacades' />
-		<extension name= 'personalizationintegration' />
-		<extension name= 'personalizationintegrationbackoffice' />
-		<extension name= 'personalizationservices' />
-		<extension name= 'personalizationservicesbackoffice' />
-		<extension name= 'personalizationsmartedit' />
-		<extension name= 'personalizationwebservices' />
-		<extension name= 'previewpersonalizationweb' />
-		<extension name= 'personalizationyprofile' />
-		<extension name= 'personalizationpromotions' />
-		<extension name= 'personalizationpromotionsbackoffice' />
-		<extension name= 'personalizationpromotionssmartedit' />
-		<extension name= 'personalizationpromotionsweb' />
-		<extension name= 'personalizationsearch' />
-		<extension name= 'personalizationsearchbackoffice' />
-		<extension name= 'personalizationsearchsmartedit' />
-		<extension name= 'personalizationsearchweb' />
-		<extension name= 'adminapi' />
-		<extension name= 'auditreportservices' />
-		<extension name= 'azuredtu' />
-		<extension name= 'deltadetection' />
-		<extension name= 'embeddedserver' />
-		<extension name= 'groovynature' />
-		<extension name= 'mediaconversion' />
-		<extension name= 'patches' />
-		<extension name= 'springintegrationlibs' />
-		<extension name= 'tomcatembeddedserver' />
-		<extension name= 'yempty' />
-		<extension name= 'yhacext' />
-		<extension name= 'yvoid' />
-		<extension name= 'oauth2' />
-		<extension name= 'promotionenginebackoffice' />
-		<extension name= 'promotionengineservices' />
-		<extension name= 'droolsruleengineservices' />
-		<extension name= 'ordercalculation' />
-		<extension name= 'rulebuilderbackoffice' />
-		<extension name= 'ruledefinitions' />
-		<extension name= 'ruleengine' />
-		<extension name= 'ruleenginebackoffice' />
-		<extension name= 'ruleengineservices' />
-		<extension name= 'kymaintegrationbackoffice' />
-		<extension name= 'kymaintegrationservices' />
-		<extension name= 'backofficesolrsearch' />
-		<extension name= 'solrfacetsearch' />
-		<extension name= 'solrfacetsearchbackoffice' />
-		<extension name= 'solrserver' />
-		<extension name= 'backofficesearchservices' />
-		<extension name= 'searchbackoffice' />
-		<extension name= 'searchprovidercssearchbackoffice' />
-		<extension name= 'searchprovidercssearchservices' />
-		<extension name= 'searchservices' />
-		<extension name= 'selectivecartfacades' />
-		<extension name= 'selectivecartservices' />
-		<extension name= 'cmssmartedit' />
-		<extension name= 'cmssmarteditwebservices' />
-		<extension name= 'smartedit' />
-		<extension name= 'smartedittools' />
-		<extension name= 'smarteditwebservices' />
-		<extension name= 'stocknotificationfacades' />
-		<extension name= 'stocknotificationservices' />
-		<extension name= 'subscriptionbundlebackoffice' />
-		<extension name= 'subscriptionbundlefacades' />
-		<extension name= 'subscriptionbundleservices' />
-		<extension name= 'subscriptionbackoffice' />
-		<extension name= 'subscriptionfacades' />
-		<extension name= 'subscriptionservices' />
-		<extension name= 'textfieldconfiguratortemplatebackoffice' />
-		<extension name= 'textfieldconfiguratortemplatefacades' />
-		<extension name= 'textfieldconfiguratortemplateocc' />
-		<extension name= 'textfieldconfiguratortemplateocctests' />
-		<extension name= 'textfieldconfiguratortemplateservices' />
-		<extension name= 'timedaccesspromotionenginebackoffice' />
-		<extension name= 'timedaccesspromotionenginefacades' />
-		<extension name= 'timedaccesspromotionengineocc' />
-		<extension name= 'timedaccesspromotionengineservices' />
-		<extension name= 'cms2' />
-		<extension name= 'cms2lib' />
-		<extension name= 'cmsbackoffice' />
-		<extension name= 'cmsfacades' />
-		<extension name= 'cmsocc' />
-		<extension name= 'cmswebservices' />
-		<extension name= 'previewwebservices' />
-		<extension name= 'permissionsfacades' />
-		<extension name= 'permissionswebservices' />
-		<extension name= 'webservicescommons' />
-		<extension name= 'ywebservices' />
-		<extension name= 'orbeonweb' />
-		<extension name= 'xyformsbackoffice' />
-		<extension name= 'xyformsfacades' />
-		<extension name= 'xyformsservices' />
-		<extension name= 'xyformsweb' />
+<!-- accelerator + addons are legacy, do not use anymore; just configured to enable end-to-end showcase -->
+	  <extension name= 'ordermanagementaddon' />
 
-		<!-- accelerator + addons are legacy, do not use anymore; just configured to enable end-to-end showcase -->
-		<extension name= 'ordermanagementaddon' />
 
-		<!-- DEPRECATED, DO NOT USE -->
-		<!-- only included for demos and testing -->
-		<extension name= 'yb2bacceleratorstorefront' />
-		<extension name= 'adaptivesearchsamplesaddon' />
-		<extension name= 'assistedservicecustomerinterestsaddon' />
-		<extension name= 'assistedservicepromotionaddon' />
-		<extension name= 'assistedservicestorefront' />
-		<extension name= 'assistedserviceyprofileaddon' />
-		<extension name= 'b2bacceleratoraddon' />
-		<extension name= 'accountsummaryaddon' />
-		<extension name= 'b2bpunchoutaddon' />
-		<extension name= 'captchaaddon' />
-		<extension name= 'multicountrysampledataaddon' />
-		<extension name= 'pcmbackofficesamplesaddon' />
-		<extension name= 'profiletagaddon' />
-		<extension name= 'merchandisingaddon' />
-		<extension name= 'merchandisingstorefrontsampledataaddon' />
-		<extension name= 'chineseaddressaddon' />
-		<extension name= 'chinesecommerceorgaddressaddon' />
-		<extension name= 'chinesecommerceorgaddressfacades' />
-		<extension name= 'configurablebundleaddon' />
-		<extension name= 'sapproductconfigb2baddon' />
-		<extension name= 'ysapproductconfigaddon' />
-		<extension name= 'consignmenttrackingaddon' />
-		<extension name= 'acceleratorstorefrontcommons' />
-		<extension name= 'customercouponaddon' />
-		<extension name= 'customerinterestsaddon' />
-		<extension name= 'customerticketingaddon' />
-		<extension name= 'eventtrackingmodel' />
-		<extension name= 'eventtrackingpublisher' />
-		<extension name= 'eventtrackingservices' />
-		<extension name= 'eventtrackingwsaddon' />
-		<extension name= 'notificationaddon' />
-		<extension name= 'orderselfserviceaddon' />
-		<extension name= 'personalizationsampledataaddon' />
-		<extension name= 'personalizationaddon' />
-		<extension name= 'personalizationyprofilesampledataaddon' />
-		<extension name= 'smarteditaddon' />
-		<extension name= 'stocknotificationaddon' />
-		<extension name= 'textfieldconfiguratortemplateaddon' />
-		<extension name= 'timedaccesspromotionengineaddon' />
-		<extension name= 'timedaccesspromotionenginesamplesaddon' />
-		<extension name= 'xyformssamples' />
-		<extension name= 'xyformsstorefrontcommons' />
+<!-- Sample Custom Extensions -->
+    <extension name='kiwi' />
+	<extension name= 'spartacussampledata' />
+    <extension name='tiger'/>
 
-		<!-- Sample Custom Extensions -->
-		<extension name='kiwi' />
-		<extension name= 'spartacussampledata' />
-		<extension name='tiger'/>
+<!-- For more information where to find those extensions: -->
+<!-- https://launchpad.support.sap.com/#/notes/2817992 -->
+    <extension name='azurecloudhotfolder' />
+    <extension name='cloudcommons' />
+    <extension name='cloudhotfolder' />
 
-		<!-- For more information where to find those extensions: -->
-		<!-- https://launchpad.support.sap.com/#/notes/2817992 -->
-		<extension name='azurecloudhotfolder' />
-		<extension name='cloudcommons' />
-		<extension name='cloudhotfolder' />
 
+<!-- Configuring Required Extensions and AddOns for SAP Commerce integration with SAP Cloud Platform Integration -->
+<!-- https://help.sap.com/viewer/product/SAP_COMMERCE_INTEGRATIONS/latest -->
+    <!--<extension name='sapcpiadapter'/>
+    <extension name='sapcpiorderexchange'/>
+    <extension name='ysaporderfulfillment'/>
+    <extension name='integrationbackoffice'/>
+    <extension name='sapcoreconfigurationbackoffice'/>
+    <extension name='sapmodelbackoffice'/>
+    <extension name='saporderexchangebackoffice'/>
+    <extension name='sapcoreaddon'/>-->
 
-		<!-- Configuring Required Extensions and AddOns for SAP Commerce integration with SAP Cloud Platform Integration -->
-		<!-- https://help.sap.com/viewer/product/SAP_COMMERCE_INTEGRATIONS/latest -->
-		<!--<extension name='sapcpiadapter'/>
-        <extension name='sapcpiorderexchange'/>
-        <extension name='ysaporderfulfillment'/>
-        <extension name='integrationbackoffice'/>
-        <extension name='sapcoreconfigurationbackoffice'/>
-        <extension name='sapmodelbackoffice'/>
-        <extension name='saporderexchangebackoffice'/>
-        <extension name='sapcoreaddon'/>-->
 
-
-	</extensions>
+  </extensions>
 </hybrisconfig>