diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ReviewImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ReviewImpl.java
index 362447b4f2..bb77f31f37 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ReviewImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ReviewImpl.java
@@ -58,7 +58,7 @@ public String[] getLinkedPanels() {
     }
 
     public String getEditModeAction() {
-        return editModeAction;
+        return editModeAction != null ? editModeAction : "field";
     }
 
     @Override
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/review/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/review/basic/.content.xml
index 529f03f020..2ce5483fbf 100644
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/review/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/review/basic/.content.xml
@@ -374,7 +374,7 @@
                         fd:editModeAction="field"
                         fieldType="plain-text"
                         hideTitle="false"
-                        fd:linkedPanels="tab1_id"
+                        fd:linkedPanels="panelcontainer1724402234656"
                         name="review1724402878089"/>
                     <submit
                         jcr:created="{Date}2024-08-23T14:18:03.480+05:30"
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 0eb9bf23c1..68470816f9 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -336,16 +336,17 @@
                                         <replace file="target/jcr_root/libs/core/fd/components/form/fileinput/v3/fileinput/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/title/v2/title/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/wizard/v2/wizard/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
-                                        <replace file="target/jcr_root/libs/core/fd/components/form/switch/v1/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/switch/v1/switch/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/hcaptcha/v1/hcaptcha/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
-                                        <replace file="target/jcr_root/libs/core/fd/components/form/review/v1/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/turnstile/v1/turnstile/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/fileinput/v4/fileinput/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/datetime/v1/datetime/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/scribble/v1/scribble/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
-                                        
-                                       <!-- <replace file="target/jcr_root/libs/core/fd/components/form/imagechoice/v1/imagechoice/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" /> -->
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/table/v1/table/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/review/v1/review/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/imagechoice/v1/imagechoice/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+
                                     </target>
                                 </configuration>
                                 <goals>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/de.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/de.json
index 267075fd71..f464bb55be 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/de.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/de.json
@@ -93,5 +93,6 @@
   "clearSign": "Unterschrift löschen",
   "brushSize": "Pinselgröße: ",
   "geoLocationError": "Fehler beim Aufrufen des geografischen Standorts",
-  "geoLocationFetch": "Geografischer Standort wird abgerufen …"
+  "geoLocationFetch": "Geografischer Standort wird abgerufen …",
+  "edit": "Bearbeiten"
 }
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/en.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/en.json
index 5687eb74c5..46ce15a8b2 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/en.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/en.json
@@ -52,5 +52,6 @@
   "clearSign": "Clear Signature",
   "brushSize": "Brush Size: ",
   "geoLocationError": "Error fetching geolocation",
-  "geoLocationFetch": "Fetching Geo Location..."
+  "geoLocationFetch": "Fetching Geo Location...",
+  "edit": "Edit"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/es.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/es.json
index 0b9c769159..355c6e7509 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/es.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/es.json
@@ -93,5 +93,6 @@
   "clearSign": "Borrar firma",
   "brushSize": "Tamaño de pincel: ",
   "geoLocationError": "Error al obtener la localización geográfica",
-  "geoLocationFetch": "Obteniendo localización geográfica…"
+  "geoLocationFetch": "Obteniendo localización geográfica…",
+  "edit": "Editar"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fr.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fr.json
index 4cf5c99bba..760665672c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fr.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fr.json
@@ -93,5 +93,6 @@
   "clearSign": "Effacer la signature",
   "brushSize": "Épaisseur du pinceau : ",
   "geoLocationError": "Erreur lors de la récupération de la géolocalisation",
-  "geoLocationFetch": "Récupération de la géolocalisation..."
+  "geoLocationFetch": "Récupération de la géolocalisation...",
+  "edit": "Modifier"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/it.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/it.json
index 60790cea14..0e9b4e3f7f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/it.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/it.json
@@ -93,5 +93,6 @@
   "clearSign": "Cancella firma",
   "brushSize": "Dimensione pennello: ",
   "geoLocationError": "Errore nel recupero della geolocalizzazione",
-  "geoLocationFetch": "Recupero geolocalizzazione in corso..."
+  "geoLocationFetch": "Recupero geolocalizzazione in corso...",
+  "edit": "Modifica"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ja.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ja.json
index 42e1bf2438..5b67be00d0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ja.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ja.json
@@ -93,5 +93,6 @@
   "clearSign": "署名をクリア",
   "brushSize": "ブラシサイズ :",
   "geoLocationError": "位置情報の取得中にエラーが発生しました",
-  "geoLocationFetch": "位置情報を取得しています..."
+  "geoLocationFetch": "位置情報を取得しています...",
+  "edit": "編集"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ko-kr.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ko-kr.json
index c592049e2b..9f51e91558 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ko-kr.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/ko-kr.json
@@ -93,5 +93,6 @@
   "clearSign": "서명 지우기",
   "brushSize": "브러시 크기: ",
   "geoLocationError": "지리적 위치 가져오기 중 오류 발생",
-  "geoLocationFetch": "지리적 위치 가져오는 중..."
+  "geoLocationFetch": "지리적 위치 가져오는 중...",
+  "edit": "편집"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/pt-br.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/pt-br.json
index 13ade7043f..85a78a462d 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/pt-br.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/pt-br.json
@@ -93,5 +93,6 @@
   "clearSign": "Limpar assinatura",
   "brushSize": "Tamanho do pincel: ",
   "geoLocationError": "Erro ao obter geolocalização",
-  "geoLocationFetch": "Obtendo geolocalização..."
+  "geoLocationFetch": "Obtendo geolocalização...",
+  "edit": "Editar"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-cn.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-cn.json
index 8729e1ce3e..5e75fc09a0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-cn.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-cn.json
@@ -93,5 +93,6 @@
   "clearSign": "清晰的签名",
   "brushSize": "画笔大小：",
   "geoLocationError": "获取地理位置时出错",
-  "geoLocationFetch": "正在获取地理位置..."
+  "geoLocationFetch": "正在获取地理位置...",
+  "edit": "编辑"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-tw.json b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-tw.json
index 3a028252ca..4701629c60 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-tw.json
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/zh-tw.json
@@ -93,5 +93,6 @@
   "clearSign": "清除簽名",
   "brushSize": "筆刷大小：",
   "geoLocationError": "擷取地理位置時出錯",
-  "geoLocationFetch": "正在擷取地理位置…"
+  "geoLocationFetch": "正在擷取地理位置…",
+  "edit": "編輯"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_dialog/.content.xml
index b2de838672..954a8da2ca 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/_cq_dialog/.content.xml
@@ -75,13 +75,13 @@
                         sling:resourceType="granite/ui/components/coral/foundation/form/select"
                         granite:class="cmp-adaptiveform-review__editaction"
                         fieldLabel="Enable edit mode actions for"
-                        name="./fd:editModeAction"
-                        value="field">
+                        name="./fd:editModeAction">
                         <items jcr:primaryType="nt:unstructured">
                           <field
                             jcr:primaryType="nt:unstructured"
                             text="Field"
-                            value="field" />
+                            value="field"
+                            selected="{Boolean}true" />
                           <panel
                             jcr:primaryType="nt:unstructured"
                             text="Panel"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
index 84417c3f9d..690995a342 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/review/v1/review/clientlibs/site/js/reviewview.js
@@ -306,7 +306,8 @@
       if (editButton) {
         editButton.setAttribute(Review.selectors.fieldId, item.id);
         const currentItemLabel = item?.label?.value;
-        editButton.setAttribute('aria-label', Granite.I18n.get('Edit') + (currentItemLabel ?  " " + currentItemLabel : ""));
+        const editLabel =  FormView.LanguageUtils.getTranslatedString(this.formContainer.getLang(), 'edit') || 'Edit';
+        editButton.setAttribute('aria-label', editLabel + (currentItemLabel ?  " " + currentItemLabel : ""));
         if (item.enabled === false) {
           editButton.setAttribute('disabled', true);
         }
diff --git a/ui.tests/test-module/specs/review/review.authoring.spec.js b/ui.tests/test-module/specs/review/review.authoring.cy.js
similarity index 95%
rename from ui.tests/test-module/specs/review/review.authoring.spec.js
rename to ui.tests/test-module/specs/review/review.authoring.cy.js
index 460150da09..e510a4ac2c 100644
--- a/ui.tests/test-module/specs/review/review.authoring.spec.js
+++ b/ui.tests/test-module/specs/review/review.authoring.cy.js
@@ -18,7 +18,7 @@
 const sitesSelectors = require('../../libs/commons/sitesSelectors'),
     afConstants = require('../../libs/commons/formsConstants');
 
-describe.only('Page - Authoring', function () {
+describe('Page - Authoring', function () {
 
     const dropComponent = function (responsiveGridDropZoneSelector, componentTitle, componentType) {
         cy.selectLayer("Edit");
@@ -86,8 +86,8 @@ describe.only('Page - Authoring', function () {
                     cy.get("[name='./jcr:title']").should("exist");
                     cy.get("[name='./fd:editModeAction']").should("exist");
                     cy.get("[name='./fd:editModeAction'] coral-select-item").should("have.length", 4);
-                    cy.get("[name='./linkedPanels']").should("exist");
-                    cy.get("[name='./linkedPanels'] coral-select-item").should("have.length", 2);
+                    cy.get("[name='./fd:linkedPanels']").should("exist");
+                    cy.get("[name='./fd:linkedPanels'] coral-select-item").should("have.length", 2);
                     cy.deleteComponentByPath(tabsPath);
                   })
                 });
diff --git a/ui.tests/test-module/specs/review/review.repeatability.runtime.spec.js b/ui.tests/test-module/specs/review/review.repeatability.runtime.cy.js
similarity index 92%
rename from ui.tests/test-module/specs/review/review.repeatability.runtime.spec.js
rename to ui.tests/test-module/specs/review/review.repeatability.runtime.cy.js
index 512aaedfd0..7148fcc27f 100644
--- a/ui.tests/test-module/specs/review/review.repeatability.runtime.spec.js
+++ b/ui.tests/test-module/specs/review/review.repeatability.runtime.cy.js
@@ -119,10 +119,23 @@ describe("Form with Review component with repeatablity", () => {
         });
       });
     }
-    // Verify the second panel
+    // Verify the second panel ("All addres" tab panel, which wraps the repeatable "Address" panel)
     const checkSecondPanel = () => {
       cy.get(`.${bemBlock}__container .${bemBlock}__panel`).eq(1).within(() => {
-        cy.get(`.${bemBlock}__content`).should('exist').within(() => {
+        cy.get(`.${bemBlock}__label-container`).should('exist');
+        cy.get(`.${bemBlock}__label`).contains('All addres');
+        cy.get(`.${bemBlock}__edit-button`)
+          .should('have.attr', 'data-cmp-visible', 'true')
+          .should('have.attr', 'aria-label')
+          .and('contain', 'All addres');
+
+        // this wrapper panel's own content wrapper (direct child only, via cy.root(), since the
+        // nested repeatable "Address" panel rendered inside it has its own separate .content
+        // one level deeper — a plain cy.get('.content') here would ambiguously match both)
+        cy.root().children(`.${bemBlock}__content`).should('exist');
+
+        // the repeatable "Address" panel is rendered nested inside this wrapper panel's own content
+        cy.get(`.${bemBlock}__panel--repeatable`).eq(0).within(() => {
           cy.get(`.${bemBlock}__label-container`).should('exist');
           cy.get(`.${bemBlock}__label`).contains('Address');
           cy.get(`.${bemBlock}__edit-button`)
diff --git a/ui.tests/test-module/specs/review/review.runtime.spec.js b/ui.tests/test-module/specs/review/review.runtime.cy.js
similarity index 100%
rename from ui.tests/test-module/specs/review/review.runtime.spec.js
rename to ui.tests/test-module/specs/review/review.runtime.cy.js