From 2d725457b2c4acb5e9511482cc15ff9a56236e29 Mon Sep 17 00:00:00 2001
From: Armaan Gupta <armaang@adobe.com>
Date: Thu, 20 Aug 2026 13:34:58 +0530
Subject: [PATCH 01/46] FORMS-23760 : added merging feature for header cells
 (#1951)

Co-authored-by: Armaan Gupta <armaang@Armaans-MacBook-Pro.local>
---
 .../form/base/v1/base/_cq_editConfig.xml           |  4 ++--
 .../form/text/v1/text/_cq_editConfig.xml           | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
index 7ba376a0b0..7a6fe9da47 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml
@@ -43,7 +43,7 @@
                 hidden="{Boolean}true"
                 icon="tableColumnRemove"
                 text="Delete Column"/>
-        <!-- <mergeheadercells
+        <mergeheadercells
                 jcr:primaryType="nt:unstructured"
                 condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
                 handler="CQ.FormsCoreComponents.editorhooks.mergeTableHeaderCells"
@@ -56,7 +56,7 @@
                 handler="CQ.FormsCoreComponents.editorhooks.splitTableHeaderCell"
                 hidden="{Boolean}true"
                 icon="tableCellsSplit"
-                text="Split Cell"/> -->
+                text="Split Cell"/>
         <mergerowcells
                 jcr:primaryType="nt:unstructured"
                 condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell(editable); }"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
index 2a944496c4..4726459110 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/text/v1/text/_cq_editConfig.xml
@@ -164,6 +164,20 @@
                 hidden="{Boolean}true"
                 icon="tableColumnRemove"
                 text="Delete Column"/>
+        <mergeheadercells
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.mergeTableHeaderCells"
+                hidden="{Boolean}true"
+                icon="tableMergeCells"
+                text="Merge Cells"/>
+        <splitheadercell
+                jcr:primaryType="nt:unstructured"
+                condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isMergedHeaderCell(editable); }"
+                handler="CQ.FormsCoreComponents.editorhooks.splitTableHeaderCell"
+                hidden="{Boolean}true"
+                icon="tableCellsSplit"
+                text="Split Cell"/>
         <mergerowcells
                 jcr:primaryType="nt:unstructured"
                 condition="function(editable){ return CQ.FormsCoreComponents.editorhooks.isCoreTableRowCell(editable); }"

From 258c66c2fcbcf82a21d1867a46a5a7ad2d191abc Mon Sep 17 00:00:00 2001
From: Armaan Gupta <armaang@adobe.com>
Date: Fri, 21 Aug 2026 11:15:08 +0530
Subject: [PATCH 02/46] FORMS-23760 : Made the preview and runtime same for col
 width property (#1949)

Co-authored-by: Armaan Gupta <armaang@Armaans-MacBook-Pro.local>
---
 .../components/form/table/v1/table/table.html | 63 ++++++-------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html
index 310f9a9c52..0f6b831eb5 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/table.html
@@ -37,50 +37,27 @@
     <div data-sly-call="${shortDescription.shortDescription @componentId=table.id, shortDescriptionVisible=table.tooltipVisible, shortDescription=table.tooltip, bemBlock='cmp-adaptiveform-table'}" data-sly-unwrap></div>
     <div data-sly-call="${longDescription.longDescription @componentId=table.id, longDescription=table.description, bemBlock='cmp-adaptiveform-table'}" data-sly-unwrap></div>
 
-    <!--/* EDIT MODE: column widths not applied; children render their own <tr> with data-cq-data-path for the overlay. */-->
-    <sly data-sly-test="${wcmmode.edit}">
-        <table class="cmp-adaptiveform-table__widget"
-               aria-label="${table.label.value @ context='attribute'}">
-            <thead class="cmp-adaptiveform-table__head">
-                <sly data-sly-list.child="${resource.listChildren}">
-                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tableheader/v1/tableheader'}">
-                        <sly data-sly-resource="${child @ decoration=false}"></sly>
-                    </sly>
+    <table class="cmp-adaptiveform-table__widget"
+           aria-label="${table.label.value @ context='attribute'}"
+           data-sly-attribute.style="${properties.columnWidth ? 'table-layout: fixed; width: 100%' : false}">
+        <sly data-sly-test="${table.columnWidthsConfigured}">
+            <colgroup data-sly-list.colStyle="${table.columnWidthColStyles}">
+                <col style="${colStyle @ context='styleString'}" />
+            </colgroup>
+        </sly>
+        <thead class="cmp-adaptiveform-table__head">
+            <sly data-sly-list.child="${resource.listChildren}">
+                <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tableheader/v1/tableheader'}">
+                    <sly data-sly-resource="${child @ decoration=false}"></sly>
                 </sly>
-            </thead>
-            <tbody class="cmp-adaptiveform-table__body">
-                <sly data-sly-list.child="${resource.listChildren}">
-                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tablerow/v1/tablerow'}">
-                        <sly data-sly-resource="${child @ decoration=false}"></sly>
-                    </sly>
-                </sly>
-            </tbody>
-        </table>
-    </sly>
-    <!--/* PUBLISH MODE: column widths applied via colgroup; proper semantic table for accessibility. */-->
-    <sly data-sly-test="${!wcmmode.edit}">
-        <table class="cmp-adaptiveform-table__widget"
-               aria-label="${table.label.value @ context='attribute'}"
-               data-sly-attribute.style="${properties.columnWidth ? 'table-layout: fixed; width: 100%' : false}">
-            <sly data-sly-test="${table.columnWidthsConfigured}">
-                <colgroup data-sly-list.colStyle="${table.columnWidthColStyles}">
-                    <col style="${colStyle @ context='styleString'}" />
-                </colgroup>
             </sly>
-            <thead class="cmp-adaptiveform-table__head">
-                <sly data-sly-list.child="${resource.listChildren}">
-                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tableheader/v1/tableheader'}">
-                        <sly data-sly-resource="${child @ decoration=false}"></sly>
-                    </sly>
-                </sly>
-            </thead>
-            <tbody class="cmp-adaptiveform-table__body">
-                <sly data-sly-list.child="${resource.listChildren}">
-                    <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tablerow/v1/tablerow'}">
-                        <sly data-sly-resource="${child @ decoration=false}"></sly>
-                    </sly>
+        </thead>
+        <tbody class="cmp-adaptiveform-table__body">
+            <sly data-sly-list.child="${resource.listChildren}">
+                <sly data-sly-test="${child.resourceType == 'core/fd/components/form/tablerow/v1/tablerow'}">
+                    <sly data-sly-resource="${child @ decoration=false}"></sly>
                 </sly>
-            </tbody>
-        </table>
-    </sly>
+            </sly>
+        </tbody>
+    </table>
 </div>

From f32df26cbfb077508a5c707222ccbfca5637b5e3 Mon Sep 17 00:00:00 2001
From: Armaan Gupta <armaang@adobe.com>
Date: Fri, 21 Aug 2026 15:22:42 +0530
Subject: [PATCH 03/46] feat(Table) : Table component theme variant support
 (stripped rows + bordered cells) (#1950)

* feat(table): add AEM Style System variant support for table component (striped rows)

* added border theme variant for the table component

---------

Co-authored-by: Armaan Gupta <armaang@Armaans-MacBook-Pro.local>
---
 .../settings/wcm/policies/.content.xml        | 34 +++++++++++++++++++
 .../af-blank-v2/policies/.content.xml         |  5 +++
 .../af-xfa-blank-v2/policies/.content.xml     |  5 +++
 .../content-page/policies/.content.xml        |  4 +++
 4 files changed, 48 insertions(+)

diff --git a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml
index 450aa434d0..08cc1f6535 100644
--- a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/policies/.content.xml
@@ -276,6 +276,40 @@
                         </cq:styleGroups>
                     </default>
                 </switch>
+                <table jcr:primaryType="nt:unstructured">
+                    <default
+                            jcr:lastModified="{Date}2026-08-05T00:00:00.000+00:00"
+                            jcr:lastModifiedBy="admin"
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Table-row-striping-policy"
+                            sling:resourceType="wcm/core/components/policy/policy">
+                        <jcr:content jcr:primaryType="nt:unstructured"/>
+                        <cq:styleGroups jcr:primaryType="nt:unstructured">
+                            <item0
+                                    cq:styleGroupLabel="Row Style"
+                                    jcr:primaryType="nt:unstructured">
+                                <cq:styles jcr:primaryType="nt:unstructured">
+                                    <item0
+                                            cq:styleClasses="cmp-adaptiveform-table--striped"
+                                            cq:styleId="1754179300000"
+                                            cq:styleLabel="Striped Rows"
+                                            jcr:primaryType="nt:unstructured"/>
+                                </cq:styles>
+                            </item0>
+                            <item1
+                                    cq:styleGroupLabel="Border Style"
+                                    jcr:primaryType="nt:unstructured">
+                                <cq:styles jcr:primaryType="nt:unstructured">
+                                    <item0
+                                            cq:styleClasses="cmp-adaptiveform-table--bordered"
+                                            cq:styleId="1754179300001"
+                                            cq:styleLabel="Bordered"
+                                            jcr:primaryType="nt:unstructured"/>
+                                </cq:styles>
+                            </item1>
+                        </cq:styleGroups>
+                    </default>
+                </table>
             </form>
             <page jcr:primaryType="nt:unstructured">
                 <default
diff --git a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml
index 975e6adf88..cecb00ec3e 100755
--- a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-blank-v2/policies/.content.xml
@@ -53,6 +53,11 @@
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="wcm/core/components/policies/mapping">
                         </switch>
+                        <table
+                                cq:policy="forms-components-examples/components/form/table/default"
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="wcm/core/components/policies/mapping">
+                        </table>
                     </form>
                 </components>
             </forms-components-examples>
diff --git a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-xfa-blank-v2/policies/.content.xml b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-xfa-blank-v2/policies/.content.xml
index 975e6adf88..cecb00ec3e 100755
--- a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-xfa-blank-v2/policies/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/af-xfa-blank-v2/policies/.content.xml
@@ -53,6 +53,11 @@
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="wcm/core/components/policies/mapping">
                         </switch>
+                        <table
+                                cq:policy="forms-components-examples/components/form/table/default"
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="wcm/core/components/policies/mapping">
+                        </table>
                     </form>
                 </components>
             </forms-components-examples>
diff --git a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/policies/.content.xml b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/policies/.content.xml
index 7ffceda9ed..834100e7db 100644
--- a/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/policies/.content.xml
+++ b/examples/ui.content/src/main/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/policies/.content.xml
@@ -21,6 +21,10 @@
                                     cq:policy="forms-components-examples/components/form/switch/default"
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="wcm/core/components/policies/mapping"/>
+                            <table
+                                    cq:policy="forms-components-examples/components/form/table/default"
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="wcm/core/components/policies/mapping"/>
                         </form>
                     </components>
                 </forms-components-examples>

From 0cb2220c9421a75d22bfe1d395a373d0aa8d7aa5 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <69448117+rismehta@users.noreply.github.com>
Date: Wed, 26 Aug 2026 16:29:05 +0530
Subject: [PATCH 04/46] feat(FormContainer): emit fd:setPropertyBehaviour form
 property (#1968)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(FormContainer): emit fd:setPropertyBehaviour form property

Exposes the new form-level property `fd:setPropertyBehaviour` ('async' default |
'eager') from the v2 form container, mirroring how `fd:changeEventBehaviour` is
wired. The base getCustomProperties() strips the `fd:` prefix, so a node-authored
value needs explicit emission: adds the ReservedProperties constant (auto-registered
as reserved via reflection), a @ValueMapValue field, and an emit in getProperties().

No feature-toggle-driven default (unlike changeEventBehaviour) — the af-core runtime
defaults to the backward-compatible 'async', so the property is pure opt-in: a form
sets 'eager' to get read-after-write for setProperty / rule-node writes.

Pairs with af2-web-runtime #780 (runtime support) and the af2-docs spec addition.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* chore(deps): bump @aemforms/af-core and @aemforms/af-formatters to ^1.0.4

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* chore: re-trigger CI (flaky telephoneinput authoring test, unrelated to change)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* test(telephoneinput): fix flaky "Adding removing patterns from design policy"

The test mutates a shared, persistent design policy (adds allowedCustomFormats/item0
+ allowedFormat3 and saves it) but never cleaned up, so any second execution — a
Cypress retry, a re-run, or the spec running after a prior partial run — started from
a dirty policy. With item0 already present, the design dialog's Coral multifield
misbehaves (the racy "Cannot create property '_namespace'" upgrade error fires) and
[name="./allowedCustomFormats/item0/customFormatKey"] never renders → 10s timeout.

Reset the policy to baseline in beforeEach via an authenticated sling @Delete POST
(using the app's jQuery so the session cookie is carried, like enableOrDisableTutorials),
so every run/retry starts clean. Verified locally: pre-dirtied policy + 4 consecutive
runs all pass (was deterministically failing on the 2nd run before).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../internal/form/ReservedProperties.java     |  1 +
 .../models/v2/form/FormContainerImpl.java     | 10 ++++++
 .../models/v2/form/FormContainerImplTest.java | 15 ++++++++
 ui.frontend/package-lock.json                 | 34 ++++++++++---------
 ui.frontend/package.json                      |  4 +--
 ui.tests/test-module/libs/support/commands.js | 24 +++++++++++++
 .../telephoneinput.authoring.cy.js            |  6 +++-
 7 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
index c8b8563b79..b8e7a7b723 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
@@ -176,6 +176,7 @@ private ReservedProperties() {
 
     public static final String FD_DRAFT_ID = "fd:draftId";
     public static final String FD_CHANGE_EVENT_BEHAVIOUR = "fd:changeEventBehaviour";
+    public static final String FD_SET_PROPERTY_BEHAVIOUR = "fd:setPropertyBehaviour";
 
     public static final String PN_CQ_ANNOTATIONS = "cq:annotations";
 
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
index 2600cb871e..66dab68e35 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
@@ -150,6 +150,10 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     @Nullable
     private String changeEventBehaviour;
 
+    @ValueMapValue(name = ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR, injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private String setPropertyBehaviour;
+
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DATA)
     @Nullable
     private String data;
@@ -422,6 +426,12 @@ public String getLanguageDirection() {
         if (StringUtils.isNotBlank(changeEventBehaviour)) {
             properties.put(ReservedProperties.FD_CHANGE_EVENT_BEHAVIOUR, changeEventBehaviour);
         }
+        // fd:setPropertyBehaviour ("async" default | "eager") opts a form into read-after-write for
+        // setProperty / rule-node writes. Node-authored value is emitted as-is; no toggle-driven default
+        // (unlike changeEventBehaviour) since the runtime defaults to the backward-compatible "async".
+        if (StringUtils.isNotBlank(setPropertyBehaviour)) {
+            properties.put(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR, setPropertyBehaviour);
+        }
         properties.put(FD_FORM_DATA_ENABLED, formDataEnabled);
         if (this.autoSaveConfig != null && this.autoSaveConfig.isEnableAutoSave()) {
             properties.put(ReservedProperties.FD_AUTO_SAVE_PROPERTY_WRAPPER, this.autoSaveConfig);
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
index 22ef247eb0..0be68a8040 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
@@ -678,6 +678,21 @@ void testNodeChangeEventBehaviourOverridesToggleDefault() throws Exception {
         }
     }
 
+    @Test
+    void testGetSetPropertyBehaviourFromNode() throws Exception {
+        Resource resource = context.resourceResolver().getResource(PATH_FORM_1);
+        resource.adaptTo(ModifiableValueMap.class).put(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR, "eager");
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        assertEquals("eager", formContainer.getProperties().get(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR));
+    }
+
+    @Test
+    void testSetPropertyBehaviourAbsentWhenNotAuthored() throws Exception {
+        // No node value and no toggle-driven default — the runtime falls back to "async".
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        assertNull(formContainer.getProperties().get(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR));
+    }
+
     @Test
     void testCustomFunctionUrl() throws Exception {
         FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
index 0512279f24..80e6344e9b 100644
--- a/ui.frontend/package-lock.json
+++ b/ui.frontend/package-lock.json
@@ -9,10 +9,10 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aemforms/af-core": "^1.0.2",
+        "@aemforms/af-core": "^1.0.4",
         "@aemforms/af-core-xfa": "^0.1.6",
         "@aemforms/af-custom-functions": "1.0.17",
-        "@aemforms/af-formatters": "^1.0.2"
+        "@aemforms/af-formatters": "^1.0.4"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.18.2",
@@ -108,12 +108,13 @@
       }
     },
     "node_modules/@aemforms/af-core": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.2.tgz",
-      "integrity": "sha512-7d5dif1AM+ulfb/jYdcgh6tR+E/RVJkEuESuMw5xNn+7JMl/OCumw9g3Xl3oceY904FF+DYHgbHRCGpTMtQ89w==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.4.tgz",
+      "integrity": "sha512-CYxtPZNFNvRbkOnCGlvwuUXWVmC2I0EmoOf0QgCW2na+GaJHcIA9CkxmzeRhSAui2LomxVkYvQNQBJRVAwTclQ==",
+      "license": "Adobe Proprietary",
       "dependencies": {
         "@adobe/json-formula": "0.1.50",
-        "@aemforms/af-formatters": "^1.0.2"
+        "@aemforms/af-formatters": "^1.0.4"
       }
     },
     "node_modules/@aemforms/af-core-xfa": {
@@ -136,9 +137,10 @@
       "integrity": "sha512-gDPC/Ly/+aQ7ojSPWm4JM3Zs+NUA+8c6bhjVbKm058AX5UEsXRk+N2o9wK4AHrdsaiR21vmvDuIUyUR2Jb2LTA=="
     },
     "node_modules/@aemforms/af-formatters": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.2.tgz",
-      "integrity": "sha512-b4tO/R2jG3Bxb/TPhGdBZ77GPPdBIRxbjL9kiEfCS8Pco6duiZP7a8fB2mRStQ/jeeXODToZ9BNJjCM2xwjoSg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.4.tgz",
+      "integrity": "sha512-ShqnAHnwTN6JpEZidP1jqZCy5rku/H+2M1oqC7OwDLenQv55LUQasfvINyhG5H7jVKrocyHpijR5BDKlPdewMw==",
+      "license": "Adobe Proprietary"
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
@@ -11137,12 +11139,12 @@
       "integrity": "sha512-dmlLYfbty8NPVIdxvI9cJ+ZdXsrRCFrCdmL1+aR2auEzXJ86rD0bm1qu+S4NOpFiZLKIyx0zvUTykms40vNjsA=="
     },
     "@aemforms/af-core": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.2.tgz",
-      "integrity": "sha512-7d5dif1AM+ulfb/jYdcgh6tR+E/RVJkEuESuMw5xNn+7JMl/OCumw9g3Xl3oceY904FF+DYHgbHRCGpTMtQ89w==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.4.tgz",
+      "integrity": "sha512-CYxtPZNFNvRbkOnCGlvwuUXWVmC2I0EmoOf0QgCW2na+GaJHcIA9CkxmzeRhSAui2LomxVkYvQNQBJRVAwTclQ==",
       "requires": {
         "@adobe/json-formula": "0.1.50",
-        "@aemforms/af-formatters": "^1.0.2"
+        "@aemforms/af-formatters": "^1.0.4"
       }
     },
     "@aemforms/af-core-xfa": {
@@ -11167,9 +11169,9 @@
       "integrity": "sha512-gDPC/Ly/+aQ7ojSPWm4JM3Zs+NUA+8c6bhjVbKm058AX5UEsXRk+N2o9wK4AHrdsaiR21vmvDuIUyUR2Jb2LTA=="
     },
     "@aemforms/af-formatters": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.2.tgz",
-      "integrity": "sha512-b4tO/R2jG3Bxb/TPhGdBZ77GPPdBIRxbjL9kiEfCS8Pco6duiZP7a8fB2mRStQ/jeeXODToZ9BNJjCM2xwjoSg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.4.tgz",
+      "integrity": "sha512-ShqnAHnwTN6JpEZidP1jqZCy5rku/H+2M1oqC7OwDLenQv55LUQasfvINyhG5H7jVKrocyHpijR5BDKlPdewMw=="
     },
     "@ampproject/remapping": {
       "version": "2.2.1",
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
index 0b2f37d710..3dc5ee7e42 100644
--- a/ui.frontend/package.json
+++ b/ui.frontend/package.json
@@ -25,9 +25,9 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@aemforms/af-core": "^1.0.2",
+    "@aemforms/af-core": "^1.0.4",
     "@aemforms/af-core-xfa": "^0.1.6",
-    "@aemforms/af-formatters": "^1.0.2",
+    "@aemforms/af-formatters": "^1.0.4",
     "@aemforms/af-custom-functions": "1.0.17"
   }
 }
diff --git a/ui.tests/test-module/libs/support/commands.js b/ui.tests/test-module/libs/support/commands.js
index 2c21d80d4e..e6abd79ef7 100644
--- a/ui.tests/test-module/libs/support/commands.js
+++ b/ui.tests/test-module/libs/support/commands.js
@@ -139,6 +139,30 @@ Cypress.Commands.add("enableOrDisableTutorials", (enable) => {
     });
 });
 
+/**
+ * Resets a telephoneinput design policy to its baseline by removing the custom-format additions a test
+ * makes (`allowedCustomFormats` items and the `allowedFormat3` toggle). The design policy is shared,
+ * persistent repo state; without this, a test that adds a custom format leaves it behind and any later
+ * run/retry starts from a dirty policy — the multifield/Coral dialog then misbehaves and
+ * `allowedCustomFormats/item0/customFormatKey` never renders. Call in beforeEach for a deterministic start.
+ * @param policyPath JCR path of the telephoneinput policy node (…/policies/…/telephoneinput/<policy>)
+ */
+Cypress.Commands.add("resetTelephoneInputDesignPolicy", (policyPath) => {
+    const contextPath = Cypress.env('crx.contextPath') ? Cypress.env('crx.contextPath') : "";
+    const url = contextPath + policyPath;
+    // POST via the app's jQuery inside the authenticated page (not cy.request) so the session cookie is
+    // carried — same reason enableOrDisableTutorials does; the sling `@Delete` removes the property/node.
+    cy.request(contextPath + '/libs/granite/csrf/token.json').its('body.token').then((token) => {
+        cy.window().then((win) => new Cypress.Promise((resolve) => {
+            win.$.post(url, {
+                'allowedCustomFormats@Delete': '',
+                'allowedFormat3@Delete': '',
+                ':cq_csrf_token': token
+            }).always(resolve);
+        }));
+    });
+});
+
 // Cypress command to open AFv2
 Cypress.Commands.add("openAFv2TemplateEditor", () => {
     const baseUrl = Cypress.env('crx.contextPath') ? Cypress.env('crx.contextPath') : "";
diff --git a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
index 18fbe6dfda..d6a5553032 100644
--- a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
+++ b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
@@ -102,10 +102,14 @@ describe('Page - Authoring', function () {
         telephoneInputDrop = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formtelephoneinput.split("/").pop(),
         telephoneInputEditPathSelector = "[data-path='" + telephoneInputEditPath + "']";
     const customKey = 'customKey',
-        customValue = 'customValue';
+        customValue = 'customValue',
+        // Shared, persistent design policy this test mutates — reset it each run so a leftover custom
+        // format from a prior run/retry can't leave the dialog in a dirty state (see reset command).
+        telephoneInputPolicyPath = '/conf/core-components-examples/settings/wcm/policies/forms-components-examples/components/form/telephoneinput/default';
 
     beforeEach(function () {
       cy.openAuthoring(templateDataPath + ".html");
+      cy.resetTelephoneInputDesignPolicy(telephoneInputPolicyPath);
     });
 
     it('Adding removing patterns from design policy', function () {

From c99faaaae0a0008d602479e85ab12696acdbb843 Mon Sep 17 00:00:00 2001
From: Armaan Gupta <armaang@adobe.com>
Date: Thu, 27 Aug 2026 17:29:05 +0530
Subject: [PATCH 05/46] FORMS - 23760 : Added Table component Mobile Layout
 support with sorting feature (#1934)

* added mobile layout handling

* fixed mobile layout css

* added sorting feature in mobile layout

* resolved merge conflicts

* moved the css part from the core components to the theme canvas

* fix: address table mobile layout review comments (PR #1934)

- rename _mobileSortOverlay/_mobileFilterOverlay to _mobileSortSheet/_mobileFilterSheet
  and cmp-adaptiveform-table__sort-overlay to __sort-scrim, avoiding collision with
  AEM's own /apps-over-/libs "overlay" terminology
- add Table.selectors.headerCell/.sortButton and Table.SORT_ASC/SORT_DESC constants,
  replacing repeated selector and "asc"/"desc" string literals
- localize the mobile sort/filter bar strings via FormView.LanguageUtils.getTranslatedString,
  add corresponding en.json keys, and fix Table never setting this.lang (was always
  falling back to English regardless of form locale)
- add focus trap and focus-restore-to-trigger for the mobile sort/filter sheets

* i18n: add table mobile-bar translations for all supported locales

Moves the 11 new table i18n keys (sortTable, filterTable, sort, filter,
sortOptions, sortBy, sortColumns, sortOrder, sortDirection, ascending,
descending) to the end of en.json to match the file's append convention,
and adds translations for de, es, fr, it, ja, ko-kr, pt-br, zh-cn, zh-tw
so non-English forms render localized text instead of the English
fallback.

---------

Co-authored-by: Armaan Gupta <armaang@Armaans-MacBook-Pro.local>
---
 .../resources/i18n/de.json                    |  15 +-
 .../resources/i18n/en.json                    |  13 +-
 .../resources/i18n/es.json                    |  13 +-
 .../resources/i18n/fr.json                    |  13 +-
 .../resources/i18n/it.json                    |  13 +-
 .../resources/i18n/ja.json                    |  13 +-
 .../resources/i18n/ko-kr.json                 |  13 +-
 .../resources/i18n/pt-br.json                 |  13 +-
 .../resources/i18n/zh-cn.json                 |  13 +-
 .../resources/i18n/zh-tw.json                 |  13 +-
 .../components/form/table/v1/table/README.md  |  19 +-
 .../v1/table/clientlibs/site/js/tableview.js  | 314 +++++++++++++++++-
 .../clientlibs/site/css/tablerowview.css      |   6 +
 13 files changed, 442 insertions(+), 29 deletions(-)

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..205dd70f91 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,16 @@
   "clearSign": "Unterschrift löschen",
   "brushSize": "Pinselgröße: ",
   "geoLocationError": "Fehler beim Aufrufen des geografischen Standorts",
-  "geoLocationFetch": "Geografischer Standort wird abgerufen …"
-}
\ No newline at end of file
+  "geoLocationFetch": "Geografischer Standort wird abgerufen …",
+  "sortTable": "Tabelle sortieren",
+  "filterTable": "Tabelle filtern",
+  "sort": "Sortieren",
+  "filter": "Filtern",
+  "sortOptions": "Sortieroptionen",
+  "sortBy": "Sortieren nach",
+  "sortColumns": "Spalten sortieren",
+  "sortOrder": "Sortierreihenfolge",
+  "sortDirection": "Sortierrichtung",
+  "ascending": "Aufsteigend",
+  "descending": "Absteigend"
+}
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..66c7b3af40 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,16 @@
   "clearSign": "Clear Signature",
   "brushSize": "Brush Size: ",
   "geoLocationError": "Error fetching geolocation",
-  "geoLocationFetch": "Fetching Geo Location..."
+  "geoLocationFetch": "Fetching Geo Location...",
+  "sortTable": "Sort table",
+  "filterTable": "Filter table",
+  "sort": "Sort",
+  "filter": "Filter",
+  "sortOptions": "Sort options",
+  "sortBy": "Sort by",
+  "sortColumns": "Sort columns",
+  "sortOrder": "Sort order",
+  "sortDirection": "Sort direction",
+  "ascending": "Ascending",
+  "descending": "Descending"
 }
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..431a8b747b 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,16 @@
   "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…",
+  "sortTable": "Ordenar tabla",
+  "filterTable": "Filtrar tabla",
+  "sort": "Ordenar",
+  "filter": "Filtrar",
+  "sortOptions": "Opciones de ordenación",
+  "sortBy": "Ordenar por",
+  "sortColumns": "Ordenar columnas",
+  "sortOrder": "Orden de clasificación",
+  "sortDirection": "Dirección de ordenación",
+  "ascending": "Ascendente",
+  "descending": "Descendente"
 }
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..ece5e71f55 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,16 @@
   "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...",
+  "sortTable": "Trier le tableau",
+  "filterTable": "Filtrer le tableau",
+  "sort": "Trier",
+  "filter": "Filtrer",
+  "sortOptions": "Options de tri",
+  "sortBy": "Trier par",
+  "sortColumns": "Trier les colonnes",
+  "sortOrder": "Ordre de tri",
+  "sortDirection": "Sens du tri",
+  "ascending": "Croissant",
+  "descending": "Décroissant"
 }
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..fc760a3986 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,16 @@
   "clearSign": "Cancella firma",
   "brushSize": "Dimensione pennello: ",
   "geoLocationError": "Errore nel recupero della geolocalizzazione",
-  "geoLocationFetch": "Recupero geolocalizzazione in corso..."
+  "geoLocationFetch": "Recupero geolocalizzazione in corso...",
+  "sortTable": "Ordina tabella",
+  "filterTable": "Filtra tabella",
+  "sort": "Ordina",
+  "filter": "Filtra",
+  "sortOptions": "Opzioni di ordinamento",
+  "sortBy": "Ordina per",
+  "sortColumns": "Ordina colonne",
+  "sortOrder": "Ordine di ordinamento",
+  "sortDirection": "Direzione di ordinamento",
+  "ascending": "Crescente",
+  "descending": "Decrescente"
 }
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..970cfea8b9 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,16 @@
   "clearSign": "署名をクリア",
   "brushSize": "ブラシサイズ :",
   "geoLocationError": "位置情報の取得中にエラーが発生しました",
-  "geoLocationFetch": "位置情報を取得しています..."
+  "geoLocationFetch": "位置情報を取得しています...",
+  "sortTable": "テーブルを並べ替え",
+  "filterTable": "テーブルをフィルター",
+  "sort": "並べ替え",
+  "filter": "フィルター",
+  "sortOptions": "並べ替えオプション",
+  "sortBy": "並べ替え基準",
+  "sortColumns": "列を並べ替え",
+  "sortOrder": "並べ替え順序",
+  "sortDirection": "並べ替え方向",
+  "ascending": "昇順",
+  "descending": "降順"
 }
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..2fdc39e23b 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,16 @@
   "clearSign": "서명 지우기",
   "brushSize": "브러시 크기: ",
   "geoLocationError": "지리적 위치 가져오기 중 오류 발생",
-  "geoLocationFetch": "지리적 위치 가져오는 중..."
+  "geoLocationFetch": "지리적 위치 가져오는 중...",
+  "sortTable": "표 정렬",
+  "filterTable": "표 필터",
+  "sort": "정렬",
+  "filter": "필터",
+  "sortOptions": "정렬 옵션",
+  "sortBy": "정렬 기준",
+  "sortColumns": "열 정렬",
+  "sortOrder": "정렬 순서",
+  "sortDirection": "정렬 방향",
+  "ascending": "오름차순",
+  "descending": "내림차순"
 }
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..632fba7a9a 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,16 @@
   "clearSign": "Limpar assinatura",
   "brushSize": "Tamanho do pincel: ",
   "geoLocationError": "Erro ao obter geolocalização",
-  "geoLocationFetch": "Obtendo geolocalização..."
+  "geoLocationFetch": "Obtendo geolocalização...",
+  "sortTable": "Ordenar tabela",
+  "filterTable": "Filtrar tabela",
+  "sort": "Ordenar",
+  "filter": "Filtrar",
+  "sortOptions": "Opções de ordenação",
+  "sortBy": "Ordenar por",
+  "sortColumns": "Ordenar colunas",
+  "sortOrder": "Ordem de classificação",
+  "sortDirection": "Direção de ordenação",
+  "ascending": "Crescente",
+  "descending": "Decrescente"
 }
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..3a4273659e 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,16 @@
   "clearSign": "清晰的签名",
   "brushSize": "画笔大小：",
   "geoLocationError": "获取地理位置时出错",
-  "geoLocationFetch": "正在获取地理位置..."
+  "geoLocationFetch": "正在获取地理位置...",
+  "sortTable": "排序表格",
+  "filterTable": "筛选表格",
+  "sort": "排序",
+  "filter": "筛选",
+  "sortOptions": "排序选项",
+  "sortBy": "排序方式",
+  "sortColumns": "排序列",
+  "sortOrder": "排序顺序",
+  "sortDirection": "排序方向",
+  "ascending": "升序",
+  "descending": "降序"
 }
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..3c297c377f 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,16 @@
   "clearSign": "清除簽名",
   "brushSize": "筆刷大小：",
   "geoLocationError": "擷取地理位置時出錯",
-  "geoLocationFetch": "正在擷取地理位置…"
+  "geoLocationFetch": "正在擷取地理位置…",
+  "sortTable": "排序表格",
+  "filterTable": "篩選表格",
+  "sort": "排序",
+  "filter": "篩選",
+  "sortOptions": "排序選項",
+  "sortBy": "排序方式",
+  "sortColumns": "排序欄位",
+  "sortOrder": "排序順序",
+  "sortDirection": "排序方向",
+  "ascending": "升序",
+  "descending": "降序"
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md
index d3221a18b1..aae1a95536 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/README.md
@@ -22,6 +22,8 @@ Adaptive Form Table component written in HTL that allows authors to capture data
 * Ability to contain `tableheader` and `tablerow` child components
 * Configurable proportional column widths via comma-separated values
 * Optional column sorting with ascending/descending toggle (per-column sort can be individually disabled)
+* Mobile card layout — at `max-width: 768px` rows stack into cards; column headers are shown as inline labels via CSS `::before` using `data-label` attributes stamped on each `<td>`
+* Mobile action bar — Sort and Filter overlays accessible via bottom-sheet UI on narrow viewports; Sort requires `enableSorting`
 * Document of Record (DoR) support — table structure and column widths exported for XFA-based DoR rendering
 * Short description / long description / question mark help pattern
 * Visible and enabled state binding for rules engine
@@ -68,6 +70,18 @@ BLOCK cmp-adaptiveform-table
                 ELEMENT cmp-adaptiveform-tablerow__runtime-controls
                     ELEMENT cmp-adaptiveform-tablerow__add-button
                     ELEMENT cmp-adaptiveform-tablerow__remove-button
+    ELEMENT cmp-adaptiveform-table__mobile-bar (injected by JS; hidden on desktop)
+        ELEMENT cmp-adaptiveform-table__mobile-bar-btn
+            MODIFIER cmp-adaptiveform-table__mobile-bar-btn--sort
+            MODIFIER cmp-adaptiveform-table__mobile-bar-btn--filter
+        ELEMENT cmp-adaptiveform-table__mobile-bar-divider
+    ELEMENT cmp-adaptiveform-table__sort-scrim (shared backdrop for sort and filter bottom sheets)
+        ELEMENT cmp-adaptiveform-table__sort-sheet
+        ELEMENT cmp-adaptiveform-table__sort-sheet-handle
+        ELEMENT cmp-adaptiveform-table__sort-sheet-title
+        ELEMENT cmp-adaptiveform-table__sort-options
+        ELEMENT cmp-adaptiveform-table__sort-option
+            ELEMENT cmp-adaptiveform-table__sort-option-indicator
 ```
 
 ## Theme Editor Support
@@ -94,7 +108,10 @@ The following attributes are required for initialization:
 The following are optional attributes that can be added to the component:
 1. `data-cmp-visible` - boolean indicating whether the component is currently visible
 2. `data-cmp-enabled` - boolean indicating whether the component is currently enabled
-3. `data-cmp-sorting-enabled` - set to `"true"` when `./enableSorting` is authored; controls sort button rendering in `tableheader.html`
+3. `data-cmp-sorting-enabled` - set to `"true"` when `./enableSorting` is authored; controls sort button rendering in `tableheader.html` and enables the Sort button in the mobile action bar
+
+The following attribute is stamped by JavaScript on each `<td>` in the table body at runtime:
+1. `data-label` - set to the corresponding column header text; used by CSS `::before` to render inline labels in the mobile card layout (no author action required)
 
 ## Information
 * **Vendor**: Adobe
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js
index daca571477..032e38dbd5 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/table/v1/table/clientlibs/site/js/tableview.js
@@ -26,20 +26,34 @@
             widget: `.${Table.bemBlock}__widget`,
             description: `.${Table.bemBlock}__longdescription`,
             qm: `.${Table.bemBlock}__questionmark`,
-            tooltipDiv: `.${Table.bemBlock}__shortdescription`
+            tooltipDiv: `.${Table.bemBlock}__shortdescription`,
+            headerCell: "th.cmp-adaptiveform-tablehead",
+            sortButton: `.${Table.bemBlock}__sort-button`
         };
 
+        static SORT_ASC = "asc";
+        static SORT_DESC = "desc";
+
         constructor(params) {
             super(params);
             this.children = [];
             /** @type {{ col: number, dir: 'asc'|'desc' }|null} */
             this._tableSortState = null;
+            /** @type {HTMLElement|null} */
+            this._mobileSortSheet = null;
+            /** @type {HTMLElement|null} */
+            this._mobileFilterSheet = null;
+            /** @type {HTMLElement|null} */
+            this._mobileSheetTrigger = null;
         }
 
         setModel(model) {
             super.setModel(model);
+            this.lang = model.lang;
             queueMicrotask(() => {
                 this.#initColumnSortingIfEnabled();
+                this.#stampMobileLabels();
+                this.#initMobileSortBar();
             });
         }
 
@@ -113,6 +127,47 @@
             this.updateLabel(state.label);
         }
 
+        /**
+         * Mobile card layout (CSS-driven, via @media max-width:768px) stacks each
+         * row into a card and renders the column header as a ::before label sourced
+         * from each cell's data-label attribute. This method is the single point that
+         * stamps that attribute: it reads the header text from each <th> and copies
+         * it onto the matching column index in every body <td>.
+         *
+         * Layout itself is pure CSS — this only supplies the label text. It runs on
+         * init and again after rows are added so dynamically-cloned rows are covered.
+         * It never touches field state, visibility, or DOM structure.
+         *
+         * @param {HTMLElement} [scope] - Optional row element to limit stamping to
+         *        (used after a single row is added); defaults to the whole tbody.
+         */
+        #stampMobileLabels(scope) {
+            const widget = this.element.querySelector(Table.selectors.widget);
+            if (!widget) {
+                return;
+            }
+            const thead = widget.querySelector("thead");
+            const tbody = widget.querySelector("tbody");
+            if (!thead || !tbody) {
+                return;
+            }
+            const headers = Array.from(thead.querySelectorAll(Table.selectors.headerCell))
+                .map((th) => th.innerText.replace(/\s+/g, " ").trim());
+            if (headers.length === 0) {
+                return;
+            }
+            const rows = scope && scope.matches && scope.matches("tr")
+                ? [scope]
+                : Array.from(tbody.querySelectorAll(":scope > tr"));
+            rows.forEach((row) => {
+                Array.from(row.cells).forEach((cell, index) => {
+                    if (index < headers.length && headers[index]) {
+                        cell.setAttribute("data-label", headers[index]);
+                    }
+                });
+            });
+        }
+
         /**
          * Get the <tbody> element for row insertion.
          */
@@ -177,6 +232,9 @@
             // the wrong model index when clicked.
             this.#syncTableRowHooks(htmlElement, addedModel.id);
 
+            // Stamp mobile card labels on the freshly added row.
+            this.#stampMobileLabels(htmlElement);
+
             return htmlElement;
         }
 
@@ -245,8 +303,8 @@
             if (!thead || !tbody) {
                 return;
             }
-            thead.querySelectorAll("th.cmp-adaptiveform-tablehead").forEach((th, index) => {
-                const btn = th.querySelector(".cmp-adaptiveform-table__sort-button");
+            thead.querySelectorAll(Table.selectors.headerCell).forEach((th, index) => {
+                const btn = th.querySelector(Table.selectors.sortButton);
                 if (!btn) {
                     return;
                 }
@@ -263,17 +321,17 @@
          * @param {HTMLTableSectionElement} thead
          * @param {number} colIndex
          */
-        #sortTableByColumn(tbody, thead, colIndex) {
+        #sortTableByColumn(tbody, thead, colIndex, forceDir = null) {
             const rows = Array.from(tbody.querySelectorAll(":scope > tr"));
             if (rows.length <= 1) {
                 return;
             }
-            let dir = "asc";
-            if (this._tableSortState && this._tableSortState.col === colIndex) {
-                dir = this._tableSortState.dir === "asc" ? "desc" : "asc";
+            let dir = forceDir ?? Table.SORT_ASC;
+            if (!forceDir && this._tableSortState && this._tableSortState.col === colIndex) {
+                dir = this._tableSortState.dir === Table.SORT_ASC ? Table.SORT_DESC : Table.SORT_ASC;
             }
             this._tableSortState = { col: colIndex, dir: dir };
-            const mult = dir === "asc" ? 1 : -1;
+            const mult = dir === Table.SORT_ASC ? 1 : -1;
             const sorted = rows.slice().sort((a, b) => {
                 const va = this.#getCellSortValue(a.cells[colIndex]);
                 const vb = this.#getCellSortValue(b.cells[colIndex]);
@@ -281,22 +339,20 @@
             });
             sorted.forEach((r) => tbody.appendChild(r));
             this.#syncInstanceManagerOrderAfterSort(sorted);
-            const headerCells = thead.querySelectorAll("th.cmp-adaptiveform-tablehead");
+            const headerCells = thead.querySelectorAll(Table.selectors.headerCell);
             headerCells.forEach((th) => {
                 th.removeAttribute("aria-sort");
-                const b = th.querySelector(".cmp-adaptiveform-table__sort-button");
+                const b = th.querySelector(Table.selectors.sortButton);
                 if (b) {
-                    b.classList.remove("cmp-adaptiveform-table__sort-button--asc");
-                    b.classList.remove("cmp-adaptiveform-table__sort-button--desc");
+                    b.classList.remove(`${Table.selectors.sortButton.slice(1)}--${Table.SORT_ASC}`);
+                    b.classList.remove(`${Table.selectors.sortButton.slice(1)}--${Table.SORT_DESC}`);
                 }
             });
             const activeTh = headerCells[colIndex];
-            const activeBtn = activeTh && activeTh.querySelector(".cmp-adaptiveform-table__sort-button");
+            const activeBtn = activeTh && activeTh.querySelector(Table.selectors.sortButton);
             if (activeTh && activeBtn) {
-                activeBtn.classList.add(
-                    dir === "asc" ? "cmp-adaptiveform-table__sort-button--asc" : "cmp-adaptiveform-table__sort-button--desc"
-                );
-                activeTh.setAttribute("aria-sort", dir === "asc" ? "ascending" : "descending");
+                activeBtn.classList.add(`${Table.selectors.sortButton.slice(1)}--${dir}`);
+                activeTh.setAttribute("aria-sort", dir === Table.SORT_ASC ? "ascending" : "descending");
             }
         }
 
@@ -321,6 +377,230 @@
             }
         }
 
+        /**
+         * Builds the mobile action bar (Sort | Filter) inserted before the table widget.
+         * Bar is hidden on desktop via CSS. Sheets appended to document.body so
+         * position:fixed works freely. Sort requires enableSorting; filter is always on.
+         */
+        #initMobileSortBar() {
+            const widget = this.element.querySelector(Table.selectors.widget);
+            if (!widget) return;
+            const thead = widget.querySelector('thead');
+            const tbody = widget.querySelector('tbody');
+            if (!thead || !tbody) return;
+
+            const t = (key, fallback) => FormView.LanguageUtils.getTranslatedString(this.lang, key) || fallback;
+            const esc = (s) => s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+            const headers = Array.from(thead.querySelectorAll(Table.selectors.headerCell))
+                .map((th) => th.innerText.replace(/\s+/g, ' ').trim());
+            if (headers.length === 0) return;
+
+            const sortingEnabled = this.element.dataset.cmpSortingEnabled === 'true';
+
+            // --- Action bar (inserted BEFORE the widget) ---
+            const bar = document.createElement('div');
+            bar.className = 'cmp-adaptiveform-table__mobile-bar';
+            bar.innerHTML = `
+                <button type="button"
+                        class="cmp-adaptiveform-table__mobile-bar-btn cmp-adaptiveform-table__mobile-bar-btn--sort"
+                        aria-haspopup="listbox"
+                        aria-label="${esc(t('sortTable', 'Sort table'))}"
+                        ${sortingEnabled ? '' : 'disabled'}>
+                    <span aria-hidden="true">⇅</span><span>${esc(t('sort', 'Sort'))}</span>
+                </button>
+                <div class="cmp-adaptiveform-table__mobile-bar-divider" role="separator" aria-orientation="vertical"></div>
+                <button type="button"
+                        class="cmp-adaptiveform-table__mobile-bar-btn cmp-adaptiveform-table__mobile-bar-btn--filter"
+                        aria-haspopup="dialog"
+                        aria-label="${esc(t('filterTable', 'Filter table'))}">
+                    <span aria-hidden="true">▼</span><span>${esc(t('filter', 'Filter'))}</span>
+                </button>`;
+            widget.before(bar);
+
+            // --- Sort sheet ---
+            if (sortingEnabled) {
+                const optionsHtml = headers.map((h, i) => `
+                    <li class="cmp-adaptiveform-table__sort-option"
+                        role="option" tabindex="0" data-col-index="${i}" aria-selected="false">
+                        <span class="cmp-adaptiveform-table__sort-option-label">${esc(h)}</span>
+                        <span class="cmp-adaptiveform-table__sort-option-indicator" aria-hidden="true"></span>
+                    </li>`).join('');
+
+                const sortSheet = document.createElement('div');
+                sortSheet.className = 'cmp-adaptiveform-table__sort-scrim';
+                sortSheet.setAttribute('role', 'dialog');
+                sortSheet.setAttribute('aria-modal', 'true');
+                sortSheet.setAttribute('aria-label', t('sortOptions', 'Sort options'));
+                sortSheet.innerHTML = `
+                    <div class="cmp-adaptiveform-table__sort-sheet">
+                        <div class="cmp-adaptiveform-table__sort-sheet-handle" aria-hidden="true"></div>
+                        <p class="cmp-adaptiveform-table__sort-sheet-title">${esc(t('sortBy', 'Sort by'))}</p>
+                        <ul class="cmp-adaptiveform-table__sort-options" role="listbox" aria-label="${esc(t('sortColumns', 'Sort columns'))}">
+                            ${optionsHtml}
+                        </ul>
+                    </div>`;
+                document.body.appendChild(sortSheet);
+                this._mobileSortSheet = sortSheet;
+
+                bar.querySelector('.cmp-adaptiveform-table__mobile-bar-btn--sort').addEventListener('click', (e) => {
+                    this.#openMobileSortSheet(e.currentTarget);
+                });
+                sortSheet.addEventListener('click', (e) => {
+                    if (e.target === sortSheet) this.#closeMobileSortSheet();
+                });
+                sortSheet.addEventListener('keydown', (e) => {
+                    if (e.key === 'Escape') this.#closeMobileSortSheet();
+                    else this.#trapSheetFocus(e, sortSheet);
+                });
+                sortSheet.querySelectorAll('.cmp-adaptiveform-table__sort-option').forEach((opt) => {
+                    const activate = () => {
+                        const colIndex = parseInt(opt.dataset.colIndex, 10);
+                        this.#sortTableByColumn(tbody, thead, colIndex);
+                        this.#updateMobileSortIndicators();
+                        this.#closeMobileSortSheet();
+                    };
+                    opt.addEventListener('click', activate);
+                    opt.addEventListener('keydown', (e) => {
+                        if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); activate(); }
+                    });
+                });
+            }
+
+            // --- Filter sheet (Ascending / Descending direction picker) ---
+            const filterSheet = document.createElement('div');
+            filterSheet.className = 'cmp-adaptiveform-table__sort-scrim';
+            filterSheet.setAttribute('role', 'dialog');
+            filterSheet.setAttribute('aria-modal', 'true');
+            filterSheet.setAttribute('aria-label', t('sortOrder', 'Sort order'));
+            filterSheet.innerHTML = `
+                <div class="cmp-adaptiveform-table__sort-sheet">
+                    <div class="cmp-adaptiveform-table__sort-sheet-handle" aria-hidden="true"></div>
+                    <p class="cmp-adaptiveform-table__sort-sheet-title">${esc(t('sortOrder', 'Sort order'))}</p>
+                    <ul class="cmp-adaptiveform-table__sort-options" role="listbox" aria-label="${esc(t('sortDirection', 'Sort direction'))}">
+                        <li class="cmp-adaptiveform-table__sort-option"
+                            role="option" tabindex="0" data-dir="${Table.SORT_ASC}" aria-selected="false">
+                            <span>${esc(t('ascending', 'Ascending'))}</span>
+                            <span class="cmp-adaptiveform-table__sort-option-indicator" aria-hidden="true"></span>
+                        </li>
+                        <li class="cmp-adaptiveform-table__sort-option"
+                            role="option" tabindex="0" data-dir="${Table.SORT_DESC}" aria-selected="false">
+                            <span>${esc(t('descending', 'Descending'))}</span>
+                            <span class="cmp-adaptiveform-table__sort-option-indicator" aria-hidden="true"></span>
+                        </li>
+                    </ul>
+                </div>`;
+            document.body.appendChild(filterSheet);
+            this._mobileFilterSheet = filterSheet;
+
+            bar.querySelector('.cmp-adaptiveform-table__mobile-bar-btn--filter').addEventListener('click', (e) => {
+                this.#openMobileFilterSheet(e.currentTarget);
+            });
+            filterSheet.addEventListener('click', (e) => {
+                if (e.target === filterSheet) this.#closeMobileFilterSheet();
+            });
+            filterSheet.addEventListener('keydown', (e) => {
+                if (e.key === 'Escape') this.#closeMobileFilterSheet();
+                else this.#trapSheetFocus(e, filterSheet);
+            });
+            filterSheet.querySelectorAll('.cmp-adaptiveform-table__sort-option').forEach((opt) => {
+                const activate = () => {
+                    const dir = opt.dataset.dir;
+                    const colIndex = this._tableSortState ? this._tableSortState.col : 0;
+                    this.#sortTableByColumn(tbody, thead, colIndex, dir);
+                    this.#updateMobileFilterIndicators();
+                    this.#closeMobileFilterSheet();
+                };
+                opt.addEventListener('click', activate);
+                opt.addEventListener('keydown', (e) => {
+                    if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); activate(); }
+                });
+            });
+        }
+
+        /**
+         * Keeps Tab/Shift+Tab from moving focus outside an open modal sheet.
+         * @param {KeyboardEvent} e
+         * @param {HTMLElement} sheet
+         */
+        #trapSheetFocus(e, sheet) {
+            if (e.key !== 'Tab') return;
+            const focusable = Array.from(sheet.querySelectorAll('[tabindex="0"]'));
+            if (focusable.length === 0) return;
+            const first = focusable[0];
+            const last = focusable[focusable.length - 1];
+            if (e.shiftKey && document.activeElement === first) {
+                e.preventDefault();
+                last.focus();
+            } else if (!e.shiftKey && document.activeElement === last) {
+                e.preventDefault();
+                first.focus();
+            }
+        }
+
+        #openMobileSortSheet(trigger) {
+            if (!this._mobileSortSheet) return;
+            this._mobileSheetTrigger = trigger || document.activeElement;
+            this.#updateMobileSortIndicators();
+            this._mobileSortSheet.classList.add('is-open');
+            document.body.style.overflow = 'hidden';
+            const first = this._mobileSortSheet.querySelector('.cmp-adaptiveform-table__sort-option');
+            if (first) first.focus();
+        }
+
+        #closeMobileSortSheet() {
+            if (!this._mobileSortSheet) return;
+            this._mobileSortSheet.classList.remove('is-open');
+            document.body.style.overflow = '';
+            this.#restoreSheetFocus();
+        }
+
+        #openMobileFilterSheet(trigger) {
+            if (!this._mobileFilterSheet) return;
+            this._mobileSheetTrigger = trigger || document.activeElement;
+            this.#updateMobileFilterIndicators();
+            this._mobileFilterSheet.classList.add('is-open');
+            document.body.style.overflow = 'hidden';
+            const first = this._mobileFilterSheet.querySelector('.cmp-adaptiveform-table__sort-option');
+            if (first) first.focus();
+        }
+
+        #closeMobileFilterSheet() {
+            if (!this._mobileFilterSheet) return;
+            this._mobileFilterSheet.classList.remove('is-open');
+            document.body.style.overflow = '';
+            this.#restoreSheetFocus();
+        }
+
+        #restoreSheetFocus() {
+            if (this._mobileSheetTrigger && typeof this._mobileSheetTrigger.focus === 'function') {
+                this._mobileSheetTrigger.focus();
+            }
+            this._mobileSheetTrigger = null;
+        }
+
+        #updateMobileFilterIndicators() {
+            if (!this._mobileFilterSheet) return;
+            this._mobileFilterSheet.querySelectorAll('.cmp-adaptiveform-table__sort-option').forEach((opt) => {
+                const active = !!this._tableSortState && this._tableSortState.dir === opt.dataset.dir;
+                opt.setAttribute('aria-selected', active ? 'true' : 'false');
+                const indicator = opt.querySelector('.cmp-adaptiveform-table__sort-option-indicator');
+                if (indicator) indicator.textContent = active ? '✓' : '';
+            });
+        }
+
+        #updateMobileSortIndicators() {
+            if (!this._mobileSortSheet) return;
+            this._mobileSortSheet.querySelectorAll('.cmp-adaptiveform-table__sort-option').forEach((opt) => {
+                const colIndex = parseInt(opt.dataset.colIndex, 10);
+                const indicator = opt.querySelector('.cmp-adaptiveform-table__sort-option-indicator');
+                const active = this._tableSortState && this._tableSortState.col === colIndex;
+                opt.setAttribute('aria-selected', active ? 'true' : 'false');
+                if (indicator) {
+                    indicator.textContent = active ? (this._tableSortState.dir === Table.SORT_ASC ? '↑' : '↓') : '';
+                }
+            });
+        }
+
         /**
          * @param {HTMLTableCellElement|undefined} cell
          * @returns {string}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css
index dcb91ae672..541d56d587 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/tablerow/v1/tablerow/clientlibs/site/css/tablerowview.css
@@ -36,3 +36,9 @@
 
 .cmp-adaptiveform-tablerow__add-button:focus-visible,
 .cmp-adaptiveform-tablerow__remove-button:focus-visible {}
+
+@media (max-width: 768px) {
+    .cmp-adaptiveform-tablecell.cmp-adaptiveform-tablecell--with-row-controls {}
+
+    .cmp-adaptiveform-tablerow__runtime-controls {}
+}

From fea6e474665fbc558db08a9d8b199f8e316f00ec Mon Sep 17 00:00:00 2001
From: Vlad Bailescu <bailescu@adobe.com>
Date: Wed, 9 Sep 2026 12:12:16 +0300
Subject: [PATCH 06/46] fix: build jsdocs via frontend-maven-plugin instead of
 exec-maven-plugin (#1981)

exec-maven-plugin invoked node_modules/.bin/jsdoc directly, which requires a global
node binary on PATH via its #!/usr/bin/env shebang. In build environments without a
global Node install (e.g. Cloud Manager), this fails with exit 127:
"/usr/bin/env: 'node': No such file or directory".

Route the jsdoc generation through frontend-maven-plugin's npm goal instead, which
correctly uses the locally-installed node/npm it manages, matching the pattern
already used by other modules in this repo (e.g. ui.frontend).
---
 jsdocs/package.json |  3 +++
 jsdocs/pom.xml      | 54 +++++++++------------------------------------
 2 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/jsdocs/package.json b/jsdocs/package.json
index 28895db561..547476deb0 100644
--- a/jsdocs/package.json
+++ b/jsdocs/package.json
@@ -5,6 +5,9 @@
   "keywords": [],
   "author": "",
   "license": "Apache-2.0",
+  "scripts": {
+    "jsdoc": "jsdoc -c jsdoc.conf.json"
+  },
   "devDependencies": {
     "ink-docstrap": "^1.1.4",
     "jscs": "^2.11.0",
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 4027a7e834..dac3b16851 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -52,31 +52,6 @@
         </license>
     </licenses>
 
-    <profiles>
-        <profile>
-            <id>Windows</id>
-            <activation>
-                <os>
-                    <family>Windows</family>
-                </os>
-            </activation>
-            <properties>
-                <script.file>jsdoc.cmd</script.file>
-            </properties>
-        </profile>
-        <profile>
-            <id>unix</id>
-            <activation>
-                <os>
-                    <family>unix</family>
-                </os>
-            </activation>
-            <properties>
-                <script.file>jsdoc</script.file>
-            </properties>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <!-- Plugin to install npm artifacts -->
@@ -101,6 +76,16 @@
                             <goal>npm</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>run-exec-generate-jsdocs</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run jsdoc</arguments>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -130,25 +115,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>run-exec-generate-jsdocs</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <executable>${project.basedir}/node_modules/.bin/${script.file}</executable>
-                    <commandlineArgs>-c jsdoc.conf.json</commandlineArgs>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>

From 33bf503bf7781e8447a2e0de1a60ad600562b169 Mon Sep 17 00:00:00 2001
From: shraddhasingh683 <shraddhasingh683@gmail.com>
Date: Wed, 9 Sep 2026 16:23:59 +0530
Subject: [PATCH 07/46] FORMS-24568 Adding aep submit action for Submission
 service

---
 .../internal/models/v2/form/FormContainerImpl.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
index 66dab68e35..67b2025fa5 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
@@ -331,8 +331,13 @@ public String getAction() {
             if (resourceType != null && resourceType.contains("/franklin")) {
                 return "";
             } else {
+                // resource.getPath() is the guideContainer node ({pagePath}/jcr:content/guideContainer).
+                // for CC support in Submission service reads FormDefinition from <formName>.model.json
+                // so path is sanitized
+                String submitPath = StringUtils.replace(resource.getPath(),
+                    "/" + JcrConstants.JCR_CONTENT + "/" + GuideConstants.GUIDE_CONTAINER_NODE_NAME, "");
                 return "https://forms.adobe.com" + ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" +
-                    ComponentUtils.getEncodedPath(resource.getPath() + ".model.json");
+                    ComponentUtils.getEncodedPath(submitPath + ".model.json");
             }
         }
         return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId());

From a43db2fe3ea214c718ee3cee11b0715817e98505 Mon Sep 17 00:00:00 2001
From: Kartikey Gupta <kart@Kartikeys-MacBook-Pro-2.local>
Date: Fri, 28 Aug 2026 11:23:06 +0530
Subject: [PATCH 08/46] feat(recaptcha): support reCAPTCHA v3 in adaptive forms

Adds handling for the v3 site-key type across the recaptcha component:
- Client-side widget rendering and edit-dialog logic treat v3 the same
  as an invisible/score-based key, since v3 has no visible challenge.
- customFunctions.js fetches the v3 token locally (classic, non-enterprise
  grecaptcha namespace) since af-core's upstream fetchCaptchaToken only
  handles turnstile and Enterprise score-based keys.
- submitForm() is overridden to auto-fetch the captcha token before
  submit for v3 as well, matching the existing turnstile/Enterprise
  behavior.
- For XFA-rendered forms, the token is applied via
  globals.functions.dispatchEvent(field, 'custom:setProperty', {value})
  instead of a direct field.value assignment: @aemforms/af-core-xfa's
  rule-node proxy only implements a get trap (unlike af-core's, which
  also implements set), so a direct assignment invokes the real value
  setter with `this` bound to the proxy and crashes on internal
  `this.parent` access. Dispatching the update looks the field up by id
  on the raw form and applies it directly, avoiding the proxy entirely.
---
 .../models/v1/form/RecaptchaImplTest.java     |  10 ++
 .../clientlibs/editor/js/editDialog.js        |   4 +-
 .../clientlibs/site/js/recaptchawidget.js     |   7 +-
 ui.frontend/src/customFunctions.js            | 162 +++++++++++++++++-
 4 files changed, 177 insertions(+), 6 deletions(-)

diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
index 27a72bc697..c2eb0adbca 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
@@ -158,6 +158,16 @@ void getEnterpriseUrl() {
         assertEquals("https://www.recaptcha.net/recaptcha/enterprise.js", enterpriseUrl);
     }
 
+    @Test
+    void getV3Url() {
+        // reCAPTCHA v3 uses the classic (non-enterprise) endpoint, same as v2.
+        when(reCaptchaConfiguration.version()).thenReturn("v3");
+        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
+        Map<String, Object> captchaProps = recaptcha.getCaptchaProperties();
+        assertEquals("https://www.recaptcha.net/recaptcha/api.js", captchaProps.get("uri"));
+        assertEquals("v3", captchaProps.get("version"));
+    }
+
     @Test
     void testNoFieldType() {
         Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA_WITHOUT_FEILDTYPE, Captcha.class, context);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js
index 898a177076..90435bc98c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js
@@ -40,7 +40,9 @@
         const selectedVersion = selectedConfig.getAttribute("data-version");
         const selectedKeyType = selectedConfig.getAttribute("data-key.type");
         const inputs = recaptchaSize.querySelectorAll('input');
-        if (selectedVersion === "enterprise" && selectedKeyType === "score") {
+        // v3 has no keyType concept - it is always invisible/score-based, same as
+        // Enterprise's score-based key case.
+        if ((selectedVersion === "enterprise" && selectedKeyType === "score") || selectedVersion === "v3") {
             inputs.forEach(input => input.setAttribute("disabled", true));
         } else {
             inputs.forEach(input => input.removeAttribute("disabled"));
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js
index 7e9e67e149..0811650296 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js
@@ -45,11 +45,14 @@ if (typeof window.RecaptchaWidget === 'undefined') {
 
             var self = this;
             var recaptchaConfigData = this.#options;
+            // reCAPTCHA v3 has no "invisible" size setting like classic v2 - it is always
+            // badge-only/invisible, so it needs the same treatment as an explicit invisible size.
+            var isRecaptchaV3 = recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.version === "v3";
             element.innerHTML = '<div class="g-recaptcha"></div>';
             var gcontainer = document.getElementsByClassName("g-recaptcha")[0];
             var widgetId;
             var url = recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.uri;
-            if (recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.size == "invisible") {
+            if (recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.size == "invisible" || isRecaptchaV3) {
                 gcontainer.classList.add('g-recaptcha-invisible');
                 recaptchaConfigData.required = false;
             }
@@ -94,7 +97,7 @@ if (typeof window.RecaptchaWidget === 'undefined') {
             var runtimeLocale = this.#lang;
 
             var scr = document.createElement('script');
-            let queryParams = isScoreBasedKey() ? "?render=" + recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.siteKey
+            let queryParams = (isScoreBasedKey() || isRecaptchaV3) ? "?render=" + recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.siteKey
                 : "?onload=onloadRecaptchaCallback&render=explicit";
             queryParams += "&hl=" + runtimeLocale;
             scr.src = url + queryParams;
diff --git a/ui.frontend/src/customFunctions.js b/ui.frontend/src/customFunctions.js
index 64ae259d79..6fff0be0a6 100644
--- a/ui.frontend/src/customFunctions.js
+++ b/ui.frontend/src/customFunctions.js
@@ -20,6 +20,146 @@ import * as cf from "@aemforms/af-custom-functions";
  * @module FormView
  */
 
+/**
+ * Fetches the captcha token for the form.
+ *
+ * Delegates to @aemforms/af-custom-functions for turnstile and reCAPTCHA Enterprise (unchanged
+ * behavior). reCAPTCHA v3 is handled locally: the upstream package's fetchCaptchaToken only knows
+ * about the grecaptcha.enterprise namespace, but v3 site keys use the classic (non-enterprise)
+ * namespace and endpoint.
+ *
+ * @async
+ * @param {object} globals - An object containing read-only form instance, read-only target field instance and methods for form modifications.
+ * @returns {string} - The captcha token.
+ */
+function fetchCaptchaToken(globals) {
+    var captcha = globals.form.$captcha;
+    var config = captcha && captcha.$properties && captcha.$properties['fd:captcha'] && captcha.$properties['fd:captcha'].config;
+    if (!config || config.version !== 'v3') {
+        return cf.fetchCaptchaToken(globals);
+    }
+    return new Promise(function (resolve, reject) {
+        try {
+            var siteKey = config.siteKey;
+            var captchaElementName = captcha.$name.replaceAll('-', '_');
+            var captchaPath = captcha.$properties['fd:path'];
+            var formName = '';
+            var index = captchaPath ? captchaPath.indexOf('/jcr:content') : -1;
+            if (index > 0) {
+                captchaPath = captchaPath.substring(0, index);
+                formName = captchaPath.substring(captchaPath.lastIndexOf('/') + 1).replaceAll('-', '_');
+            }
+            var actionName = 'submit_' + formName + '_' + captchaElementName;
+            grecaptcha.ready(function () {
+                grecaptcha.execute(siteKey, {action: actionName})
+                    .then(function (token) { resolve(token); })
+                    .catch(function (error) { reject(error); });
+            });
+        } catch (error) {
+            reject(error);
+        }
+    });
+}
+
+function isArrayValue(obj) {
+    return obj !== null && Object.prototype.toString.call(obj) === '[object Array]';
+}
+
+function valueOf(a) {
+    if (a === null || a === undefined) {
+        return a;
+    }
+    if (isArrayValue(a)) {
+        return a.map(function (i) { return valueOf(i); });
+    }
+    return a.valueOf();
+}
+
+function toStringOrEmpty(a) {
+    if (a === null || a === undefined) {
+        return '';
+    }
+    return a.toString();
+}
+
+/**
+ * Overrides @aemforms/af-core's built-in submitForm() rule action.
+ *
+ * Faithfully reimplements the original (both its current and deprecated call signatures - see
+ * @aemforms/af-core's afb-runtime.js), but extends the auto-fetch-captcha-token-before-submit
+ * condition to also cover reCAPTCHA v3 (the upstream implementation only checks
+ * `captchaDisplayMode === "invisible"` (turnstile) or `version === "enterprise" && keyType ===
+ * "score"` - v3 matches neither, so its token never got fetched and the required field stayed
+ * empty at submit time). Registering a function under an existing name via
+ * FunctionRuntime.registerFunctions is the same mechanism @aemforms/af-core itself relies on host
+ * apps for (it has no default `fetchCaptchaToken` at all), so this is not a hack - custom
+ * function-table entries are looked up dynamically by name and always take precedence over
+ * defaults.
+ *
+ * @param {...*} args - Author-supplied arguments (payload/validateForm/contentType, or the
+ *  deprecated success/error/contentType/data/validateForm form), followed by the globals object
+ *  the framework always appends last.
+ * @returns {object} - Empty object, matching the original's return value.
+ */
+function submitForm() {
+    var allArgs = Array.prototype.slice.call(arguments);
+    var globals = allArgs.pop();
+    var args = allArgs;
+
+    var success = null, error = null, submit_data, validate_form, submit_as;
+    if (args.length > 0 && typeof valueOf(args[0]) === 'object') {
+        submit_data = args.length > 0 ? valueOf(args[0]) : null;
+        validate_form = args.length > 1 ? valueOf(args[1]) : true;
+        submit_as = args.length > 2 ? toStringOrEmpty(args[2]) : 'multipart/form-data';
+    } else {
+        success = toStringOrEmpty(args[0]);
+        error = toStringOrEmpty(args[1]);
+        submit_as = args.length > 2 ? toStringOrEmpty(args[2]) : 'multipart/form-data';
+        submit_data = args.length > 3 ? valueOf(args[3]) : null;
+        validate_form = args.length > 4 ? valueOf(args[4]) : true;
+    }
+
+    // globals.form is the rule-node proxy - nested field access requires the $-prefixed
+    // convention (matching fetchCaptchaToken's globals.form.$captcha above), unlike af-core's
+    // original implementation which operates on the raw (non-proxy) interpreter.globals.form.
+    //
+    // XFA-rendered forms use a separate npm package (@aemforms/af-core-xfa) whose rule-node
+    // proxy only defines a `get` trap (af-core's proxy also defines a `set` trap). Assigning
+    // captcha.value = token therefore falls through to the default Proxy set behaviour, which
+    // invokes Field's real `value` setter with `this` bound to the proxy instead of the raw
+    // field instance; the setter's own `this.parent.uniqueItems` lookup then goes through the
+    // same get trap, which has no case for bare (non-`$`, non-own-property) accessors like
+    // `parent` and returns undefined, so the setter throws. Routing the same update through
+    // globals.functions.dispatchEvent(captcha, 'custom:setProperty', {value}) instead - the same
+    // mechanism af-core's own working `set` trap uses internally - looks the field up by id on
+    // the raw (non-proxy) form and dispatches directly on it, so the setter runs with a real
+    // `this` and never touches the proxy.
+    var form = globals.form;
+    var captcha = form.$captcha;
+    var captchaConfig = captcha && captcha.$properties && captcha.$properties['fd:captcha'] &&
+        captcha.$properties['fd:captcha'].config;
+    var needsCaptchaToken = captcha && (
+        captcha.$captchaDisplayMode === 'invisible' ||
+        (captchaConfig && captchaConfig.version === 'enterprise' && captchaConfig.keyType === 'score') ||
+        (captchaConfig && captchaConfig.version === 'v3')
+    );
+    var submitPayload = {success: success, error: error, submit_as: submit_as, validate_form: validate_form, data: submit_data};
+
+    if (!needsCaptchaToken) {
+        globals.functions.dispatchEvent('submit', submitPayload);
+        return {};
+    }
+
+    return fetchCaptchaToken(globals).then(function (token) {
+        globals.functions.dispatchEvent(captcha, 'custom:setProperty', {value: token});
+        globals.functions.dispatchEvent('submit', submitPayload);
+        return {};
+    }).catch(function () {
+        globals.functions.dispatchEvent('submitError', {type: 'FetchCaptchaTokenFailed'});
+        return {};
+    });
+}
+
 /**
  * Namespace for custom functions.
  * @description Contains custom functions which can be used in the rule editor.
@@ -124,13 +264,14 @@ export const customFunctions = {
     /**
      * Fetches the captcha token for the form.
      *
-     * This function uses the Google reCAPTCHA Enterprise service to fetch the captcha token.
+     * Supports turnstile, reCAPTCHA Enterprise (via @aemforms/af-custom-functions), and
+     * reCAPTCHA v3 (handled locally - see fetchCaptchaToken above).
      *
      * @async
      * @param {object} globals - An object containing read-only form instance, read-only target field instance and methods for form modifications.
      * @returns {string} - The captcha token.
      */
-    fetchCaptchaToken: cf.fetchCaptchaToken,
+    fetchCaptchaToken: fetchCaptchaToken,
 
     /**
      * Converts a date to the number of days since the Unix epoch (1970-01-01).
@@ -166,5 +307,20 @@ export const customFunctions = {
     * @param {scope} globals - Global scope object containing form context
     * @returns {string|object} The complete form data as a JSON string
     */
-    exportFormData: cf.exportFormData
+    exportFormData: cf.exportFormData,
+
+    /**
+     * Submits the form.
+     *
+     * Overrides @aemforms/af-core's built-in submitForm() so that reCAPTCHA v3 also gets its
+     * token auto-fetched before submit (see submitForm above for why this is needed and why
+     * overriding by name is safe).
+     *
+     * @param {*} [payload] - Data to submit, or (deprecated usage) a success-redirect URL.
+     * @param {boolean} [validateForm] - Whether to validate the form before submitting, or
+     *  (deprecated usage) an error-redirect URL.
+     * @param {string} [contentType] - The content type to submit as.
+     * @returns {object} - Empty object.
+     */
+    submitForm: submitForm
 };

From c0ab50068047b0d8a2a3e94397d14f4453e99c77 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Wed, 2 Sep 2026 11:51:46 +0530
Subject: [PATCH 09/46] fix(recaptcha): register custom functions into XFA
 runtime at bundle load

Auto-fetch captcha (invisible reCAPTCHA v2, enterprise-score, and v3) failed on
XFA-backed adaptive forms embedded without an iframe: clicking Submit logged
"fetchCaptchaToken is not defined" and no token was fetched.

The frontend ships two runtime bundles - non-XFA (@aemforms/af-core) and XFA
(@aemforms/af-core-xfa) - each with its own FunctionRuntime. customFunctions were
only registered via setupFormContainer against the non-XFA runtime (window.FormView),
while the XFA form's rule engine runs in af-core-xfa and never received
fetchCaptchaToken (af-core-xfa ships no default for it), so its built-in submitForm
errored.

Register customFunctions at bundle load in the shared entry so each bundle populates
its own FunctionRuntime - in main-xfa.js this happens before the XFA form instance
(and its function-table snapshot) is created. registerFunctions is idempotent, so the
later setupFormContainer registration is unaffected.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ui.frontend/src/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui.frontend/src/index.js b/ui.frontend/src/index.js
index 8ac52985ff..557f1f1928 100644
--- a/ui.frontend/src/index.js
+++ b/ui.frontend/src/index.js
@@ -37,6 +37,14 @@ import {customFunctions} from "./customFunctions";
  */
 window.guideBridge = new GuideBridge();
 
+// Register the repo's custom functions at bundle load so BOTH runtimes get them. In the XFA
+// bundle (main-xfa.js) this populates af-core-xfa's FunctionRuntime before the XFA form model is
+// created; the container view only ever registers into the non-XFA runtime via window.FormView, so
+// the XFA rule engine would otherwise see only its built-in defaults and have no fetchCaptchaToken
+// (breaking auto-fetch captcha - invisible/enterprise-score/v3 - on no-iframe XFA embeds).
+// registerFunctions is idempotent, so the later setupFormContainer registration is unaffected.
+FunctionRuntime.registerFunctions(customFunctions);
+
 /**
  * The `Actions` object contains predefined action constants.
  * @type {object}

From f6b9b79cf7029f223eb27dcffc151b564dcf8f97 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Wed, 2 Sep 2026 11:51:57 +0530
Subject: [PATCH 10/46] fix(container): guard submit/save handlers against
 missing state.events under XFA

The container view's submitSuccess/submitError/saveSuccess/saveError handlers read
action.target.getState().events, but the XFA runtime's getState() omits `events`, so
the handlers threw "Cannot read properties of undefined" on submit/save. This was
previously masked by an earlier captcha error and surfaced once captcha submit
succeeds on no-iframe XFA embeds.

Guard the access with optional chaining; a missing events object means no rule is
configured, so the default handler runs (thank-you / error UX). No-op for the non-XFA
runtime where events is always present.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../container/clientlibs/site/js/formcontainerview.js  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/formcontainerview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/formcontainerview.js
index 8ef966825e..6ac34c622e 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/formcontainerview.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/formcontainerview.js
@@ -34,7 +34,9 @@
             this._model.subscribe((action) => {
                 let state = action.target.getState();
                 // execute the handler only if there are no rules configured on submitSuccess event.
-                if (!state.events.submitSuccess || state.events.submitSuccess.length === 0) {
+                // getState() omits `events` in the XFA runtime, so guard the access (optional
+                // chaining) to avoid a TypeError; a missing events object means no rule is configured.
+                if (!state.events?.submitSuccess || state.events.submitSuccess.length === 0) {
                     const globals = {
                         form: self.getModel().getRuleNode(),
                         event: {
@@ -48,7 +50,7 @@
             this._model.subscribe((action) => {
                 let state = action.target.getState();
                 // execute the handler only if there are no rules configured on submitError event.
-                if (!state.events.submitError || state.events.submitError.length === 0) {
+                if (!state.events?.submitError || state.events.submitError.length === 0) {
                     let defaultSubmissionError = FormView.LanguageUtils.getTranslatedString(self.getLang(), "InternalFormSubmissionError");
                     const globals = {
                         form: self.getModel().getRuleNode(),
@@ -64,7 +66,7 @@
             this._model.subscribe((action) => {
                 let state = action.target.getState();
                 // execute the handler only if there are no rules configured on custom:saveSuccess event.
-                if (!state.events['custom:saveSuccess'] || state.events['custom:saveSuccess'].length === 0) {
+                if (!state.events?.['custom:saveSuccess'] || state.events['custom:saveSuccess'].length === 0) {
                     console.log("Draft id = " + action?.payload?.body?.draftId);
                     window.alert(FormView.LanguageUtils.getTranslatedString(self.getLang(), "saveDraftSuccessMessage"));
                 }
@@ -72,7 +74,7 @@
             this._model.subscribe((action) => {
                 let state = action.target.getState();
                 // execute the handler only if there are no rules configured on custom:saveError event.
-                if (!state.events['custom:saveError'] || state.events['custom:saveError'].length === 0) {
+                if (!state.events?.['custom:saveError'] || state.events['custom:saveError'].length === 0) {
                     window.alert(FormView.LanguageUtils.getTranslatedString(self.getLang(), "saveDraftErrorMessage"));
                 }
             }, "saveError");

From 659c3331ad77d4f02ecaef30844dc912a0d61944 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 11 Sep 2026 14:46:27 +0530
Subject: [PATCH 11/46] refactor(recaptcha): drop submitForm override; v3 via
 captchaDisplayMode + tests

Address review feedback on reCAPTCHA v3 support:
- RecaptchaImpl.getCaptchaDisplayMode() returns "invisible" for v3 so af-core's
  built-in submitForm auto-fetches the token natively (both af-core and
  af-core-xfa runtimes), removing the need to override submitForm.
- Remove the customFunctions.js submitForm override and its helpers
  (isArrayValue/valueOf/toStringOrEmpty), which only existed to support it.
- Add Cypress authoring + runtime specs for v3 and the v3 IT fixtures
  (cloud config + sample page).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../models/v1/form/RecaptchaImpl.java         |  28 +++++
 .../models/v1/form/RecaptchaImplTest.java     |  15 +++
 .../form/recaptcha/exporter-recaptcha.json    |   1 +
 .../cloudconfigs/recaptcha/v3/.content.xml    |  17 +++
 .../samples/recaptcha/v3/.content.xml         |  67 ++++++++++
 ui.frontend/src/customFunctions.js            | 116 +-----------------
 .../specs/recaptcha/recaptcha.authoring.cy.js |   6 +
 .../specs/recaptcha/recaptcha.runtime.cy.js   |  33 +++++
 8 files changed, 168 insertions(+), 115 deletions(-)
 create mode 100644 it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
 create mode 100644 it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java
index 3f93b6f050..d7b53b7a6b 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java
@@ -31,6 +31,8 @@
 import org.apache.sling.models.annotations.injectorspecific.OSGiService;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
 import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.adobe.aemds.guide.model.ReCaptchaConfigurationModel;
 import com.adobe.aemds.guide.service.CloudConfigurationProvider;
@@ -50,6 +52,8 @@
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public class RecaptchaImpl extends AbstractCaptchaImpl implements Captcha {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(RecaptchaImpl.class);
+
     @Inject
     private ResourceResolver resourceResolver;
 
@@ -123,4 +127,28 @@ public Map<String, Object> getCaptchaProperties() throws GuideException {
         return customCaptchaProperties;
 
     }
+
+    @Override
+    public String getCaptchaDisplayMode() {
+        // reCAPTCHA v3 has no visible challenge (badge-only), so it is treated as invisible. This
+        // lets the runtime's built-in submitForm auto-fetch the token before submit, the same way
+        // it already does for invisible turnstile and enterprise-score keys.
+        CaptchaDisplayMode captchaDisplayMode = CaptchaDisplayMode.VISIBLE;
+        String version = null;
+        resource = resourceResolver.getResource(this.getPath());
+        if (resource != null && cloudConfigurationProvider != null) {
+            try {
+                reCaptchaConfiguration = cloudConfigurationProvider.getRecaptchaCloudConfiguration(resource);
+                if (reCaptchaConfiguration != null) {
+                    version = reCaptchaConfiguration.version();
+                }
+            } catch (GuideException e) {
+                LOGGER.error("[AF] [Captcha] [RECAPTCHA] Error while fetching cloud configuration to resolve display mode.", e);
+            }
+        }
+        if ("v3".equals(version)) {
+            captchaDisplayMode = CaptchaDisplayMode.INVISIBLE;
+        }
+        return captchaDisplayMode.getValue();
+    }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
index c2eb0adbca..cc89a223d6 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
@@ -168,6 +168,21 @@ void getV3Url() {
         assertEquals("v3", captchaProps.get("version"));
     }
 
+    @Test
+    void getCaptchaDisplayModeForV3() {
+        // v3 has no visible challenge, so it must report as invisible for auto token fetch on submit.
+        when(reCaptchaConfiguration.version()).thenReturn("v3");
+        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
+        assertEquals("invisible", recaptcha.getCaptchaDisplayMode());
+    }
+
+    @Test
+    void getCaptchaDisplayModeForNonV3() {
+        when(reCaptchaConfiguration.version()).thenReturn("enterprise");
+        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
+        assertEquals("visible", recaptcha.getCaptchaDisplayMode());
+    }
+
     @Test
     void testNoFieldType() {
         Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA_WITHOUT_FEILDTYPE, Captcha.class, context);
diff --git a/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json b/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json
index 636bd13dc3..22d6912e65 100644
--- a/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json
+++ b/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json
@@ -31,5 +31,6 @@
     },
     "customProp": "customPropValue"
   },
+  "captchaDisplayMode": "visible",
   ":type": "core/fd/components/form/recaptcha/v1/recaptcha"
 }
\ No newline at end of file
diff --git a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
new file mode 100644
index 0000000000..88820e62de
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:lastModified="{Date}2024-05-21T17:20:26.859+05:30"
+        cq:lastModifiedBy="admin"
+        cq:template="/libs/fd/af/cloudservices/recaptcha/template"
+        jcr:lastModified="{Date}2024-05-21T17:20:26.842+05:30"
+        jcr:lastModifiedBy="admin"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="v3Config"
+        sling:resourceType="fd/af/cloudservices/recaptcha/page"
+        name="v3"
+        secretKey="placeholder-v3-secret-key"
+        siteKey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
+        version="v3"/>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml
new file mode 100644
index 0000000000..0e8ecf4e34
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:conf="/conf/core-components-it/samples/recaptcha/basic"
+        cq:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2024-05-24T17:33:40.560+05:30"
+        cq:lastModifiedBy="admin"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="v3"
+        sling:configRef="/conf/forms/core-components-it/samples/recaptcha/v3/"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            jcr:lastModified="{Date}2024-05-24T17:33:40.543+05:30"
+            jcr:lastModifiedBy="admin"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container"
+            actionType="forms-core-components-it/customsubmission/logsubmit"
+            dorType="none"
+            fieldType="form"
+            schemaType="none"
+            specVersion="0.13.0"
+            textIsRich="true"
+            thankYouMessage="Thank you for submitting the form."
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="v3">
+            <recaptcha
+                jcr:lastModified="{Date}2024-05-24T17:33:17.916+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="CAPTCHA"
+                sling:resourceType="forms-core-components-it/form/recaptcha"
+                cloudServicePath="v2checkbox"
+                enabled="{Boolean}true"
+                fieldType="captcha"
+                hideTitle="false"
+                name="recaptcha-test"
+                rcCloudServicePath="v3"
+                readOnly="{Boolean}false"
+                size="normal"
+                textIsRich="true"
+                unboundFormElement="{Boolean}false"
+                required="{Boolean}true"
+                visible="{Boolean}true"/>
+            <submit
+                jcr:created="{Date}2024-05-24T17:33:23.737+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2024-05-24T17:33:23.737+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Submit"
+                sling:resourceType="forms-components-examples/components/form/actions/submit"
+                buttonType="submit"
+                dorExclusion="true"
+                fieldType="button"
+                name="submit1716552204262">
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[submitForm()]"/>
+            </submit>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.frontend/src/customFunctions.js b/ui.frontend/src/customFunctions.js
index 6fff0be0a6..bd5a689f8d 100644
--- a/ui.frontend/src/customFunctions.js
+++ b/ui.frontend/src/customFunctions.js
@@ -61,105 +61,6 @@ function fetchCaptchaToken(globals) {
     });
 }
 
-function isArrayValue(obj) {
-    return obj !== null && Object.prototype.toString.call(obj) === '[object Array]';
-}
-
-function valueOf(a) {
-    if (a === null || a === undefined) {
-        return a;
-    }
-    if (isArrayValue(a)) {
-        return a.map(function (i) { return valueOf(i); });
-    }
-    return a.valueOf();
-}
-
-function toStringOrEmpty(a) {
-    if (a === null || a === undefined) {
-        return '';
-    }
-    return a.toString();
-}
-
-/**
- * Overrides @aemforms/af-core's built-in submitForm() rule action.
- *
- * Faithfully reimplements the original (both its current and deprecated call signatures - see
- * @aemforms/af-core's afb-runtime.js), but extends the auto-fetch-captcha-token-before-submit
- * condition to also cover reCAPTCHA v3 (the upstream implementation only checks
- * `captchaDisplayMode === "invisible"` (turnstile) or `version === "enterprise" && keyType ===
- * "score"` - v3 matches neither, so its token never got fetched and the required field stayed
- * empty at submit time). Registering a function under an existing name via
- * FunctionRuntime.registerFunctions is the same mechanism @aemforms/af-core itself relies on host
- * apps for (it has no default `fetchCaptchaToken` at all), so this is not a hack - custom
- * function-table entries are looked up dynamically by name and always take precedence over
- * defaults.
- *
- * @param {...*} args - Author-supplied arguments (payload/validateForm/contentType, or the
- *  deprecated success/error/contentType/data/validateForm form), followed by the globals object
- *  the framework always appends last.
- * @returns {object} - Empty object, matching the original's return value.
- */
-function submitForm() {
-    var allArgs = Array.prototype.slice.call(arguments);
-    var globals = allArgs.pop();
-    var args = allArgs;
-
-    var success = null, error = null, submit_data, validate_form, submit_as;
-    if (args.length > 0 && typeof valueOf(args[0]) === 'object') {
-        submit_data = args.length > 0 ? valueOf(args[0]) : null;
-        validate_form = args.length > 1 ? valueOf(args[1]) : true;
-        submit_as = args.length > 2 ? toStringOrEmpty(args[2]) : 'multipart/form-data';
-    } else {
-        success = toStringOrEmpty(args[0]);
-        error = toStringOrEmpty(args[1]);
-        submit_as = args.length > 2 ? toStringOrEmpty(args[2]) : 'multipart/form-data';
-        submit_data = args.length > 3 ? valueOf(args[3]) : null;
-        validate_form = args.length > 4 ? valueOf(args[4]) : true;
-    }
-
-    // globals.form is the rule-node proxy - nested field access requires the $-prefixed
-    // convention (matching fetchCaptchaToken's globals.form.$captcha above), unlike af-core's
-    // original implementation which operates on the raw (non-proxy) interpreter.globals.form.
-    //
-    // XFA-rendered forms use a separate npm package (@aemforms/af-core-xfa) whose rule-node
-    // proxy only defines a `get` trap (af-core's proxy also defines a `set` trap). Assigning
-    // captcha.value = token therefore falls through to the default Proxy set behaviour, which
-    // invokes Field's real `value` setter with `this` bound to the proxy instead of the raw
-    // field instance; the setter's own `this.parent.uniqueItems` lookup then goes through the
-    // same get trap, which has no case for bare (non-`$`, non-own-property) accessors like
-    // `parent` and returns undefined, so the setter throws. Routing the same update through
-    // globals.functions.dispatchEvent(captcha, 'custom:setProperty', {value}) instead - the same
-    // mechanism af-core's own working `set` trap uses internally - looks the field up by id on
-    // the raw (non-proxy) form and dispatches directly on it, so the setter runs with a real
-    // `this` and never touches the proxy.
-    var form = globals.form;
-    var captcha = form.$captcha;
-    var captchaConfig = captcha && captcha.$properties && captcha.$properties['fd:captcha'] &&
-        captcha.$properties['fd:captcha'].config;
-    var needsCaptchaToken = captcha && (
-        captcha.$captchaDisplayMode === 'invisible' ||
-        (captchaConfig && captchaConfig.version === 'enterprise' && captchaConfig.keyType === 'score') ||
-        (captchaConfig && captchaConfig.version === 'v3')
-    );
-    var submitPayload = {success: success, error: error, submit_as: submit_as, validate_form: validate_form, data: submit_data};
-
-    if (!needsCaptchaToken) {
-        globals.functions.dispatchEvent('submit', submitPayload);
-        return {};
-    }
-
-    return fetchCaptchaToken(globals).then(function (token) {
-        globals.functions.dispatchEvent(captcha, 'custom:setProperty', {value: token});
-        globals.functions.dispatchEvent('submit', submitPayload);
-        return {};
-    }).catch(function () {
-        globals.functions.dispatchEvent('submitError', {type: 'FetchCaptchaTokenFailed'});
-        return {};
-    });
-}
-
 /**
  * Namespace for custom functions.
  * @description Contains custom functions which can be used in the rule editor.
@@ -307,20 +208,5 @@ export const customFunctions = {
     * @param {scope} globals - Global scope object containing form context
     * @returns {string|object} The complete form data as a JSON string
     */
-    exportFormData: cf.exportFormData,
-
-    /**
-     * Submits the form.
-     *
-     * Overrides @aemforms/af-core's built-in submitForm() so that reCAPTCHA v3 also gets its
-     * token auto-fetched before submit (see submitForm above for why this is needed and why
-     * overriding by name is safe).
-     *
-     * @param {*} [payload] - Data to submit, or (deprecated usage) a success-redirect URL.
-     * @param {boolean} [validateForm] - Whether to validate the form before submitting, or
-     *  (deprecated usage) an error-redirect URL.
-     * @param {string} [contentType] - The content type to submit as.
-     * @returns {object} - Empty object.
-     */
-    submitForm: submitForm
+    exportFormData: cf.exportFormData
 };
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js
index 0d4422af2e..ebc55b75de 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js
@@ -75,6 +75,12 @@ describe('Page - Authoring', function () {
         cy.get("input[name='./recaptchaSize'][value='normal']").should("be.disabled");
         cy.get("input[name='./recaptchaSize'][value='compact']").should("be.disabled");
 
+        // reCAPTCHA v3 is badge-only (no visible challenge), so size must be disabled like enterprise-score.
+        cy.get(".cmp-adaptiveform-recaptcha__configuration").click().then(() => {
+            cy.get("coral-selectlist-item[value='v3']").click();
+            cy.get("input[name='./recaptchaSize'][value='normal']").should("be.disabled");
+            cy.get("input[name='./recaptchaSize'][value='compact']").should("be.disabled");
+        })
 
         cy.get(".cmp-adaptiveform-recaptcha__configuration").click().then(() => {
             cy.get("coral-selectlist-item[value='v2checkbox']").click();
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index a83ac617bd..8552a4966b 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -20,6 +20,7 @@ describe("Form Runtime with Recaptcha Input", () => {
     const pagePath = "content/forms/af/core-components-it/samples/recaptcha/basic.html"
     const v2checkboxPagePath = "content/forms/af/core-components-it/samples/recaptcha/v2checkbox.html"
     const enterprisePagePath = "content/forms/af/core-components-it/samples/recaptcha/enterprisescore.html"
+    const v3PagePath = "content/forms/af/core-components-it/samples/recaptcha/v3.html"
     const bemBlock = 'cmp-adaptiveform-recaptcha'
     const IS = "adaptiveFormRecaptcha"
     const selectors = {
@@ -238,4 +239,36 @@ describe("Form Runtime with Recaptcha Input", () => {
             });
         }
     })
+
+    it("should render reCAPTCHA v3 as an invisible badge", () => {
+        cy.previewForm(v3PagePath).then((p) => {
+            formContainer = p;
+        });
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        cy.wrap().then(() => {
+            const [id] = Object.entries(formContainer._fields).find(([id]) => id.includes("captcha"));
+            // v3 has no visible challenge; the widget must render badge-only (invisible).
+            cy.get(`#${id} .cmp-adaptiveform-recaptcha__widget > div.g-recaptcha`)
+                .should('exist')
+                .and('have.class', 'g-recaptcha-invisible');
+        });
+    })
+
+    // Skipped: a passing v3 submission needs a real, Google-registered v3 site+secret key pair.
+    // Unlike v2, reCAPTCHA v3 has no universal always-pass public test key, so grecaptcha.execute
+    // cannot produce a token the server will verify against a placeholder key. Enable this once a
+    // real v3 key is provisioned in the v3 cloud config fixture.
+    it.skip("submission should pass for reCAPTCHA v3", () => {
+        cy.previewForm(v3PagePath).then((p) => {
+            formContainer = p;
+        });
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
+        cy.get(`div.g-recaptcha`).should('exist').then(() => {
+            cy.get(`.cmp-adaptiveform-button__widget`).click();
+            cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
+                expect(interception.response.statusCode).to.equal(200);
+            });
+        });
+    })
 })

From 611c04f59160ffb09387835202f727ed0d1b7d79 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 11 Sep 2026 15:03:40 +0530
Subject: [PATCH 12/46] refactor(recaptcha): delegate v3 token fetch to
 @aemforms/af-custom-functions

Collapse the local fetchCaptchaToken wrapper to a plain re-export of
cf.fetchCaptchaToken now that v3 support lives upstream in
@aemforms/af-custom-functions, removing the duplicated v3 grecaptcha.execute
logic.

Requires an @aemforms/af-custom-functions release that includes v3 support
plus a matching dependency bump; until that lands, v3 relies on a local
symlink to the updated package.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 ui.frontend/src/customFunctions.js | 46 ++----------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/ui.frontend/src/customFunctions.js b/ui.frontend/src/customFunctions.js
index bd5a689f8d..42cbab36b3 100644
--- a/ui.frontend/src/customFunctions.js
+++ b/ui.frontend/src/customFunctions.js
@@ -20,47 +20,6 @@ import * as cf from "@aemforms/af-custom-functions";
  * @module FormView
  */
 
-/**
- * Fetches the captcha token for the form.
- *
- * Delegates to @aemforms/af-custom-functions for turnstile and reCAPTCHA Enterprise (unchanged
- * behavior). reCAPTCHA v3 is handled locally: the upstream package's fetchCaptchaToken only knows
- * about the grecaptcha.enterprise namespace, but v3 site keys use the classic (non-enterprise)
- * namespace and endpoint.
- *
- * @async
- * @param {object} globals - An object containing read-only form instance, read-only target field instance and methods for form modifications.
- * @returns {string} - The captcha token.
- */
-function fetchCaptchaToken(globals) {
-    var captcha = globals.form.$captcha;
-    var config = captcha && captcha.$properties && captcha.$properties['fd:captcha'] && captcha.$properties['fd:captcha'].config;
-    if (!config || config.version !== 'v3') {
-        return cf.fetchCaptchaToken(globals);
-    }
-    return new Promise(function (resolve, reject) {
-        try {
-            var siteKey = config.siteKey;
-            var captchaElementName = captcha.$name.replaceAll('-', '_');
-            var captchaPath = captcha.$properties['fd:path'];
-            var formName = '';
-            var index = captchaPath ? captchaPath.indexOf('/jcr:content') : -1;
-            if (index > 0) {
-                captchaPath = captchaPath.substring(0, index);
-                formName = captchaPath.substring(captchaPath.lastIndexOf('/') + 1).replaceAll('-', '_');
-            }
-            var actionName = 'submit_' + formName + '_' + captchaElementName;
-            grecaptcha.ready(function () {
-                grecaptcha.execute(siteKey, {action: actionName})
-                    .then(function (token) { resolve(token); })
-                    .catch(function (error) { reject(error); });
-            });
-        } catch (error) {
-            reject(error);
-        }
-    });
-}
-
 /**
  * Namespace for custom functions.
  * @description Contains custom functions which can be used in the rule editor.
@@ -165,14 +124,13 @@ export const customFunctions = {
     /**
      * Fetches the captcha token for the form.
      *
-     * Supports turnstile, reCAPTCHA Enterprise (via @aemforms/af-custom-functions), and
-     * reCAPTCHA v3 (handled locally - see fetchCaptchaToken above).
+     * Supports turnstile, reCAPTCHA Enterprise, and reCAPTCHA v3 via @aemforms/af-custom-functions.
      *
      * @async
      * @param {object} globals - An object containing read-only form instance, read-only target field instance and methods for form modifications.
      * @returns {string} - The captcha token.
      */
-    fetchCaptchaToken: fetchCaptchaToken,
+    fetchCaptchaToken: cf.fetchCaptchaToken,
 
     /**
      * Converts a date to the number of days since the Unix epoch (1970-01-01).

From 2911ca86283fcf11645a0a72a2c493ab0573eb82 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Mon, 14 Sep 2026 15:00:36 +0530
Subject: [PATCH 13/46] test(recaptcha): add v3 submission cypress test and
 real site key

- Add "submission should pass for reCAPTCHA v3" runtime test plus the
  updateRecaptchaV3Config helper (secret injected via the
  RECAPTCHA_V3_API_KEY env var; low threshold for headless reliability).
- Set the real v3 site key in the v3 cloud config fixture (site keys are
  public; the secret stays out of git).
- Gitignore ui.tests/test-module/cypress.env.json so the local secret is
  never committed.

Verified end-to-end locally: v3 form submit -> POST /adobe/forms/af/submit -> 200.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../cloudconfigs/recaptcha/v3/.content.xml    |  2 +-
 ui.tests/test-module/.gitignore               |  2 +
 .../specs/recaptcha/recaptcha.runtime.cy.js   | 45 ++++++++++++++-----
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 ui.tests/test-module/.gitignore

diff --git a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
index 88820e62de..c729bef5c7 100644
--- a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
+++ b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
@@ -12,6 +12,6 @@
         sling:resourceType="fd/af/cloudservices/recaptcha/page"
         name="v3"
         secretKey="placeholder-v3-secret-key"
-        siteKey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
+        siteKey="6LdV1LUtAAAAAM4xLHqg4bxuxl1LKWvWoIcG9Zqd"
         version="v3"/>
 </jcr:root>
diff --git a/ui.tests/test-module/.gitignore b/ui.tests/test-module/.gitignore
new file mode 100644
index 0000000000..2563da53f0
--- /dev/null
+++ b/ui.tests/test-module/.gitignore
@@ -0,0 +1,2 @@
+# Local Cypress secrets/overrides — must never be committed
+cypress.env.json
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index 8552a4966b..c43e52a1c2 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -121,6 +121,15 @@ describe("Form Runtime with Recaptcha Input", () => {
         })
     }
 
+    function updateRecaptchaV3Config(score) {
+        const secretKey = Cypress.env('RECAPTCHA_V3_API_KEY');
+        cy.openPage("/mnt/overlay/fd/af/cloudservices/recaptcha/properties.html?item=%2Fconf%2Fcore-components-it%2Fsamples%2Frecaptcha%2Fbasic%2Fsettings%2Fcloudconfigs%2Frecaptcha%2Fv3").then(x => {
+            cy.get('#recaptcha-cloudconfiguration-secret-key').clear().type(secretKey);
+            cy.get('#recaptcha-cloudconfiguration-threshold-score').clear().type(score);
+            cy.get("#shell-propertiespage-doneactivator").click();
+        })
+    }
+
 
     it("client side validation should fail if recaptcha is not filled", () => {
         cy.previewForm(v2checkboxPagePath).then((p) => {
@@ -254,20 +263,36 @@ describe("Form Runtime with Recaptcha Input", () => {
         });
     })
 
-    // Skipped: a passing v3 submission needs a real, Google-registered v3 site+secret key pair.
-    // Unlike v2, reCAPTCHA v3 has no universal always-pass public test key, so grecaptcha.execute
-    // cannot produce a token the server will verify against a placeholder key. Enable this once a
-    // real v3 key is provisioned in the v3 cloud config fixture.
-    it.skip("submission should pass for reCAPTCHA v3", () => {
+    it("submission should pass for reCAPTCHA v3", () => {
+        // v3 is score-based; use a low threshold so a token fetched from a headless browser passes
+        // server-side verification (this test exercises the token fetch + submit flow, not scoring).
+        // The secret key is injected via the RECAPTCHA_V3_API_KEY env var; the site key lives in the
+        // v3 cloud config fixture.
+        updateRecaptchaV3Config(0.1);
         cy.previewForm(v3PagePath).then((p) => {
             formContainer = p;
         });
         expect(formContainer, "formcontainer is initialized").to.not.be.null;
-        cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
-        cy.get(`div.g-recaptcha`).should('exist').then(() => {
-            cy.get(`.cmp-adaptiveform-button__widget`).click();
-            cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
-                expect(interception.response.statusCode).to.equal(200);
+        cy.get(`div.grecaptcha-badge`).should('exist').then(() => {
+            cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
+            const submitForm = () => {
+                cy.get(`.cmp-adaptiveform-button__widget`).click();
+                return cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
+                    if (interception.response.statusCode === 200) {
+                        cy.log('Submit request succeeded');
+                        return cy.wrap(true);
+                    } else {
+                        cy.log('Submit request failed, retrying...');
+                        return cy.wrap(false);
+                    }
+                });
+            };
+            // Retry like the enterprise-score test, since reCAPTCHA can intermittently return a
+            // browser-error on the first assessment.
+            cy.waitUntil(() => submitForm(), {
+                errorMsg: 'Maximum retry limit reached, request did not succeed',
+                timeout: 50000,
+                interval: 5000,
             });
         });
     })

From 33e0f1f4c4cf7ab22fdc0fd5b09747310008c411 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Tue, 15 Sep 2026 13:07:17 +0530
Subject: [PATCH 14/46] fix(recaptcha): force-set v3 threshold field hidden
 under ent-fields container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On the addon build CI runs, the Threshold Score field is nested inside the
enterprise-fields container which is display:none for a v3 config, so Cypress
refused to clear/type into it ("element is not visible"), failing the v3
submission test. Use {force: true} — a hidden input is still submitted on save —
so the threshold is applied and the v3 submit flow runs.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../specs/recaptcha/recaptcha.runtime.cy.js          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index c43e52a1c2..679ef57509 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -125,7 +125,10 @@ describe("Form Runtime with Recaptcha Input", () => {
         const secretKey = Cypress.env('RECAPTCHA_V3_API_KEY');
         cy.openPage("/mnt/overlay/fd/af/cloudservices/recaptcha/properties.html?item=%2Fconf%2Fcore-components-it%2Fsamples%2Frecaptcha%2Fbasic%2Fsettings%2Fcloudconfigs%2Frecaptcha%2Fv3").then(x => {
             cy.get('#recaptcha-cloudconfiguration-secret-key').clear().type(secretKey);
-            cy.get('#recaptcha-cloudconfiguration-threshold-score').clear().type(score);
+            // v3 is score-based, but some addon builds nest Threshold Score inside the
+            // enterprise-fields container and hide it (display:none) for v3. Force past the
+            // visibility check — a hidden input is still submitted on save — so the threshold applies.
+            cy.get('#recaptcha-cloudconfiguration-threshold-score').clear({force: true}).type(score, {force: true});
             cy.get("#shell-propertiespage-doneactivator").click();
         })
     }
@@ -264,10 +267,9 @@ describe("Form Runtime with Recaptcha Input", () => {
     })
 
     it("submission should pass for reCAPTCHA v3", () => {
-        // v3 is score-based; use a low threshold so a token fetched from a headless browser passes
-        // server-side verification (this test exercises the token fetch + submit flow, not scoring).
-        // The secret key is injected via the RECAPTCHA_V3_API_KEY env var; the site key lives in the
-        // v3 cloud config fixture.
+        // Exercises the v3 token fetch + submit flow. The secret key is injected via the
+        // RECAPTCHA_V3_API_KEY env var; the site key lives in the v3 cloud config fixture.
+        // Low threshold so a token from a headless browser passes server-side verification.
         updateRecaptchaV3Config(0.1);
         cy.previewForm(v3PagePath).then((p) => {
             formContainer = p;

From 29d9882fd935ef18935217e1d68039916df35a73 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Tue, 15 Sep 2026 16:51:38 +0530
Subject: [PATCH 15/46] fix(recaptcha): target inner input for v3 threshold
 field in cypress test

The v3 threshold field is a coral-numberinput nested in the hidden
enterprise-fields container, so the wrapper is never upgraded to a
clearable element and cy.clear() fails even with {force:true}. Target
the inner native input, which is always clearable regardless of the
wrapper's visibility/upgrade state, and syncs to the field on save.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../test-module/specs/recaptcha/recaptcha.runtime.cy.js  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index 679ef57509..6f58770fa7 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -125,10 +125,11 @@ describe("Form Runtime with Recaptcha Input", () => {
         const secretKey = Cypress.env('RECAPTCHA_V3_API_KEY');
         cy.openPage("/mnt/overlay/fd/af/cloudservices/recaptcha/properties.html?item=%2Fconf%2Fcore-components-it%2Fsamples%2Frecaptcha%2Fbasic%2Fsettings%2Fcloudconfigs%2Frecaptcha%2Fv3").then(x => {
             cy.get('#recaptcha-cloudconfiguration-secret-key').clear().type(secretKey);
-            // v3 is score-based, but some addon builds nest Threshold Score inside the
-            // enterprise-fields container and hide it (display:none) for v3. Force past the
-            // visibility check — a hidden input is still submitted on save — so the threshold applies.
-            cy.get('#recaptcha-cloudconfiguration-threshold-score').clear({force: true}).type(score, {force: true});
+            // v3 is score-based, but the addon dialog nests Threshold Score inside the hidden
+            // enterprise-fields container for v3, so the coral-numberinput wrapper is never
+            // upgraded to a clearable element. Target its inner native input directly and force
+            // past the visibility check — the value still syncs to the field and is submitted on save.
+            cy.get('#recaptcha-cloudconfiguration-threshold-score input').clear({force: true}).type(score, {force: true});
             cy.get("#shell-propertiespage-doneactivator").click();
         })
     }

From d80dc19f67cad22ee4b4361662c713896fdd9ba3 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Tue, 15 Sep 2026 20:20:54 +0530
Subject: [PATCH 16/46] chore(deps): bump @aemforms/af-custom-functions to
 1.0.18 for reCAPTCHA v3

1.0.18 (published to npm) contains the v3 token-fetch fix that routes v3
site keys through the classic grecaptcha namespace. customFunctions.js
already delegates to cf.fetchCaptchaToken, so this makes the branch
CI-safe now that the version is available in the registry.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ui.frontend/package-lock.json | 14 +++++++-------
 ui.frontend/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
index 80e6344e9b..40bf8a7f1f 100644
--- a/ui.frontend/package-lock.json
+++ b/ui.frontend/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@aemforms/af-core": "^1.0.4",
         "@aemforms/af-core-xfa": "^0.1.6",
-        "@aemforms/af-custom-functions": "1.0.17",
+        "@aemforms/af-custom-functions": "1.0.18",
         "@aemforms/af-formatters": "^1.0.4"
       },
       "devDependencies": {
@@ -132,9 +132,9 @@
       "integrity": "sha512-DYnCttgM5S+7nDDn0wR4J8UF0e1ZUXCidK40ZNfDorWKYfCYpb90M6PD64JRv0bnY9vrYWGMaeTxeM69lUe0PA=="
     },
     "node_modules/@aemforms/af-custom-functions": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.17.tgz",
-      "integrity": "sha512-gDPC/Ly/+aQ7ojSPWm4JM3Zs+NUA+8c6bhjVbKm058AX5UEsXRk+N2o9wK4AHrdsaiR21vmvDuIUyUR2Jb2LTA=="
+      "version": "1.0.18",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.18.tgz",
+      "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
     },
     "node_modules/@aemforms/af-formatters": {
       "version": "1.0.4",
@@ -11164,9 +11164,9 @@
       }
     },
     "@aemforms/af-custom-functions": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.17.tgz",
-      "integrity": "sha512-gDPC/Ly/+aQ7ojSPWm4JM3Zs+NUA+8c6bhjVbKm058AX5UEsXRk+N2o9wK4AHrdsaiR21vmvDuIUyUR2Jb2LTA=="
+      "version": "1.0.18",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.18.tgz",
+      "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
     },
     "@aemforms/af-formatters": {
       "version": "1.0.4",
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
index 3dc5ee7e42..d7a6f6f6b2 100644
--- a/ui.frontend/package.json
+++ b/ui.frontend/package.json
@@ -28,6 +28,6 @@
     "@aemforms/af-core": "^1.0.4",
     "@aemforms/af-core-xfa": "^0.1.6",
     "@aemforms/af-formatters": "^1.0.4",
-    "@aemforms/af-custom-functions": "1.0.17"
+    "@aemforms/af-custom-functions": "1.0.18"
   }
 }

From 61c2ea0859232a5e688a66aa0ed4e544daa414d0 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Wed, 16 Sep 2026 01:52:44 +0530
Subject: [PATCH 17/46] test(recaptcha): use Google's public test key for v3
 submission test

Switch the v3 site/secret key to Google's published test pair, which always
returns a constant score of 0.9 server-side regardless of domain. This makes
the submission test deterministic and removes the retry-until-success loop
and the RECAPTCHA_V3_API_KEY dependency that were needed to work around real
scoring variability in headless CI browsers.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../cloudconfigs/recaptcha/v3/.content.xml    |  2 +-
 .../specs/recaptcha/recaptcha.runtime.cy.js   | 32 ++++++-------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
index c729bef5c7..88820e62de 100644
--- a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
+++ b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
@@ -12,6 +12,6 @@
         sling:resourceType="fd/af/cloudservices/recaptcha/page"
         name="v3"
         secretKey="placeholder-v3-secret-key"
-        siteKey="6LdV1LUtAAAAAM4xLHqg4bxuxl1LKWvWoIcG9Zqd"
+        siteKey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
         version="v3"/>
 </jcr:root>
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index 6f58770fa7..b76894b15d 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -122,7 +122,9 @@ describe("Form Runtime with Recaptcha Input", () => {
     }
 
     function updateRecaptchaV3Config(score) {
-        const secretKey = Cypress.env('RECAPTCHA_V3_API_KEY');
+        // Google's public test secret key always returns score 0.9 regardless of site/domain,
+        // so the v3 submission test doesn't depend on a real registered key or credentials.
+        const secretKey = "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe";
         cy.openPage("/mnt/overlay/fd/af/cloudservices/recaptcha/properties.html?item=%2Fconf%2Fcore-components-it%2Fsamples%2Frecaptcha%2Fbasic%2Fsettings%2Fcloudconfigs%2Frecaptcha%2Fv3").then(x => {
             cy.get('#recaptcha-cloudconfiguration-secret-key').clear().type(secretKey);
             // v3 is score-based, but the addon dialog nests Threshold Score inside the hidden
@@ -268,34 +270,20 @@ describe("Form Runtime with Recaptcha Input", () => {
     })
 
     it("submission should pass for reCAPTCHA v3", () => {
-        // Exercises the v3 token fetch + submit flow. The secret key is injected via the
-        // RECAPTCHA_V3_API_KEY env var; the site key lives in the v3 cloud config fixture.
-        // Low threshold so a token from a headless browser passes server-side verification.
-        updateRecaptchaV3Config(0.1);
+        // Google's public test key always scores 0.9, so this is deterministic and doesn't
+        // need the retry-until-success loop the real-key enterprise-score test relies on.
+        updateRecaptchaV3Config(0.5);
         cy.previewForm(v3PagePath).then((p) => {
             formContainer = p;
         });
         expect(formContainer, "formcontainer is initialized").to.not.be.null;
         cy.get(`div.grecaptcha-badge`).should('exist').then(() => {
             cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
-            const submitForm = () => {
-                cy.get(`.cmp-adaptiveform-button__widget`).click();
-                return cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
-                    if (interception.response.statusCode === 200) {
-                        cy.log('Submit request succeeded');
-                        return cy.wrap(true);
-                    } else {
-                        cy.log('Submit request failed, retrying...');
-                        return cy.wrap(false);
-                    }
+            cy.get(`.cmp-adaptiveform-button__widget`).click().then(x => {
+                cy.wait('@submitForm').then((interception) => {
+                    expect(interception.response.statusCode).to.equal(200);
                 });
-            };
-            // Retry like the enterprise-score test, since reCAPTCHA can intermittently return a
-            // browser-error on the first assessment.
-            cy.waitUntil(() => submitForm(), {
-                errorMsg: 'Maximum retry limit reached, request did not succeed',
-                timeout: 50000,
-                interval: 5000,
+                cy.get('body').should('contain', "Thank you for submitting the form.\n")
             });
         });
     })

From aed05a9cac5afa24fed0d582f5ebd1f27707540b Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Thu, 17 Sep 2026 10:41:32 +0530
Subject: [PATCH 18/46] revert(recaptcha): restore real v3 site/secret key,
 lower threshold to 0

Google does not publish an official test key pair for v3 score-based
verification (the public 6LeIx... pair is documented for v2 checkbox only
and does not reliably render the v3 invisible badge). Restore the real
site key in the v3 cloud config fixture and the RECAPTCHA_V3_API_KEY-based
secret in the Cypress test, and drop the threshold to 0 so a real headless-
browser score still passes verification.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../cloudconfigs/recaptcha/v3/.content.xml    |  2 +-
 .../specs/recaptcha/recaptcha.runtime.cy.js   | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
index 88820e62de..c729bef5c7 100644
--- a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
+++ b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
@@ -12,6 +12,6 @@
         sling:resourceType="fd/af/cloudservices/recaptcha/page"
         name="v3"
         secretKey="placeholder-v3-secret-key"
-        siteKey="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
+        siteKey="6LdV1LUtAAAAAM4xLHqg4bxuxl1LKWvWoIcG9Zqd"
         version="v3"/>
 </jcr:root>
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index b76894b15d..a902e3b8ea 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -122,9 +122,7 @@ describe("Form Runtime with Recaptcha Input", () => {
     }
 
     function updateRecaptchaV3Config(score) {
-        // Google's public test secret key always returns score 0.9 regardless of site/domain,
-        // so the v3 submission test doesn't depend on a real registered key or credentials.
-        const secretKey = "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe";
+        const secretKey = Cypress.env('RECAPTCHA_V3_API_KEY');
         cy.openPage("/mnt/overlay/fd/af/cloudservices/recaptcha/properties.html?item=%2Fconf%2Fcore-components-it%2Fsamples%2Frecaptcha%2Fbasic%2Fsettings%2Fcloudconfigs%2Frecaptcha%2Fv3").then(x => {
             cy.get('#recaptcha-cloudconfiguration-secret-key').clear().type(secretKey);
             // v3 is score-based, but the addon dialog nests Threshold Score inside the hidden
@@ -270,20 +268,34 @@ describe("Form Runtime with Recaptcha Input", () => {
     })
 
     it("submission should pass for reCAPTCHA v3", () => {
-        // Google's public test key always scores 0.9, so this is deterministic and doesn't
-        // need the retry-until-success loop the real-key enterprise-score test relies on.
-        updateRecaptchaV3Config(0.5);
+        // Exercises the v3 token fetch + submit flow. The secret key is injected via the
+        // RECAPTCHA_V3_API_KEY env var; the site key lives in the v3 cloud config fixture.
+        // Threshold of 0 so a token from a headless browser passes server-side verification.
+        updateRecaptchaV3Config(0);
         cy.previewForm(v3PagePath).then((p) => {
             formContainer = p;
         });
         expect(formContainer, "formcontainer is initialized").to.not.be.null;
         cy.get(`div.grecaptcha-badge`).should('exist').then(() => {
             cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
-            cy.get(`.cmp-adaptiveform-button__widget`).click().then(x => {
-                cy.wait('@submitForm').then((interception) => {
-                    expect(interception.response.statusCode).to.equal(200);
+            const submitForm = () => {
+                cy.get(`.cmp-adaptiveform-button__widget`).click();
+                return cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
+                    if (interception.response.statusCode === 200) {
+                        cy.log('Submit request succeeded');
+                        return cy.wrap(true);
+                    } else {
+                        cy.log('Submit request failed, retrying...');
+                        return cy.wrap(false);
+                    }
                 });
-                cy.get('body').should('contain', "Thank you for submitting the form.\n")
+            };
+            // Retry like the enterprise-score test, since reCAPTCHA can intermittently return a
+            // browser-error on the first assessment.
+            cy.waitUntil(() => submitForm(), {
+                errorMsg: 'Maximum retry limit reached, request did not succeed',
+                timeout: 50000,
+                interval: 5000,
             });
         });
     })

From 952c52b0f15ac23458d8b87f6d37352342341cef Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 18 Sep 2026 10:47:06 +0530
Subject: [PATCH 19/46] test(recaptcha): add v3 submission failure cypress test

Mirror the enterprise-score failure test for v3: set the threshold to 1.0
(above any real headless-browser score) so server-side verification always
rejects the token, deterministically asserting the 400 + CAPTCHA-validation
error. Gated on isLatestAddon like the other failure tests.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../specs/recaptcha/recaptcha.runtime.cy.js   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index a902e3b8ea..82cd830435 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -299,4 +299,27 @@ describe("Form Runtime with Recaptcha Input", () => {
             });
         });
     })
+
+    it("submission should fail for reCAPTCHA v3", () => {
+        if (cy.af.isLatestAddon()) {
+            // Threshold of 1.0 is above any real headless-browser score, so server-side
+            // verification always rejects the token — deterministically exercises the failure path.
+            updateRecaptchaV3Config(1.0);
+            cy.on('window:alert', (message) => {
+                expect(message).to.equal('Encountered an internal error while submitting the form.');
+            });
+            cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
+            cy.previewForm(v3PagePath).then((p) => {
+                formContainer = p;
+            });
+            expect(formContainer, "formcontainer is initialized").to.not.be.null;
+            cy.get(`div.grecaptcha-badge`).should('exist').then(() => {
+                cy.get(`.cmp-adaptiveform-button__widget`).click();
+                cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
+                    expect(interception.response.statusCode).to.equal(400);
+                    expect(interception.response.body).to.have.property('title', 'The CAPTCHA validation failed. Please try again.');
+                });
+            });
+        }
+    })
 })

From 00fe61bc0148abb7aa187a99b6a2f3d18715962b Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 18 Sep 2026 14:53:21 +0530
Subject: [PATCH 20/46] revert(recaptcha): drop bundle-load custom-function
 registration

Reverts the index.js bundle-load registerFunctions call added for reCAPTCHA
v3. The `fetchCaptchaToken is not defined` failure it worked around was
traced to the XFA runtime clientlib (core.forms.components.runtime.all.xfa)
being loaded on pages that have no XFA form, which creates a second
FunctionRuntime singleton that setupFormContainer never populates. The
proper fix is to stop importing the XFA clientlib when no XFA form is
present, which makes this bundle-load registration unnecessary.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ui.frontend/src/index.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ui.frontend/src/index.js b/ui.frontend/src/index.js
index 557f1f1928..8ac52985ff 100644
--- a/ui.frontend/src/index.js
+++ b/ui.frontend/src/index.js
@@ -37,14 +37,6 @@ import {customFunctions} from "./customFunctions";
  */
 window.guideBridge = new GuideBridge();
 
-// Register the repo's custom functions at bundle load so BOTH runtimes get them. In the XFA
-// bundle (main-xfa.js) this populates af-core-xfa's FunctionRuntime before the XFA form model is
-// created; the container view only ever registers into the non-XFA runtime via window.FormView, so
-// the XFA rule engine would otherwise see only its built-in defaults and have no fetchCaptchaToken
-// (breaking auto-fetch captcha - invisible/enterprise-score/v3 - on no-iframe XFA embeds).
-// registerFunctions is idempotent, so the later setupFormContainer registration is unaffected.
-FunctionRuntime.registerFunctions(customFunctions);
-
 /**
  * The `Actions` object contains predefined action constants.
  * @type {object}

From 2b015f508495c7e76337e3e39940a119e1f0ae66 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 18 Sep 2026 16:21:19 +0530
Subject: [PATCH 21/46] test(recaptcha): enable FT_FORMS-27648 for reCAPTCHA v3
 IT tests

The reCAPTCHA v3 test cases are gated behind FT_FORMS-27648. Add it to the
IT DynamicToggleProviderImpl enabledToggles so the toggle is on when the
Cypress v3 submission tests (success and failure) run on CI.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 ....granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
index 95c4e89144..4b8c218bf4 100644
--- a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
+++ b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
@@ -27,7 +27,8 @@
     "FT_FORMS-17107",
     "FT_FORMS-24087",
     "FT_FORMS-24343",
-    "FT_FORMS-25252"
+    "FT_FORMS-25252",
+    "FT_FORMS-27648"
   ],
   "disabledToggles": [
   ]

From 041d84c64c8f8571a759de7d3b6931c4961091b5 Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 18 Sep 2026 16:31:01 +0530
Subject: [PATCH 22/46] test(recaptcha): gate v3 tests on FT_FORMS-27648 +
 latest addon

reCAPTCHA v3 is gated behind FT_FORMS-27648, so the v3 test cases (render,
submission pass, submission fail) should only run when that toggle is on and
the latest addon is in use. Fetch the enabled toggles in before() and guard
each v3 test with cy.af.isLatestAddon() && toggle_array.includes(FT_RECAPTCHA_V3),
matching the existing hCaptcha pattern.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../specs/recaptcha/recaptcha.runtime.cy.js   | 96 +++++++++++--------
 1 file changed, 56 insertions(+), 40 deletions(-)

diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
index 82cd830435..cd5b12c063 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.runtime.cy.js
@@ -27,8 +27,20 @@ describe("Form Runtime with Recaptcha Input", () => {
         recaptcha : `[data-cmp-is="${IS}"]`
     };
 
+    const FT_RECAPTCHA_V3 = "FT_FORMS-27648";
+
     let formContainer = null
 
+    let toggle_array = [];
+
+    before(() => {
+        cy.fetchFeatureToggles().then((response) => {
+            if (response.status === 200) {
+                toggle_array = response.body.enabled;
+            }
+        });
+    });
+
     // Whitelist the error message
     cy.on('uncaught:exception', (err) => {
         // when we render form with captcha, and FT is not enabled, this error is expected
@@ -254,54 +266,58 @@ describe("Form Runtime with Recaptcha Input", () => {
     })
 
     it("should render reCAPTCHA v3 as an invisible badge", () => {
-        cy.previewForm(v3PagePath).then((p) => {
-            formContainer = p;
-        });
-        expect(formContainer, "formcontainer is initialized").to.not.be.null;
-        cy.wrap().then(() => {
-            const [id] = Object.entries(formContainer._fields).find(([id]) => id.includes("captcha"));
-            // v3 has no visible challenge; the widget must render badge-only (invisible).
-            cy.get(`#${id} .cmp-adaptiveform-recaptcha__widget > div.g-recaptcha`)
-                .should('exist')
-                .and('have.class', 'g-recaptcha-invisible');
-        });
+        if (cy.af.isLatestAddon() && toggle_array.includes(FT_RECAPTCHA_V3)) {
+            cy.previewForm(v3PagePath).then((p) => {
+                formContainer = p;
+            });
+            expect(formContainer, "formcontainer is initialized").to.not.be.null;
+            cy.wrap().then(() => {
+                const [id] = Object.entries(formContainer._fields).find(([id]) => id.includes("captcha"));
+                // v3 has no visible challenge; the widget must render badge-only (invisible).
+                cy.get(`#${id} .cmp-adaptiveform-recaptcha__widget > div.g-recaptcha`)
+                    .should('exist')
+                    .and('have.class', 'g-recaptcha-invisible');
+            });
+        }
     })
 
     it("submission should pass for reCAPTCHA v3", () => {
-        // Exercises the v3 token fetch + submit flow. The secret key is injected via the
-        // RECAPTCHA_V3_API_KEY env var; the site key lives in the v3 cloud config fixture.
-        // Threshold of 0 so a token from a headless browser passes server-side verification.
-        updateRecaptchaV3Config(0);
-        cy.previewForm(v3PagePath).then((p) => {
-            formContainer = p;
-        });
-        expect(formContainer, "formcontainer is initialized").to.not.be.null;
-        cy.get(`div.grecaptcha-badge`).should('exist').then(() => {
-            cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
-            const submitForm = () => {
-                cy.get(`.cmp-adaptiveform-button__widget`).click();
-                return cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
-                    if (interception.response.statusCode === 200) {
-                        cy.log('Submit request succeeded');
-                        return cy.wrap(true);
-                    } else {
-                        cy.log('Submit request failed, retrying...');
-                        return cy.wrap(false);
-                    }
+        if (cy.af.isLatestAddon() && toggle_array.includes(FT_RECAPTCHA_V3)) {
+            // Exercises the v3 token fetch + submit flow. The secret key is injected via the
+            // RECAPTCHA_V3_API_KEY env var; the site key lives in the v3 cloud config fixture.
+            // Threshold of 0 so a token from a headless browser passes server-side verification.
+            updateRecaptchaV3Config(0);
+            cy.previewForm(v3PagePath).then((p) => {
+                formContainer = p;
+            });
+            expect(formContainer, "formcontainer is initialized").to.not.be.null;
+            cy.get(`div.grecaptcha-badge`).should('exist').then(() => {
+                cy.intercept('POST', /\/adobe\/forms\/af\/submit\/.*/).as('submitForm');
+                const submitForm = () => {
+                    cy.get(`.cmp-adaptiveform-button__widget`).click();
+                    return cy.wait('@submitForm', { timeout: 50000 }).then((interception) => {
+                        if (interception.response.statusCode === 200) {
+                            cy.log('Submit request succeeded');
+                            return cy.wrap(true);
+                        } else {
+                            cy.log('Submit request failed, retrying...');
+                            return cy.wrap(false);
+                        }
+                    });
+                };
+                // Retry like the enterprise-score test, since reCAPTCHA can intermittently return a
+                // browser-error on the first assessment.
+                cy.waitUntil(() => submitForm(), {
+                    errorMsg: 'Maximum retry limit reached, request did not succeed',
+                    timeout: 50000,
+                    interval: 5000,
                 });
-            };
-            // Retry like the enterprise-score test, since reCAPTCHA can intermittently return a
-            // browser-error on the first assessment.
-            cy.waitUntil(() => submitForm(), {
-                errorMsg: 'Maximum retry limit reached, request did not succeed',
-                timeout: 50000,
-                interval: 5000,
             });
-        });
+        }
     })
 
     it("submission should fail for reCAPTCHA v3", () => {
-        if (cy.af.isLatestAddon()) {
+        if (cy.af.isLatestAddon() && toggle_array.includes(FT_RECAPTCHA_V3)) {
             // Threshold of 1.0 is above any real headless-browser score, so server-side
             // verification always rejects the token — deterministically exercises the failure path.
             updateRecaptchaV3Config(1.0);

From d1ee2bc0ba56722e18cca3ebca1f02b7ee2b465a Mon Sep 17 00:00:00 2001
From: kartikey19427 <kartikey19427@iiitd.ac.in>
Date: Fri, 18 Sep 2026 17:10:24 +0530
Subject: [PATCH 23/46] docs(recaptcha): document v3 support in the component
 README

Add reCAPTCHA v3 to the supported-versions list (invisible/badge-only,
token auto-fetched at submit, gated behind FT_FORMS-27648) and note that
recaptchaSize does not apply to v3. Addresses PR review feedback.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../core/fd/components/form/recaptcha/v1/recaptcha/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md
index 71194988f5..eec07ce132 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md
@@ -24,6 +24,9 @@ Adaptive Form Recaptcha field component written in HTL.
 * Supports the following recaptcha versions:
   * v2
     * Only visible behaviour is supported
+  * v3
+    * Only invisible behaviour is supported (badge-only, no visible challenge); the token is
+      auto-fetched at submit. Requires the FT_FORMS-27648 feature toggle to be enabled.
   * Enterprise
     * Checkbox keys (Visible Behaviour)
     * Score-based keys (Invisible behaviour)
@@ -45,7 +48,7 @@ The following properties are written to JCR for this Form Recaptcha component an
 7. `./requiredMessage` - defines the message displayed as tooltip when submitting the form if the value is left empty
 8. `./readOnly` - if set to `true`, the filed will be read only
 9. `./rcCloudServicePath` - defines the path of cloud configuration resource for reCAPTCHA
-10. `./recaptchaSize` - defines the size attribute of Google reCAPTCHA. This property is only valid for reCAPTCHA v2 and the checkbox keys of reCAPTCHA enterprise. This property will be disabled for reCAPTCHA Enteprise score-based keys.
+10. `./recaptchaSize` - defines the size attribute of Google reCAPTCHA. This property is only valid for reCAPTCHA v2 and the checkbox keys of reCAPTCHA enterprise. This property will be disabled for reCAPTCHA Enterprise score-based keys and for reCAPTCHA v3 (both invisible).
 
 ## Client Libraries
 The component provides a `core.forms.components.recaptcha.v1.runtime` client library category that contains the Javascript runtime for the component.

From 0a60bf2e306f01c8193558db10b400a15452fdc9 Mon Sep 17 00:00:00 2001
From: Mayank Jindal <mayankjindal@adobe.com>
Date: Fri, 18 Sep 2026 22:17:35 +0530
Subject: [PATCH 24/46] @releng [maven-scm] :prepare release
 core-forms-components-reactor-3.0.166

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index e8032892c9..ecb8abf05e 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index eb1b2982ab..0447b8137d 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 5a144159db..97a33b4504 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 5e873e52a4..e8af2cb86a 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 25ae069084..8e9b279ce6 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 3c7193624e..c7710cf4be 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index a84cb57296..d2d6ddbdf1 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 9eec1a779b..247b694c38 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index cd6f36660c..aa3362c211 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 2a1a5d10b5..74dab15779 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index c1ae947195..cef8bf33e2 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index 7ab30a8435..c4f4092255 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 3230f491e3..4e852e8aa5 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index f7ed6740a9..b65e577539 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.165-SNAPSHOT</version>
+    <version>3.0.166</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index bc77bef007..ec733e0577 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index a979c39f8b..8df738cb93 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 14be58b93b..a22c9570f1 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.166</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 5cd1f048fe..75f50aa40e 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 4b6e69b545..601cc17977 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.165-SNAPSHOT</version>
+        <version>3.0.166</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From 87aec02d99308f4e2d97815c7f96d75327fb214f Mon Sep 17 00:00:00 2001
From: Mayank Jindal <mayankjindal@adobe.com>
Date: Fri, 18 Sep 2026 22:17:36 +0530
Subject: [PATCH 25/46] @releng [maven-scm] :prepare for next development
 iteration

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index ecb8abf05e..5641fa7667 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 0447b8137d..159030103e 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 97a33b4504..90fdb63b05 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index e8af2cb86a..7b1ed33327 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 8e9b279ce6..a12eab6fe1 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index c7710cf4be..34047fec0d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index d2d6ddbdf1..68ff0fd32c 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 247b694c38..ef7b8a4a90 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index aa3362c211..da1a06f4dd 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 74dab15779..07ee36a858 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index cef8bf33e2..6d0191ffca 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index c4f4092255..b83a38e8fe 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 4e852e8aa5..a9264ca0d6 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index b65e577539..6b6618e449 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.166</version>
+    <version>3.0.167-SNAPSHOT</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index ec733e0577..2247b3cfc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 8df738cb93..d54040fb60 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index a22c9570f1..0c37d67b6f 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.166</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 75f50aa40e..e74d6e7d9d 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 601cc17977..5760091da2 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.166</version>
+        <version>3.0.167-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From 039f02e66167e39b3531b897d9b34f01783f79d1 Mon Sep 17 00:00:00 2001
From: Lovely Mandal <155715221+lovelymandal16@users.noreply.github.com>
Date: Mon, 28 Sep 2026 14:15:18 +0530
Subject: [PATCH 26/46] Add Next Gen Dynamic Media (NGDM) support to the
 StaticImage component (#1989)

* Add Next Gen Dynamic Media (NGDM) support to the StaticImage component

Ports the NGDM asset support from adobe/aem-core-wcm-components#2481 to
the Adaptive Forms StaticImage (form/image v1) component. When the
fileReference is an NGDM asset (/urn:...) and the NextGenDynamicMediaConfig
OSGi service is enabled, the delivery URL is built directly instead of
resolving a DAM rendition. Bumps aem-sdk-api to 2023.9.13665 to pick up
the NextGenDynamicMediaConfig API, and enables the NGDM asset picker on
the component's file upload dialog field.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* Extract NGDM logic to utils, add exporter test, fix review findings

- Extract Next Gen Dynamic Media (NGDM) URL-resolution logic out of
  StaticImageImpl into a shared NgdmImageUtils class
- Add a Sling Model JSON-exporter test proving the resolved NGDM delivery
  URL is exposed as "value" and fd:repoPath is correctly absent
- Fix multi-dot seo-name filenames (e.g. "product.hero.png") resolving to
  the wrong delivery URL/extension by splitting on the last dot, not the
  first
- Tighten isNgdmImageReference() to require a non-empty asset-id and
  seo-name segment, avoiding a NoSuchElementException on malformed
  references
- Mark com.adobe.cq.ui.wcm.commons.config as an optional OSGi import so
  the bundle still resolves on installations without this Cloud Service
  API

* Gate NGDM image picker behind FT_FORMS-26424 feature toggle

- Add FT_NGDM_IMAGE_PICKER (FT_FORMS-26424) constant, following the
  existing FeatureToggleConstants pattern
- Split the Image dialog's file widget into two mutually-exclusive
  variants gated by granite:rendercondition/featuretoggle: NGDM picker
  enabled shows the Pick (Local/Remote) UI, disabled shows the original
  Browse Assets/Upload UI
- Gate StaticImageImpl's NGDM URL resolution and fd:repoPath exclusion
  behind the same toggle via ComponentUtils.isToggleEnabled(), so a
  saved NGDM reference is treated as a plain fileReference when the
  toggle is off
- Add toggle-enabled/disabled test coverage, following the same
  System.setProperty/@AfterEach pattern already used in FragmentImplTest

* Move NgdmImageUtils to internal.form package, use StringUtils for parsing

Addresses outstanding review feedback from rismehta on PR #1965:
- NgdmImageUtils was sitting under internal.models.v1.form; move it to
  internal.form alongside FeatureToggleConstants, since it's a shared
  helper, not a component model
- Replace manual indexOf/substring parsing with
  StringUtils.substringBefore/After(Last) in isNgdmImageReference() and
  buildNgdmImageSrc()

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* Add Cypress test for NGDM file picker dialog UI (FT_FORMS-26424)

Addresses review comment from rismehta asking for test coverage of the
image dialog change: when FT_FORMS-26424 is enabled the "file" widget
renders a Pick dropdown with Local/Remote options, and when disabled the
"fileLegacy" widget renders a plain Pick button with no dropdown.

Verified end-to-end with a real Cypress run against a local AEM instance
in both toggle states (dropdown present/absent as expected).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Pankaj Parashar <pankajpr+adobe@adobe.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 bundles/af-core/pom.xml                       |   1 +
 .../internal/form/FeatureToggleConstants.java |  10 ++
 .../internal/form/NgdmImageUtils.java         |  77 ++++++++++
 .../models/v1/form/StaticImageImpl.java       |  27 +++-
 .../internal/form/NgdmImageUtilsTest.java     | 122 +++++++++++++++
 .../models/v1/form/StaticImageImplTest.java   |  68 +++++++++
 .../MockNextGenDynamicMediaConfig.java        | 144 ++++++++++++++++++
 .../form/image/exporter-image-ngdm.json       |  17 +++
 .../resources/form/image/test-content.json    |  12 ++
 bundles/core/pom.xml                          |   6 +
 parent/pom.xml                                |   4 +-
 .../image/v1/image/_cq_dialog/.content.xml    |  26 +++-
 .../specs/image/image.authoring.cy.js         |  48 ++++++
 13 files changed, 559 insertions(+), 3 deletions(-)
 create mode 100644 bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java
 create mode 100644 bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java
 create mode 100644 bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java
 create mode 100644 bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json

diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 005a72f7b5..f25e683292 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -88,6 +88,7 @@
                         <Import-Package>
                             javax.annotation;version=0.0.0,
                             com.adobe.cq.wcm.core.components.models;version="[12.0.0,13.0.0)",
+                            com.adobe.cq.ui.wcm.commons.config;resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java
index 2db537b7c4..29a3b9df5f 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java
@@ -106,4 +106,14 @@ private FeatureToggleConstants() {}
      * System property: same name ({@code FT_FORMS-25252}); set to {@code "true"} to enable.
      */
     public static final String FT_SERVER_SIDE_VALIDATION = "FT_FORMS-25252";
+
+    /**
+     * When enabled, the Image field's authoring dialog shows the "Pick" dropdown (Local/Remote)
+     * for selecting a Next Gen Dynamic Media asset, and the component resolves NGDM references to
+     * a delivery URL. When disabled, the dialog shows the original Browse Assets/Upload UI, and any
+     * previously-saved NGDM reference is treated as a plain (unresolvable) fileReference instead.
+     * <p>
+     * System property: same name ({@code FT_FORMS-26424}); set to {@code "true"} to enable.
+     */
+    public static final String FT_NGDM_IMAGE_PICKER = "FT_FORMS-26424";
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java
new file mode 100644
index 0000000000..4759ff957f
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java
@@ -0,0 +1,77 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.form;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig;
+
+/**
+ * Utility methods for resolving Next Gen Dynamic Media (NGDM) asset references (of the form
+ * {@code /urn:aaid:aem:<asset-id>/<seo-name>.<format>}) into delivery URLs.
+ */
+public final class NgdmImageUtils {
+
+    private static final String NGDM_REFERENCE_PREFIX = "/urn:";
+    private static final String PATH_PLACEHOLDER_ASSET_ID = "{asset-id}";
+    private static final String PATH_PLACEHOLDER_SEO_NAME = "{seo-name}";
+    private static final String PATH_PLACEHOLDER_FORMAT = "{format}";
+    private static final String DEFAULT_NGDM_ASSET_EXTENSION = "jpg";
+    private static final int DEFAULT_NGDM_ASSET_WIDTH = 640;
+
+    private NgdmImageUtils() {}
+
+    public static boolean isNgdmImageReference(String fileReference) {
+        if (StringUtils.isBlank(fileReference) || !fileReference.startsWith(NGDM_REFERENCE_PREFIX)) {
+            return false;
+        }
+        // must have a non-empty asset-id segment and a non-empty seo-name segment, i.e.
+        // "/urn:<asset-id>/<seo-name>[.<format>]", otherwise buildNgdmImageSrc() has nothing to parse.
+        String withoutLeadingSlash = fileReference.substring(1);
+        return StringUtils.isNotEmpty(StringUtils.substringBefore(withoutLeadingSlash, "/"))
+            && StringUtils.isNotEmpty(StringUtils.substringAfter(withoutLeadingSlash, "/"));
+    }
+
+    public static boolean isNgdmSupportAvailable(NextGenDynamicMediaConfig nextGenDynamicMediaConfig) {
+        return nextGenDynamicMediaConfig != null && nextGenDynamicMediaConfig.enabled()
+            && StringUtils.isNotBlank(nextGenDynamicMediaConfig.getRepositoryId());
+    }
+
+    /**
+     * Builds the Next Gen Dynamic Media delivery URL for an asset reference of the form
+     * {@code /urn:aaid:aem:<asset-id>/<seo-name>.<format>}.
+     */
+    public static String buildNgdmImageSrc(String fileReference, NextGenDynamicMediaConfig nextGenDynamicMediaConfig) {
+        String withoutLeadingSlash = fileReference.substring(1);
+        String assetId = StringUtils.substringBefore(withoutLeadingSlash, "/");
+        String assetFileName = StringUtils.substringAfter(withoutLeadingSlash, "/");
+
+        // split on the LAST dot, not the first: seo-names can legitimately contain dots
+        // (e.g. "product.hero.png"), and a first-dot split would truncate the name and
+        // produce the wrong extension.
+        boolean hasExtension = StringUtils.contains(assetFileName, ".");
+        String assetName = hasExtension ? StringUtils.substringBeforeLast(assetFileName, ".") : assetFileName;
+        String assetExtension = hasExtension ? StringUtils.substringAfterLast(assetFileName, ".")
+            : DEFAULT_NGDM_ASSET_EXTENSION;
+
+        String imageDeliveryPath = nextGenDynamicMediaConfig.getImageDeliveryBasePath()
+            .replace(PATH_PLACEHOLDER_ASSET_ID, assetId).replace(PATH_PLACEHOLDER_SEO_NAME, assetName)
+            .replace(PATH_PLACEHOLDER_FORMAT, assetExtension);
+
+        return "https://" + nextGenDynamicMediaConfig.getRepositoryId() + imageDeliveryPath + "?width="
+            + DEFAULT_NGDM_ASSET_WIDTH + "&preferwebp=true";
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
index 41c97c3124..f175bbae78 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
@@ -20,23 +20,30 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 import javax.jcr.RepositoryException;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Exporter;
 import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.Optional;
 import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
 import org.apache.sling.models.annotations.injectorspecific.SlingObject;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
 
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FeatureToggleConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.internal.form.NgdmImageUtils;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.StaticImage;
 import com.adobe.cq.forms.core.components.util.AbstractFormComponentImpl;
+import com.adobe.cq.forms.core.components.util.ComponentUtils;
+import com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig;
 import com.day.cq.wcm.foundation.Image;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -51,6 +58,10 @@ public class StaticImageImpl extends AbstractFormComponentImpl implements Static
 
     public static final String DAM_REPO_PATH = "fd:repoPath";
 
+    @Inject
+    @Optional
+    private NextGenDynamicMediaConfig nextGenDynamicMediaConfig;
+
     private Image image;
 
     @SlingObject
@@ -79,6 +90,9 @@ public class StaticImageImpl extends AbstractFormComponentImpl implements Static
      */
     @Override
     public String getImageSrc() throws RepositoryException, IOException {
+        if (isNgdmReferenceAndFeatureEnabled() && NgdmImageUtils.isNgdmSupportAvailable(nextGenDynamicMediaConfig)) {
+            return NgdmImageUtils.buildNgdmImageSrc(fileReference, nextGenDynamicMediaConfig);
+        }
         image = new Image(this.resource);
         boolean containsData = (image.getData() != null);
         if (containsData) {
@@ -129,12 +143,23 @@ public String getLinkUrl() {
     @Override
     public @Nonnull Map<String, Object> getProperties() {
         Map<String, Object> properties = super.getProperties();
-        if (fileReference != null && fileReference.length() > 0) {
+        if (StringUtils.isNotBlank(fileReference) && !isNgdmReferenceAndFeatureEnabled()) {
             properties.put(DAM_REPO_PATH, fileReference);
         }
         return properties;
     }
 
+    /**
+     * Whether {@link #fileReference} is a Next Gen Dynamic Media reference AND the NGDM image
+     * picker feature toggle is enabled. When the toggle is disabled, a previously-saved NGDM
+     * reference is treated like any other (unresolvable) fileReference - matching the dialog,
+     * which falls back to the original Browse Assets/Upload UI in that case.
+     */
+    private boolean isNgdmReferenceAndFeatureEnabled() {
+        return ComponentUtils.isToggleEnabled(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER)
+            && NgdmImageUtils.isNgdmImageReference(fileReference);
+    }
+
     @Override
     public String getFieldType() {
         return super.getFieldType(FieldType.IMAGE);
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java
new file mode 100644
index 0000000000..cacfdc25b7
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java
@@ -0,0 +1,122 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.form;
+
+import org.junit.jupiter.api.Test;
+
+import com.adobe.cq.forms.core.testing.MockNextGenDynamicMediaConfig;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class NgdmImageUtilsTest {
+
+    @Test
+    void isNgdmImageReference_WithUrnPrefix_ReturnsTrue() {
+        assertTrue(NgdmImageUtils
+            .isNgdmImageReference("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png"));
+    }
+
+    @Test
+    void isNgdmImageReference_WithDamPath_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmImageReference("/content/dam/some-asset.png"));
+    }
+
+    @Test
+    void isNgdmImageReference_WithNullOrBlank_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmImageReference(null));
+        assertFalse(NgdmImageUtils.isNgdmImageReference(""));
+        assertFalse(NgdmImageUtils.isNgdmImageReference("   "));
+    }
+
+    @Test
+    void isNgdmImageReference_WithMissingSeoNameSegment_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmImageReference("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911"));
+        assertFalse(NgdmImageUtils.isNgdmImageReference("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/"));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithEnabledConfigAndRepositoryId_ReturnsTrue() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+
+        assertTrue(NgdmImageUtils.isNgdmSupportAvailable(config));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithDisabledConfig_ReturnsFalse() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(false);
+        config.setRepositoryId("testrepo");
+
+        assertFalse(NgdmImageUtils.isNgdmSupportAvailable(config));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithBlankRepositoryId_ReturnsFalse() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("");
+
+        assertFalse(NgdmImageUtils.isNgdmSupportAvailable(config));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithNullConfig_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmSupportAvailable(null));
+    }
+
+    @Test
+    void buildNgdmImageSrc_BuildsExpectedDeliveryUrl() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setRepositoryId("testrepo");
+
+        String src = NgdmImageUtils
+            .buildNgdmImageSrc("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png", config);
+
+        assertEquals(
+            "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true",
+            src);
+    }
+
+    @Test
+    void buildNgdmImageSrc_WithNoFormatSuffix_FallsBackToDefaultExtension() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setRepositoryId("testrepo");
+
+        String src = NgdmImageUtils.buildNgdmImageSrc("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits",
+            config);
+
+        assertEquals(
+            "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.jpg?width=640&preferwebp=true",
+            src);
+    }
+
+    @Test
+    void buildNgdmImageSrc_WithMultipleDotsInSeoName_KeepsFullNameAndCorrectExtension() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setRepositoryId("testrepo");
+
+        String src = NgdmImageUtils
+            .buildNgdmImageSrc("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/product.hero.png", config);
+
+        assertEquals(
+            "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/product.hero.png?width=640&preferwebp=true",
+            src);
+    }
+}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
index 1005598af3..ffefbffb5e 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
@@ -22,16 +22,19 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 import com.adobe.cq.forms.core.Utils;
+import com.adobe.cq.forms.core.components.internal.form.FeatureToggleConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.StaticImage;
 import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
+import com.adobe.cq.forms.core.testing.MockNextGenDynamicMediaConfig;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.adobe.cq.wcm.style.ComponentStyleInfo;
 import com.day.cq.wcm.foundation.Image;
@@ -53,9 +56,15 @@ public class StaticImageImplTest {
     private static final String PATH_IMAGE = CONTENT_ROOT + "/image";
     private static final String PATH_IMAGE_DATALAYER = CONTENT_ROOT + "/image-datalayer";
     private static final String PATH_IMAGE_WITHOUT_FIELDTYPE = CONTENT_ROOT + "/image-without-fieldtype";
+    private static final String PATH_IMAGE_NGDM = CONTENT_ROOT + "/image-ngdm";
 
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
+    @AfterEach
+    void clearNgdmFeatureToggle() {
+        System.clearProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER);
+    }
+
     @BeforeEach
     void setUp() {
         context.load().json(BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, CONTENT_ROOT);
@@ -215,4 +224,63 @@ void testNoFieldType() {
         StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_WITHOUT_FIELDTYPE, StaticImage.class, context);
         assertEquals(FieldType.IMAGE.getValue(), image.getFieldType());
     }
+
+    @Test
+    void testNgdmImage() throws RepositoryException, IOException {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        String expectedSrc = "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true";
+        assertEquals(expectedSrc, image.getImageSrc());
+        assertEquals(expectedSrc, image.getValue());
+        assertFalse(image.getProperties().containsKey(StaticImageImpl.DAM_REPO_PATH));
+    }
+
+    @Test
+    void testNgdmImageWithConfigDisabled() throws RepositoryException, IOException {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(false);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        assertNull(image.getImageSrc());
+        assertFalse(image.getProperties().containsKey(StaticImageImpl.DAM_REPO_PATH));
+    }
+
+    @Test
+    void testNgdmImageWithoutConfig() throws RepositoryException, IOException {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        assertNull(image.getImageSrc());
+    }
+
+    @Test
+    void testNgdmImageWithFeatureToggleDisabled() throws RepositoryException, IOException {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        assertNull(image.getImageSrc());
+        assertTrue(image.getProperties().containsKey(StaticImageImpl.DAM_REPO_PATH));
+    }
+
+    @Test
+    void testJSONExportForNgdm() throws Exception {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        Utils.testJSONExport(image, Utils.getTestExporterJSONPath(BASE, PATH_IMAGE_NGDM));
+    }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java
new file mode 100644
index 0000000000..12e8270774
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java
@@ -0,0 +1,144 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.testing;
+
+import com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig;
+
+public class MockNextGenDynamicMediaConfig implements NextGenDynamicMediaConfig {
+
+    static final String DEFAULT_IMAGE_DELIVERY_BASE_PATH = "/adobe/dynamicmedia/deliver/{asset-id}/{seo-name}.{format}";
+
+    private boolean enabled;
+    private String repositoryId;
+    private String apiKey;
+    private String env;
+    private String imsOrg;
+    private String imsEnv;
+    private String imsClient;
+    private String assetSelectorsJsUrl;
+    private String imageDeliveryBasePath = DEFAULT_IMAGE_DELIVERY_BASE_PATH;
+    private String videoDeliveryPath;
+    private String assetOriginalBinaryDeliveryPath;
+    private String assetMetadataPath;
+
+    @Override
+    public boolean enabled() {
+        return enabled;
+    }
+
+    @Override
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    @Override
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    @Override
+    public String getEnv() {
+        return env;
+    }
+
+    @Override
+    public String getImsOrg() {
+        return imsOrg;
+    }
+
+    @Override
+    public String getImsEnv() {
+        return imsEnv;
+    }
+
+    @Override
+    public String getImsClient() {
+        return imsClient;
+    }
+
+    @Override
+    public String getAssetSelectorsJsUrl() {
+        return assetSelectorsJsUrl;
+    }
+
+    @Override
+    public String getImageDeliveryBasePath() {
+        return imageDeliveryBasePath;
+    }
+
+    @Override
+    public String getVideoDeliveryPath() {
+        return videoDeliveryPath;
+    }
+
+    @Override
+    public String getAssetOriginalBinaryDeliveryPath() {
+        return assetOriginalBinaryDeliveryPath;
+    }
+
+    @Override
+    public String getAssetMetadataPath() {
+        return assetMetadataPath;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void setRepositoryId(String repositoryId) {
+        this.repositoryId = repositoryId;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public void setEnv(String env) {
+        this.env = env;
+    }
+
+    public void setImsOrg(String imsOrg) {
+        this.imsOrg = imsOrg;
+    }
+
+    public void setImsEnv(String imsEnv) {
+        this.imsEnv = imsEnv;
+    }
+
+    public void setImsClient(String imsClient) {
+        this.imsClient = imsClient;
+    }
+
+    public void setAssetSelectorsJsUrl(String assetSelectorsJsUrl) {
+        this.assetSelectorsJsUrl = assetSelectorsJsUrl;
+    }
+
+    public void setImageDeliveryBasePath(String imageDeliveryBasePath) {
+        this.imageDeliveryBasePath = imageDeliveryBasePath;
+    }
+
+    public void setVideoDeliveryPath(String videoDeliveryPath) {
+        this.videoDeliveryPath = videoDeliveryPath;
+    }
+
+    public void setAssetOriginalBinaryDeliveryPath(String assetOriginalBinaryDeliveryPath) {
+        this.assetOriginalBinaryDeliveryPath = assetOriginalBinaryDeliveryPath;
+    }
+
+    public void setAssetMetadataPath(String assetMetadataPath) {
+        this.assetMetadataPath = assetMetadataPath;
+    }
+}
diff --git a/bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json b/bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json
new file mode 100644
index 0000000000..73c2720b19
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json
@@ -0,0 +1,17 @@
+{
+  "id": "image-05f90862ec",
+  "fieldType": "image",
+  "name": "abcd",
+  "value": "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true",
+  "visible": false,
+  "altText": "abc",
+  "properties": {
+    "fd:path": "/content/image-ngdm"
+  },
+  "events": {
+    "custom:setProperty": [
+      "$event.payload"
+    ]
+  },
+  ":type": "core/fd/components/form/image/v1/image"
+}
diff --git a/bundles/af-core/src/test/resources/form/image/test-content.json b/bundles/af-core/src/test/resources/form/image/test-content.json
index 46cbd85af4..3404926c4f 100644
--- a/bundles/af-core/src/test/resources/form/image/test-content.json
+++ b/bundles/af-core/src/test/resources/form/image/test-content.json
@@ -65,5 +65,17 @@
     "hideTitle" : false,
     "visible" : false,
     "altText": "abc"
+  },
+  "image-ngdm": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/image/v1/image",
+    "name": "abcd",
+    "jcr:title": "def",
+    "hideTitle": false,
+    "visible": false,
+    "altText": "abc",
+    "fileReference": "/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png",
+    "excludeFromDor": false,
+    "fieldType": "image"
   }
 }
\ No newline at end of file
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 1c90cb7399..617863986a 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -474,6 +474,12 @@
             <classifier>apis</classifier>
         </dependency>
 
+        <!-- Needed for NextGenDynamicMediaConfig, used by the NGDM image picker. -->
+        <dependency>
+            <groupId>com.adobe.aem</groupId>
+            <artifactId>aem-sdk-api</artifactId>
+        </dependency>
+
         <!-- End of AEM and forms sdk versions -->
 
         <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 40835611ca..ce12471d83 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1139,10 +1139,12 @@
                 <version>2026.06.27.00-260700</version>
             </dependency>
 
+            <!-- Needed for NextGenDynamicMediaConfig, used by the NGDM image picker. -->
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>aem-sdk-api</artifactId>
-                <version>2022.9.8722.20220912T101352Z-220800</version>
+                <version>2023.9.13665.20230927T063259Z-230800</version>
+                <scope>provided</scope>
             </dependency>
 
 
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
index cbadc0f7cc..fd61eacc11 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
@@ -55,10 +55,34 @@
                                                     sling:orderBefore="visible"
                                                     sling:resourceType="cq/gui/components/authoring/dialog/fileupload"
                                                     class="cq-droptarget"
+                                                    enableNextGenDynamicMedia="{Boolean}true"
                                                     fileNameParameter="./fileName"
                                                     fileReferenceParameter="./fileReference"
                                                     mimeTypes="[image/gif,image/jpeg,image/png,image/tiff,image/svg+xml]"
-                                                    name="./file"/>
+                                                    name="./file">
+                                                <granite:rendercondition
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                                        toggleName="FT_FORMS-26424"/>
+                                            </file>
+                                            <fileLegacy
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:orderBefore="visible"
+                                                    sling:resourceType="cq/gui/components/authoring/dialog/fileupload"
+                                                    class="cq-droptarget"
+                                                    fileNameParameter="./fileName"
+                                                    fileReferenceParameter="./fileReference"
+                                                    mimeTypes="[image/gif,image/jpeg,image/png,image/tiff,image/svg+xml]"
+                                                    name="./file">
+                                                <granite:rendercondition
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/coral/foundation/renderconditions/not">
+                                                    <featuretoggle
+                                                            jcr:primaryType="nt:unstructured"
+                                                            sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                                            toggleName="FT_FORMS-26424"/>
+                                                </granite:rendercondition>
+                                            </fileLegacy>
                                             <alt
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:orderBefore="visible"
diff --git a/ui.tests/test-module/specs/image/image.authoring.cy.js b/ui.tests/test-module/specs/image/image.authoring.cy.js
index 349de5b1a1..becbe6cac8 100644
--- a/ui.tests/test-module/specs/image/image.authoring.cy.js
+++ b/ui.tests/test-module/specs/image/image.authoring.cy.js
@@ -23,6 +23,8 @@ const sitesSelectors = require('../../libs/commons/sitesSelectors'),
  */
 describe('Page - Authoring', function () {
   // we can use these values to log in
+  let toggle_array = [];
+  const FT_NGDM_IMAGE_PICKER = "FT_FORMS-26424";
 
   const dropImageInContainer = function() {
     const dataPath = "/content/forms/af/core-components-it/blank/jcr:content/guideContainer/*",
@@ -70,6 +72,34 @@ describe('Page - Authoring', function () {
     cy.deleteComponentByPath(imageDrop);
   }
 
+  // FT_FORMS-26424 (Next Gen Dynamic Media): the image dialog renders one of two
+  // fileupload widgets via granite:rendercondition -
+  //   - "file" (NGDM), when the toggle is ON, shows a "Pick" split-button dropdown
+  //     (`.polaris-dropdown` / `.polaris-dd-menu`) offering "Local" and "Remote" asset sources.
+  //   - "fileLegacy", when the toggle is OFF, shows a plain "Pick" button with no dropdown.
+  const testImageFilePickerBehaviour = function(imageEditPathSelector, imageDrop, isSites) {
+    if (isSites) {
+      dropImageInSites();
+    } else {
+      dropImageInContainer();
+    }
+    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + imageEditPathSelector);
+    cy.invokeEditableAction("[data-action='CONFIGURE']");
+    cy.get("[name='./file']").should("exist");
+    if (toggle_array.includes(FT_NGDM_IMAGE_PICKER)) {
+      // NGDM picker: dropdown with Local/Remote options
+      cy.get("[name='./file'] .polaris-dropdown .polaris-dd-button").should("exist").and("contain.text", "Pick");
+      cy.get("[name='./file'] .polaris-dd-menu li.cq-FileUpload-picker").should("exist").and("contain.text", "Local");
+      cy.get("[name='./file'] .polaris-dd-menu li.cq-FileUpload-picker-polaris").should("exist").and("contain.text", "Remote");
+    } else {
+      // Legacy picker: plain Pick button, no dropdown
+      cy.get("[name='./file'] .polaris-dropdown").should("not.exist");
+      cy.get("[name='./file'] button.cq-FileUpload-picker").first().should("exist").and("contain.text", "Pick");
+    }
+    cy.get('.cq-dialog-cancel').click();
+    cy.deleteComponentByPath(imageDrop);
+  }
+
   context('Open Forms Editor', function() {
     const pagePath = "/content/forms/af/core-components-it/blank",
         imageEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/image",
@@ -78,6 +108,11 @@ describe('Page - Authoring', function () {
     beforeEach(function () {
       // this is done since cypress session results in 403 sometimes
       cy.openAuthoring(pagePath);
+      cy.fetchFeatureToggles().then((response) => {
+        if (response.status === 200) {
+          toggle_array = response.body.enabled;
+        }
+      });
     });
 
     it('insert Image in form container', function () {
@@ -99,6 +134,10 @@ describe('Page - Authoring', function () {
       cy.get('.cq-dialog-cancel').click();
       cy.deleteComponentByPath(imageDrop);
     });
+
+    it('verify file picker widget based on FT_FORMS-26424 (NGDM) toggle', function(){
+      testImageFilePickerBehaviour(imageEditPathSelector, imageDrop);
+    });
   });
 
   context('Open Sites Editor', function () {
@@ -110,6 +149,11 @@ describe('Page - Authoring', function () {
     beforeEach(function () {
       // this is done since cypress session results in 403 sometimes
       cy.openAuthoring(pagePath);
+      cy.fetchFeatureToggles().then((response) => {
+        if (response.status === 200) {
+          toggle_array = response.body.enabled;
+        }
+      });
     });
 
     it('insert aem forms Image', function () {
@@ -121,5 +165,9 @@ describe('Page - Authoring', function () {
       testImageBehaviour(imageEditPathSelector, imageDrop, true);
     });
 
+    it('verify file picker widget based on FT_FORMS-26424 (NGDM) toggle', function(){
+      testImageFilePickerBehaviour(imageEditPathSelector, imageDrop, true);
+    });
+
   });
 });
\ No newline at end of file

From f7ab9d01885e2300c45bc5780d1beb899a72e366 Mon Sep 17 00:00:00 2001
From: Lovely Mandal <155715221+lovelymandal16@users.noreply.github.com>
Date: Mon, 28 Sep 2026 16:00:41 +0530
Subject: [PATCH 27/46] Add Next Gen Dynamic Media (NGDM) support to the
 StaticImage component (#1989) (#1998)

* Add Next Gen Dynamic Media (NGDM) support to the StaticImage component

Ports the NGDM asset support from adobe/aem-core-wcm-components#2481 to
the Adaptive Forms StaticImage (form/image v1) component. When the
fileReference is an NGDM asset (/urn:...) and the NextGenDynamicMediaConfig
OSGi service is enabled, the delivery URL is built directly instead of
resolving a DAM rendition. Bumps aem-sdk-api to 2023.9.13665 to pick up
the NextGenDynamicMediaConfig API, and enables the NGDM asset picker on
the component's file upload dialog field.



* Extract NGDM logic to utils, add exporter test, fix review findings

- Extract Next Gen Dynamic Media (NGDM) URL-resolution logic out of
  StaticImageImpl into a shared NgdmImageUtils class
- Add a Sling Model JSON-exporter test proving the resolved NGDM delivery
  URL is exposed as "value" and fd:repoPath is correctly absent
- Fix multi-dot seo-name filenames (e.g. "product.hero.png") resolving to
  the wrong delivery URL/extension by splitting on the last dot, not the
  first
- Tighten isNgdmImageReference() to require a non-empty asset-id and
  seo-name segment, avoiding a NoSuchElementException on malformed
  references
- Mark com.adobe.cq.ui.wcm.commons.config as an optional OSGi import so
  the bundle still resolves on installations without this Cloud Service
  API

* Gate NGDM image picker behind FT_FORMS-26424 feature toggle

- Add FT_NGDM_IMAGE_PICKER (FT_FORMS-26424) constant, following the
  existing FeatureToggleConstants pattern
- Split the Image dialog's file widget into two mutually-exclusive
  variants gated by granite:rendercondition/featuretoggle: NGDM picker
  enabled shows the Pick (Local/Remote) UI, disabled shows the original
  Browse Assets/Upload UI
- Gate StaticImageImpl's NGDM URL resolution and fd:repoPath exclusion
  behind the same toggle via ComponentUtils.isToggleEnabled(), so a
  saved NGDM reference is treated as a plain fileReference when the
  toggle is off
- Add toggle-enabled/disabled test coverage, following the same
  System.setProperty/@AfterEach pattern already used in FragmentImplTest

* Move NgdmImageUtils to internal.form package, use StringUtils for parsing

Addresses outstanding review feedback from rismehta on PR #1965:
- NgdmImageUtils was sitting under internal.models.v1.form; move it to
  internal.form alongside FeatureToggleConstants, since it's a shared
  helper, not a component model
- Replace manual indexOf/substring parsing with
  StringUtils.substringBefore/After(Last) in isNgdmImageReference() and
  buildNgdmImageSrc()



* Add Cypress test for NGDM file picker dialog UI (FT_FORMS-26424)

Addresses review comment from rismehta asking for test coverage of the
image dialog change: when FT_FORMS-26424 is enabled the "file" widget
renders a Pick dropdown with Local/Remote options, and when disabled the
"fileLegacy" widget renders a plain Pick button with no dropdown.

Verified end-to-end with a real Cypress run against a local AEM instance
in both toggle states (dropdown present/absent as expected).



---------

Co-authored-by: Pankaj Parashar <pankajpr+adobe@adobe.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 bundles/af-core/pom.xml                       |   1 +
 .../internal/form/FeatureToggleConstants.java |  10 ++
 .../internal/form/NgdmImageUtils.java         |  77 ++++++++++
 .../models/v1/form/StaticImageImpl.java       |  27 +++-
 .../internal/form/NgdmImageUtilsTest.java     | 122 +++++++++++++++
 .../models/v1/form/StaticImageImplTest.java   |  68 +++++++++
 .../MockNextGenDynamicMediaConfig.java        | 144 ++++++++++++++++++
 .../form/image/exporter-image-ngdm.json       |  17 +++
 .../resources/form/image/test-content.json    |  12 ++
 bundles/core/pom.xml                          |   6 +
 parent/pom.xml                                |   4 +-
 .../image/v1/image/_cq_dialog/.content.xml    |  26 +++-
 .../specs/image/image.authoring.cy.js         |  48 ++++++
 13 files changed, 559 insertions(+), 3 deletions(-)
 create mode 100644 bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java
 create mode 100644 bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java
 create mode 100644 bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java
 create mode 100644 bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json

diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 159030103e..d8c34847d7 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -88,6 +88,7 @@
                         <Import-Package>
                             javax.annotation;version=0.0.0,
                             com.adobe.cq.wcm.core.components.models;version="[12.0.0,13.0.0)",
+                            com.adobe.cq.ui.wcm.commons.config;resolution:=optional,
                             *
                         </Import-Package>
                     </instructions>
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java
index 2db537b7c4..29a3b9df5f 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FeatureToggleConstants.java
@@ -106,4 +106,14 @@ private FeatureToggleConstants() {}
      * System property: same name ({@code FT_FORMS-25252}); set to {@code "true"} to enable.
      */
     public static final String FT_SERVER_SIDE_VALIDATION = "FT_FORMS-25252";
+
+    /**
+     * When enabled, the Image field's authoring dialog shows the "Pick" dropdown (Local/Remote)
+     * for selecting a Next Gen Dynamic Media asset, and the component resolves NGDM references to
+     * a delivery URL. When disabled, the dialog shows the original Browse Assets/Upload UI, and any
+     * previously-saved NGDM reference is treated as a plain (unresolvable) fileReference instead.
+     * <p>
+     * System property: same name ({@code FT_FORMS-26424}); set to {@code "true"} to enable.
+     */
+    public static final String FT_NGDM_IMAGE_PICKER = "FT_FORMS-26424";
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java
new file mode 100644
index 0000000000..4759ff957f
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtils.java
@@ -0,0 +1,77 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.form;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig;
+
+/**
+ * Utility methods for resolving Next Gen Dynamic Media (NGDM) asset references (of the form
+ * {@code /urn:aaid:aem:<asset-id>/<seo-name>.<format>}) into delivery URLs.
+ */
+public final class NgdmImageUtils {
+
+    private static final String NGDM_REFERENCE_PREFIX = "/urn:";
+    private static final String PATH_PLACEHOLDER_ASSET_ID = "{asset-id}";
+    private static final String PATH_PLACEHOLDER_SEO_NAME = "{seo-name}";
+    private static final String PATH_PLACEHOLDER_FORMAT = "{format}";
+    private static final String DEFAULT_NGDM_ASSET_EXTENSION = "jpg";
+    private static final int DEFAULT_NGDM_ASSET_WIDTH = 640;
+
+    private NgdmImageUtils() {}
+
+    public static boolean isNgdmImageReference(String fileReference) {
+        if (StringUtils.isBlank(fileReference) || !fileReference.startsWith(NGDM_REFERENCE_PREFIX)) {
+            return false;
+        }
+        // must have a non-empty asset-id segment and a non-empty seo-name segment, i.e.
+        // "/urn:<asset-id>/<seo-name>[.<format>]", otherwise buildNgdmImageSrc() has nothing to parse.
+        String withoutLeadingSlash = fileReference.substring(1);
+        return StringUtils.isNotEmpty(StringUtils.substringBefore(withoutLeadingSlash, "/"))
+            && StringUtils.isNotEmpty(StringUtils.substringAfter(withoutLeadingSlash, "/"));
+    }
+
+    public static boolean isNgdmSupportAvailable(NextGenDynamicMediaConfig nextGenDynamicMediaConfig) {
+        return nextGenDynamicMediaConfig != null && nextGenDynamicMediaConfig.enabled()
+            && StringUtils.isNotBlank(nextGenDynamicMediaConfig.getRepositoryId());
+    }
+
+    /**
+     * Builds the Next Gen Dynamic Media delivery URL for an asset reference of the form
+     * {@code /urn:aaid:aem:<asset-id>/<seo-name>.<format>}.
+     */
+    public static String buildNgdmImageSrc(String fileReference, NextGenDynamicMediaConfig nextGenDynamicMediaConfig) {
+        String withoutLeadingSlash = fileReference.substring(1);
+        String assetId = StringUtils.substringBefore(withoutLeadingSlash, "/");
+        String assetFileName = StringUtils.substringAfter(withoutLeadingSlash, "/");
+
+        // split on the LAST dot, not the first: seo-names can legitimately contain dots
+        // (e.g. "product.hero.png"), and a first-dot split would truncate the name and
+        // produce the wrong extension.
+        boolean hasExtension = StringUtils.contains(assetFileName, ".");
+        String assetName = hasExtension ? StringUtils.substringBeforeLast(assetFileName, ".") : assetFileName;
+        String assetExtension = hasExtension ? StringUtils.substringAfterLast(assetFileName, ".")
+            : DEFAULT_NGDM_ASSET_EXTENSION;
+
+        String imageDeliveryPath = nextGenDynamicMediaConfig.getImageDeliveryBasePath()
+            .replace(PATH_PLACEHOLDER_ASSET_ID, assetId).replace(PATH_PLACEHOLDER_SEO_NAME, assetName)
+            .replace(PATH_PLACEHOLDER_FORMAT, assetExtension);
+
+        return "https://" + nextGenDynamicMediaConfig.getRepositoryId() + imageDeliveryPath + "?width="
+            + DEFAULT_NGDM_ASSET_WIDTH + "&preferwebp=true";
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
index 41c97c3124..f175bbae78 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
@@ -20,23 +20,30 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 import javax.jcr.RepositoryException;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Exporter;
 import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.Optional;
 import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
 import org.apache.sling.models.annotations.injectorspecific.SlingObject;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
 
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FeatureToggleConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.internal.form.NgdmImageUtils;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.StaticImage;
 import com.adobe.cq.forms.core.components.util.AbstractFormComponentImpl;
+import com.adobe.cq.forms.core.components.util.ComponentUtils;
+import com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig;
 import com.day.cq.wcm.foundation.Image;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -51,6 +58,10 @@ public class StaticImageImpl extends AbstractFormComponentImpl implements Static
 
     public static final String DAM_REPO_PATH = "fd:repoPath";
 
+    @Inject
+    @Optional
+    private NextGenDynamicMediaConfig nextGenDynamicMediaConfig;
+
     private Image image;
 
     @SlingObject
@@ -79,6 +90,9 @@ public class StaticImageImpl extends AbstractFormComponentImpl implements Static
      */
     @Override
     public String getImageSrc() throws RepositoryException, IOException {
+        if (isNgdmReferenceAndFeatureEnabled() && NgdmImageUtils.isNgdmSupportAvailable(nextGenDynamicMediaConfig)) {
+            return NgdmImageUtils.buildNgdmImageSrc(fileReference, nextGenDynamicMediaConfig);
+        }
         image = new Image(this.resource);
         boolean containsData = (image.getData() != null);
         if (containsData) {
@@ -129,12 +143,23 @@ public String getLinkUrl() {
     @Override
     public @Nonnull Map<String, Object> getProperties() {
         Map<String, Object> properties = super.getProperties();
-        if (fileReference != null && fileReference.length() > 0) {
+        if (StringUtils.isNotBlank(fileReference) && !isNgdmReferenceAndFeatureEnabled()) {
             properties.put(DAM_REPO_PATH, fileReference);
         }
         return properties;
     }
 
+    /**
+     * Whether {@link #fileReference} is a Next Gen Dynamic Media reference AND the NGDM image
+     * picker feature toggle is enabled. When the toggle is disabled, a previously-saved NGDM
+     * reference is treated like any other (unresolvable) fileReference - matching the dialog,
+     * which falls back to the original Browse Assets/Upload UI in that case.
+     */
+    private boolean isNgdmReferenceAndFeatureEnabled() {
+        return ComponentUtils.isToggleEnabled(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER)
+            && NgdmImageUtils.isNgdmImageReference(fileReference);
+    }
+
     @Override
     public String getFieldType() {
         return super.getFieldType(FieldType.IMAGE);
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java
new file mode 100644
index 0000000000..cacfdc25b7
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/form/NgdmImageUtilsTest.java
@@ -0,0 +1,122 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.form;
+
+import org.junit.jupiter.api.Test;
+
+import com.adobe.cq.forms.core.testing.MockNextGenDynamicMediaConfig;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class NgdmImageUtilsTest {
+
+    @Test
+    void isNgdmImageReference_WithUrnPrefix_ReturnsTrue() {
+        assertTrue(NgdmImageUtils
+            .isNgdmImageReference("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png"));
+    }
+
+    @Test
+    void isNgdmImageReference_WithDamPath_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmImageReference("/content/dam/some-asset.png"));
+    }
+
+    @Test
+    void isNgdmImageReference_WithNullOrBlank_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmImageReference(null));
+        assertFalse(NgdmImageUtils.isNgdmImageReference(""));
+        assertFalse(NgdmImageUtils.isNgdmImageReference("   "));
+    }
+
+    @Test
+    void isNgdmImageReference_WithMissingSeoNameSegment_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmImageReference("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911"));
+        assertFalse(NgdmImageUtils.isNgdmImageReference("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/"));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithEnabledConfigAndRepositoryId_ReturnsTrue() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+
+        assertTrue(NgdmImageUtils.isNgdmSupportAvailable(config));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithDisabledConfig_ReturnsFalse() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(false);
+        config.setRepositoryId("testrepo");
+
+        assertFalse(NgdmImageUtils.isNgdmSupportAvailable(config));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithBlankRepositoryId_ReturnsFalse() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("");
+
+        assertFalse(NgdmImageUtils.isNgdmSupportAvailable(config));
+    }
+
+    @Test
+    void isNgdmSupportAvailable_WithNullConfig_ReturnsFalse() {
+        assertFalse(NgdmImageUtils.isNgdmSupportAvailable(null));
+    }
+
+    @Test
+    void buildNgdmImageSrc_BuildsExpectedDeliveryUrl() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setRepositoryId("testrepo");
+
+        String src = NgdmImageUtils
+            .buildNgdmImageSrc("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png", config);
+
+        assertEquals(
+            "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true",
+            src);
+    }
+
+    @Test
+    void buildNgdmImageSrc_WithNoFormatSuffix_FallsBackToDefaultExtension() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setRepositoryId("testrepo");
+
+        String src = NgdmImageUtils.buildNgdmImageSrc("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits",
+            config);
+
+        assertEquals(
+            "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.jpg?width=640&preferwebp=true",
+            src);
+    }
+
+    @Test
+    void buildNgdmImageSrc_WithMultipleDotsInSeoName_KeepsFullNameAndCorrectExtension() {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setRepositoryId("testrepo");
+
+        String src = NgdmImageUtils
+            .buildNgdmImageSrc("/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/product.hero.png", config);
+
+        assertEquals(
+            "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/product.hero.png?width=640&preferwebp=true",
+            src);
+    }
+}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
index 1005598af3..ffefbffb5e 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
@@ -22,16 +22,19 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 import com.adobe.cq.forms.core.Utils;
+import com.adobe.cq.forms.core.components.internal.form.FeatureToggleConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.StaticImage;
 import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
+import com.adobe.cq.forms.core.testing.MockNextGenDynamicMediaConfig;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.adobe.cq.wcm.style.ComponentStyleInfo;
 import com.day.cq.wcm.foundation.Image;
@@ -53,9 +56,15 @@ public class StaticImageImplTest {
     private static final String PATH_IMAGE = CONTENT_ROOT + "/image";
     private static final String PATH_IMAGE_DATALAYER = CONTENT_ROOT + "/image-datalayer";
     private static final String PATH_IMAGE_WITHOUT_FIELDTYPE = CONTENT_ROOT + "/image-without-fieldtype";
+    private static final String PATH_IMAGE_NGDM = CONTENT_ROOT + "/image-ngdm";
 
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
+    @AfterEach
+    void clearNgdmFeatureToggle() {
+        System.clearProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER);
+    }
+
     @BeforeEach
     void setUp() {
         context.load().json(BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, CONTENT_ROOT);
@@ -215,4 +224,63 @@ void testNoFieldType() {
         StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_WITHOUT_FIELDTYPE, StaticImage.class, context);
         assertEquals(FieldType.IMAGE.getValue(), image.getFieldType());
     }
+
+    @Test
+    void testNgdmImage() throws RepositoryException, IOException {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        String expectedSrc = "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true";
+        assertEquals(expectedSrc, image.getImageSrc());
+        assertEquals(expectedSrc, image.getValue());
+        assertFalse(image.getProperties().containsKey(StaticImageImpl.DAM_REPO_PATH));
+    }
+
+    @Test
+    void testNgdmImageWithConfigDisabled() throws RepositoryException, IOException {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(false);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        assertNull(image.getImageSrc());
+        assertFalse(image.getProperties().containsKey(StaticImageImpl.DAM_REPO_PATH));
+    }
+
+    @Test
+    void testNgdmImageWithoutConfig() throws RepositoryException, IOException {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        assertNull(image.getImageSrc());
+    }
+
+    @Test
+    void testNgdmImageWithFeatureToggleDisabled() throws RepositoryException, IOException {
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        assertNull(image.getImageSrc());
+        assertTrue(image.getProperties().containsKey(StaticImageImpl.DAM_REPO_PATH));
+    }
+
+    @Test
+    void testJSONExportForNgdm() throws Exception {
+        System.setProperty(FeatureToggleConstants.FT_NGDM_IMAGE_PICKER, "true");
+        MockNextGenDynamicMediaConfig config = new MockNextGenDynamicMediaConfig();
+        config.setEnabled(true);
+        config.setRepositoryId("testrepo");
+        context.registerService(com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig.class, config);
+
+        StaticImage image = Utils.getComponentUnderTest(PATH_IMAGE_NGDM, StaticImage.class, context);
+        Utils.testJSONExport(image, Utils.getTestExporterJSONPath(BASE, PATH_IMAGE_NGDM));
+    }
 }
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java
new file mode 100644
index 0000000000..12e8270774
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/testing/MockNextGenDynamicMediaConfig.java
@@ -0,0 +1,144 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.testing;
+
+import com.adobe.cq.ui.wcm.commons.config.NextGenDynamicMediaConfig;
+
+public class MockNextGenDynamicMediaConfig implements NextGenDynamicMediaConfig {
+
+    static final String DEFAULT_IMAGE_DELIVERY_BASE_PATH = "/adobe/dynamicmedia/deliver/{asset-id}/{seo-name}.{format}";
+
+    private boolean enabled;
+    private String repositoryId;
+    private String apiKey;
+    private String env;
+    private String imsOrg;
+    private String imsEnv;
+    private String imsClient;
+    private String assetSelectorsJsUrl;
+    private String imageDeliveryBasePath = DEFAULT_IMAGE_DELIVERY_BASE_PATH;
+    private String videoDeliveryPath;
+    private String assetOriginalBinaryDeliveryPath;
+    private String assetMetadataPath;
+
+    @Override
+    public boolean enabled() {
+        return enabled;
+    }
+
+    @Override
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    @Override
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    @Override
+    public String getEnv() {
+        return env;
+    }
+
+    @Override
+    public String getImsOrg() {
+        return imsOrg;
+    }
+
+    @Override
+    public String getImsEnv() {
+        return imsEnv;
+    }
+
+    @Override
+    public String getImsClient() {
+        return imsClient;
+    }
+
+    @Override
+    public String getAssetSelectorsJsUrl() {
+        return assetSelectorsJsUrl;
+    }
+
+    @Override
+    public String getImageDeliveryBasePath() {
+        return imageDeliveryBasePath;
+    }
+
+    @Override
+    public String getVideoDeliveryPath() {
+        return videoDeliveryPath;
+    }
+
+    @Override
+    public String getAssetOriginalBinaryDeliveryPath() {
+        return assetOriginalBinaryDeliveryPath;
+    }
+
+    @Override
+    public String getAssetMetadataPath() {
+        return assetMetadataPath;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void setRepositoryId(String repositoryId) {
+        this.repositoryId = repositoryId;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public void setEnv(String env) {
+        this.env = env;
+    }
+
+    public void setImsOrg(String imsOrg) {
+        this.imsOrg = imsOrg;
+    }
+
+    public void setImsEnv(String imsEnv) {
+        this.imsEnv = imsEnv;
+    }
+
+    public void setImsClient(String imsClient) {
+        this.imsClient = imsClient;
+    }
+
+    public void setAssetSelectorsJsUrl(String assetSelectorsJsUrl) {
+        this.assetSelectorsJsUrl = assetSelectorsJsUrl;
+    }
+
+    public void setImageDeliveryBasePath(String imageDeliveryBasePath) {
+        this.imageDeliveryBasePath = imageDeliveryBasePath;
+    }
+
+    public void setVideoDeliveryPath(String videoDeliveryPath) {
+        this.videoDeliveryPath = videoDeliveryPath;
+    }
+
+    public void setAssetOriginalBinaryDeliveryPath(String assetOriginalBinaryDeliveryPath) {
+        this.assetOriginalBinaryDeliveryPath = assetOriginalBinaryDeliveryPath;
+    }
+
+    public void setAssetMetadataPath(String assetMetadataPath) {
+        this.assetMetadataPath = assetMetadataPath;
+    }
+}
diff --git a/bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json b/bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json
new file mode 100644
index 0000000000..73c2720b19
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/image/exporter-image-ngdm.json
@@ -0,0 +1,17 @@
+{
+  "id": "image-05f90862ec",
+  "fieldType": "image",
+  "name": "abcd",
+  "value": "https://testrepo/adobe/dynamicmedia/deliver/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png?width=640&preferwebp=true",
+  "visible": false,
+  "altText": "abc",
+  "properties": {
+    "fd:path": "/content/image-ngdm"
+  },
+  "events": {
+    "custom:setProperty": [
+      "$event.payload"
+    ]
+  },
+  ":type": "core/fd/components/form/image/v1/image"
+}
diff --git a/bundles/af-core/src/test/resources/form/image/test-content.json b/bundles/af-core/src/test/resources/form/image/test-content.json
index 46cbd85af4..3404926c4f 100644
--- a/bundles/af-core/src/test/resources/form/image/test-content.json
+++ b/bundles/af-core/src/test/resources/form/image/test-content.json
@@ -65,5 +65,17 @@
     "hideTitle" : false,
     "visible" : false,
     "altText": "abc"
+  },
+  "image-ngdm": {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/image/v1/image",
+    "name": "abcd",
+    "jcr:title": "def",
+    "hideTitle": false,
+    "visible": false,
+    "altText": "abc",
+    "fileReference": "/urn:aaid:aem:e82c3c87-1453-48f5-844b-1822fb610911/cutfruits.png",
+    "excludeFromDor": false,
+    "fieldType": "image"
   }
 }
\ No newline at end of file
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 90fdb63b05..5497209c13 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -474,6 +474,12 @@
             <classifier>apis</classifier>
         </dependency>
 
+        <!-- Needed for NextGenDynamicMediaConfig, used by the NGDM image picker. -->
+        <dependency>
+            <groupId>com.adobe.aem</groupId>
+            <artifactId>aem-sdk-api</artifactId>
+        </dependency>
+
         <!-- End of AEM and forms sdk versions -->
 
         <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b6618e449..6bd965941f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1139,10 +1139,12 @@
                 <version>2026.06.27.00-260700</version>
             </dependency>
 
+            <!-- Needed for NextGenDynamicMediaConfig, used by the NGDM image picker. -->
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>aem-sdk-api</artifactId>
-                <version>2022.9.8722.20220912T101352Z-220800</version>
+                <version>2023.9.13665.20230927T063259Z-230800</version>
+                <scope>provided</scope>
             </dependency>
 
 
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
index cbadc0f7cc..fd61eacc11 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/image/v1/image/_cq_dialog/.content.xml
@@ -55,10 +55,34 @@
                                                     sling:orderBefore="visible"
                                                     sling:resourceType="cq/gui/components/authoring/dialog/fileupload"
                                                     class="cq-droptarget"
+                                                    enableNextGenDynamicMedia="{Boolean}true"
                                                     fileNameParameter="./fileName"
                                                     fileReferenceParameter="./fileReference"
                                                     mimeTypes="[image/gif,image/jpeg,image/png,image/tiff,image/svg+xml]"
-                                                    name="./file"/>
+                                                    name="./file">
+                                                <granite:rendercondition
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                                        toggleName="FT_FORMS-26424"/>
+                                            </file>
+                                            <fileLegacy
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:orderBefore="visible"
+                                                    sling:resourceType="cq/gui/components/authoring/dialog/fileupload"
+                                                    class="cq-droptarget"
+                                                    fileNameParameter="./fileName"
+                                                    fileReferenceParameter="./fileReference"
+                                                    mimeTypes="[image/gif,image/jpeg,image/png,image/tiff,image/svg+xml]"
+                                                    name="./file">
+                                                <granite:rendercondition
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/coral/foundation/renderconditions/not">
+                                                    <featuretoggle
+                                                            jcr:primaryType="nt:unstructured"
+                                                            sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                                            toggleName="FT_FORMS-26424"/>
+                                                </granite:rendercondition>
+                                            </fileLegacy>
                                             <alt
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:orderBefore="visible"
diff --git a/ui.tests/test-module/specs/image/image.authoring.cy.js b/ui.tests/test-module/specs/image/image.authoring.cy.js
index 349de5b1a1..becbe6cac8 100644
--- a/ui.tests/test-module/specs/image/image.authoring.cy.js
+++ b/ui.tests/test-module/specs/image/image.authoring.cy.js
@@ -23,6 +23,8 @@ const sitesSelectors = require('../../libs/commons/sitesSelectors'),
  */
 describe('Page - Authoring', function () {
   // we can use these values to log in
+  let toggle_array = [];
+  const FT_NGDM_IMAGE_PICKER = "FT_FORMS-26424";
 
   const dropImageInContainer = function() {
     const dataPath = "/content/forms/af/core-components-it/blank/jcr:content/guideContainer/*",
@@ -70,6 +72,34 @@ describe('Page - Authoring', function () {
     cy.deleteComponentByPath(imageDrop);
   }
 
+  // FT_FORMS-26424 (Next Gen Dynamic Media): the image dialog renders one of two
+  // fileupload widgets via granite:rendercondition -
+  //   - "file" (NGDM), when the toggle is ON, shows a "Pick" split-button dropdown
+  //     (`.polaris-dropdown` / `.polaris-dd-menu`) offering "Local" and "Remote" asset sources.
+  //   - "fileLegacy", when the toggle is OFF, shows a plain "Pick" button with no dropdown.
+  const testImageFilePickerBehaviour = function(imageEditPathSelector, imageDrop, isSites) {
+    if (isSites) {
+      dropImageInSites();
+    } else {
+      dropImageInContainer();
+    }
+    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + imageEditPathSelector);
+    cy.invokeEditableAction("[data-action='CONFIGURE']");
+    cy.get("[name='./file']").should("exist");
+    if (toggle_array.includes(FT_NGDM_IMAGE_PICKER)) {
+      // NGDM picker: dropdown with Local/Remote options
+      cy.get("[name='./file'] .polaris-dropdown .polaris-dd-button").should("exist").and("contain.text", "Pick");
+      cy.get("[name='./file'] .polaris-dd-menu li.cq-FileUpload-picker").should("exist").and("contain.text", "Local");
+      cy.get("[name='./file'] .polaris-dd-menu li.cq-FileUpload-picker-polaris").should("exist").and("contain.text", "Remote");
+    } else {
+      // Legacy picker: plain Pick button, no dropdown
+      cy.get("[name='./file'] .polaris-dropdown").should("not.exist");
+      cy.get("[name='./file'] button.cq-FileUpload-picker").first().should("exist").and("contain.text", "Pick");
+    }
+    cy.get('.cq-dialog-cancel').click();
+    cy.deleteComponentByPath(imageDrop);
+  }
+
   context('Open Forms Editor', function() {
     const pagePath = "/content/forms/af/core-components-it/blank",
         imageEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/image",
@@ -78,6 +108,11 @@ describe('Page - Authoring', function () {
     beforeEach(function () {
       // this is done since cypress session results in 403 sometimes
       cy.openAuthoring(pagePath);
+      cy.fetchFeatureToggles().then((response) => {
+        if (response.status === 200) {
+          toggle_array = response.body.enabled;
+        }
+      });
     });
 
     it('insert Image in form container', function () {
@@ -99,6 +134,10 @@ describe('Page - Authoring', function () {
       cy.get('.cq-dialog-cancel').click();
       cy.deleteComponentByPath(imageDrop);
     });
+
+    it('verify file picker widget based on FT_FORMS-26424 (NGDM) toggle', function(){
+      testImageFilePickerBehaviour(imageEditPathSelector, imageDrop);
+    });
   });
 
   context('Open Sites Editor', function () {
@@ -110,6 +149,11 @@ describe('Page - Authoring', function () {
     beforeEach(function () {
       // this is done since cypress session results in 403 sometimes
       cy.openAuthoring(pagePath);
+      cy.fetchFeatureToggles().then((response) => {
+        if (response.status === 200) {
+          toggle_array = response.body.enabled;
+        }
+      });
     });
 
     it('insert aem forms Image', function () {
@@ -121,5 +165,9 @@ describe('Page - Authoring', function () {
       testImageBehaviour(imageEditPathSelector, imageDrop, true);
     });
 
+    it('verify file picker widget based on FT_FORMS-26424 (NGDM) toggle', function(){
+      testImageFilePickerBehaviour(imageEditPathSelector, imageDrop, true);
+    });
+
   });
 });
\ No newline at end of file

From 2c7be461d4a93d0553d81b6287139cbe7a4acef9 Mon Sep 17 00:00:00 2001
From: lovelymandal16 <lovelymandal16@gmail.com>
Date: Mon, 28 Sep 2026 16:24:51 +0530
Subject: [PATCH 28/46] @releng [maven-scm] :prepare release
 core-forms-components-reactor-3.0.168

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index 5641fa7667..d662f6ebb5 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index d8c34847d7..3d7e77e9f0 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 5497209c13..1e6a587ac5 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 7b1ed33327..39a1e099f7 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index a12eab6fe1..140b2571d3 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 34047fec0d..c2c1bb5dca 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index 68ff0fd32c..c47bf1fbbd 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index ef7b8a4a90..b91f6b3a05 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index da1a06f4dd..361226e85d 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 07ee36a858..c13d82c886 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index 6d0191ffca..e4f36a56b6 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index b83a38e8fe..4bde4faa3a 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index a9264ca0d6..320a7299d0 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6bd965941f..a8ea00b042 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.167-SNAPSHOT</version>
+    <version>3.0.168</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 2247b3cfc1..7b576d85dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index d54040fb60..78338e7b52 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 0c37d67b6f..dfeebbb228 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.168</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index e74d6e7d9d..f7a48c561d 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 5760091da2..c5eb8ce429 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.167-SNAPSHOT</version>
+        <version>3.0.168</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From 5b1e0504b0f5f4240452d250377d3b543706ffa3 Mon Sep 17 00:00:00 2001
From: lovelymandal16 <lovelymandal16@gmail.com>
Date: Mon, 28 Sep 2026 16:24:52 +0530
Subject: [PATCH 29/46] @releng [maven-scm] :prepare for next development
 iteration

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index d662f6ebb5..e2896edb64 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 3d7e77e9f0..285cdc03e9 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 1e6a587ac5..3e26332b11 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 39a1e099f7..c58743c993 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 140b2571d3..666f973b72 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index c2c1bb5dca..c15a1b6e66 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index c47bf1fbbd..8158ec1fc5 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index b91f6b3a05..2e176f256c 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index 361226e85d..be18f9e748 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index c13d82c886..6365c1a78e 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index e4f36a56b6..dce9434078 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index 4bde4faa3a..7128048e60 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 320a7299d0..a97b20eb7c 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index a8ea00b042..8014e222bb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.168</version>
+    <version>3.0.169-SNAPSHOT</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 7b576d85dc..3dce744ebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 78338e7b52..8914942082 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index dfeebbb228..d623069aff 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.168</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index f7a48c561d..d3b22f92c5 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index c5eb8ce429..5fdc05a4b7 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.168</version>
+        <version>3.0.169-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From f5c75dd2474efd516bb5bc615d3f075f89e025ea Mon Sep 17 00:00:00 2001
From: Ikshu-Jain-1 <ikshuadobe123@gmail.com>
Date: Wed, 30 Sep 2026 17:21:21 +0530
Subject: [PATCH 30/46] FORMS-27923: Fix captcha validation failure for
 existing forms (#2003)

* FORMS-27923: Fix captcha validation failure for existing forms

* FORMS-27923: Adding tests

---------

Co-authored-by: Ikshu Jain <ikshuj@adobe.com>
---
 .../core/components/util/AbstractCaptchaImpl.java    |  5 +++++
 .../internal/models/v1/form/RecaptchaImplTest.java   | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java
index 4b82de8c63..1b635b7b17 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java
@@ -47,6 +47,11 @@ public String getFieldType() {
         return super.getFieldType(FieldType.CAPTCHA);
     }
 
+    @Override
+    public Boolean isRequired() {
+        return Boolean.TRUE;
+    }
+
     @JsonIgnore
     public abstract Map<String, Object> getCaptchaProperties();
 
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
index cc89a223d6..dfec064c99 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
@@ -143,6 +143,18 @@ void testIsEnabled() {
         assertEquals(null, recaptchaMock.isEnabled());
     }
 
+    @Test
+    void testIsRequired() {
+        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
+        assertEquals(Boolean.TRUE, recaptcha.isRequired());
+    }
+
+    @Test
+    void testIsRequiredWithoutFieldType() {
+        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA_WITHOUT_FEILDTYPE, Captcha.class, context);
+        assertEquals(Boolean.TRUE, recaptcha.isRequired());
+    }
+
     @Test
     void testJSONExport() throws Exception {
         Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);

From b9026ad45921667362c42d29022dfa35278ceb48 Mon Sep 17 00:00:00 2001
From: Ikshu Jain <ikshuj@adobe.com>
Date: Thu, 1 Oct 2026 15:02:35 +0530
Subject: [PATCH 31/46] @releng [maven-scm] :prepare release
 core-forms-components-reactor-3.0.170

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index e2896edb64..ed9473e0d1 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 285cdc03e9..fc2312ad9a 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 3e26332b11..b2df10d696 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index c58743c993..3c0edc67fd 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 666f973b72..04eabe630b 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index c15a1b6e66..25b7f44a58 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index 8158ec1fc5..264f511d58 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 2e176f256c..198d78d44a 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index be18f9e748..e85e829258 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 6365c1a78e..79714b134b 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index dce9434078..7b05385aee 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index 7128048e60..b11a35380a 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index a97b20eb7c..21073fa12c 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8014e222bb..46e759f8b9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.169-SNAPSHOT</version>
+    <version>3.0.170</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 3dce744ebb..1561ef7c85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 8914942082..f160a7ea07 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index d623069aff..1362240c13 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.170</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index d3b22f92c5..058367bd3c 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 5fdc05a4b7..514f0f040e 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.169-SNAPSHOT</version>
+        <version>3.0.170</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From 03a737a2d311b8c2b1b5bad21568ac2dacef8b0c Mon Sep 17 00:00:00 2001
From: Ikshu Jain <ikshuj@adobe.com>
Date: Thu, 1 Oct 2026 15:02:35 +0530
Subject: [PATCH 32/46] @releng [maven-scm] :prepare for next development
 iteration

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index ed9473e0d1..964a8a41d6 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index fc2312ad9a..f468d67c72 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index b2df10d696..8d61e0d703 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 3c0edc67fd..4f8589e754 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 04eabe630b..19709d1548 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 25b7f44a58..4ad5181dd5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index 264f511d58..9a3fdc25aa 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 198d78d44a..43f8d9c2e2 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index e85e829258..9fe25442f0 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 79714b134b..08c98cec83 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index 7b05385aee..613d33b921 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index b11a35380a..f41fba3000 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 21073fa12c..26d39503d3 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index 46e759f8b9..750160b975 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.170</version>
+    <version>3.0.171-SNAPSHOT</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 1561ef7c85..4805f953b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index f160a7ea07..d71f211233 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 1362240c13..af98f808ff 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.170</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 058367bd3c..44545d28a6 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 514f0f040e..314225c459 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.170</version>
+        <version>3.0.171-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From cf5211bee7062a67a574313c20835d4a47dc9fbc Mon Sep 17 00:00:00 2001
From: Rishi Mehta <69448117+rismehta@users.noreply.github.com>
Date: Fri, 2 Oct 2026 12:06:29 +0530
Subject: [PATCH 33/46] Merge pull request #1985 from adobe/feat/webmcp-runtime

feat(webmcp): register the WebMCP tool catalog on form load
---
 .../internal/form/ReservedProperties.java     |   1 +
 .../models/v2/form/FormContainerImpl.java     |   7 +
 .../models/v2/form/FormContainerImplTest.java |  40 +++++
 docs/e2e-testing/feature-toggles.md           |  11 +-
 ...mpl.dev.DynamicToggleProviderImpl.cfg.json |   3 +-
 .../v2/container/_cq_dialog/.content.xml      |  13 ++
 ui.frontend/__tests__/guidebridge.test.js     |   6 +
 .../__tests__/webmcp.integration.test.js      |  91 ++++++++++
 ui.frontend/__tests__/webmcp.test.js          | 164 ++++++++++++++++++
 ui.frontend/jest.config.js                    |   2 +-
 ui.frontend/package-lock.json                 |  50 ++++--
 ui.frontend/package.json                      |   7 +-
 ui.frontend/src/GuideBridge.js                |  43 ++++-
 ui.frontend/src/utils.js                      |  21 +++
 ui.frontend/src/view/FormContainer.js         |  22 +++
 .../authoring/ruleEditor.authoring.cy.js      |  67 +++++--
 .../specs/webmcp/webmcp.authoring.cy.js       | 125 +++++++++++++
 17 files changed, 629 insertions(+), 44 deletions(-)
 create mode 100644 ui.frontend/__tests__/webmcp.integration.test.js
 create mode 100644 ui.frontend/__tests__/webmcp.test.js
 create mode 100644 ui.tests/test-module/specs/webmcp/webmcp.authoring.cy.js

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
index b8e7a7b723..bd9ee8f4b7 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java
@@ -177,6 +177,7 @@ private ReservedProperties() {
     public static final String FD_DRAFT_ID = "fd:draftId";
     public static final String FD_CHANGE_EVENT_BEHAVIOUR = "fd:changeEventBehaviour";
     public static final String FD_SET_PROPERTY_BEHAVIOUR = "fd:setPropertyBehaviour";
+    public static final String FD_WEB_MCP_ENABLED = "fd:webMcpEnabled";
 
     public static final String PN_CQ_ANNOTATIONS = "cq:annotations";
 
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
index 67b2025fa5..e1437bd7d3 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
@@ -154,6 +154,10 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     @Nullable
     private String setPropertyBehaviour;
 
+    @ValueMapValue(name = ReservedProperties.FD_WEB_MCP_ENABLED, injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private Boolean webMcpEnabled;
+
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DATA)
     @Nullable
     private String data;
@@ -437,6 +441,9 @@ public String getLanguageDirection() {
         if (StringUtils.isNotBlank(setPropertyBehaviour)) {
             properties.put(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR, setPropertyBehaviour);
         }
+        if (webMcpEnabled != null) {
+            properties.put(ReservedProperties.FD_WEB_MCP_ENABLED, webMcpEnabled);
+        }
         properties.put(FD_FORM_DATA_ENABLED, formDataEnabled);
         if (this.autoSaveConfig != null && this.autoSaveConfig.isEnableAutoSave()) {
             properties.put(ReservedProperties.FD_AUTO_SAVE_PROPERTY_WRAPPER, this.autoSaveConfig);
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
index 0be68a8040..08bf087560 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
@@ -693,6 +693,46 @@ void testSetPropertyBehaviourAbsentWhenNotAuthored() throws Exception {
         assertNull(formContainer.getProperties().get(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR));
     }
 
+    @Test
+    void testWebMcpEnabledAbsentWhenNotAuthored() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        assertFalse(formContainer.getProperties().containsKey(ReservedProperties.FD_WEB_MCP_ENABLED));
+        JsonNode properties = new ObjectMapper().readTree(Utils.getJson(formContainer, Views.Publish.class)).get("properties");
+        assertFalse(properties.has(ReservedProperties.FD_WEB_MCP_ENABLED));
+    }
+
+    @Test
+    void testWebMcpEnabledFromNode() throws Exception {
+        assertWebMcpEnabledExport(true, true);
+    }
+
+    @Test
+    void testWebMcpDisabledFromNode() throws Exception {
+        assertWebMcpEnabledExport(false, false);
+    }
+
+    @Test
+    void testWebMcpEnabledFromStringNode() throws Exception {
+        assertWebMcpEnabledExport("true", true);
+    }
+
+    @Test
+    void testWebMcpDisabledFromStringNode() throws Exception {
+        assertWebMcpEnabledExport("false", false);
+    }
+
+    private void assertWebMcpEnabledExport(Object authoredValue, boolean enabled) throws Exception {
+        Resource resource = context.resourceResolver().getResource(PATH_FORM_1);
+        resource.adaptTo(ModifiableValueMap.class).put(ReservedProperties.FD_WEB_MCP_ENABLED, authoredValue);
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        assertEquals(enabled, formContainer.getProperties().get(ReservedProperties.FD_WEB_MCP_ENABLED));
+        JsonNode property = new ObjectMapper().readTree(Utils.getJson(formContainer, Views.Publish.class))
+            .get("properties").get(ReservedProperties.FD_WEB_MCP_ENABLED);
+        assertNotNull(property);
+        assertTrue(property.isBoolean());
+        assertEquals(enabled, property.booleanValue());
+    }
+
     @Test
     void testCustomFunctionUrl() throws Exception {
         FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
diff --git a/docs/e2e-testing/feature-toggles.md b/docs/e2e-testing/feature-toggles.md
index 641d26b5f0..d04e6a2649 100644
--- a/docs/e2e-testing/feature-toggles.md
+++ b/docs/e2e-testing/feature-toggles.md
@@ -37,7 +37,7 @@ it/config/src/main/content/jcr_root/apps/system/config/
   com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
 ```
 
-Add the toggle name to the `enabled` array in that file to turn it on in IT.
+Add the toggle name to the `enabledToggles` array in that file to turn it on in IT.
 
 ### Layer 2 — JVM System Property (server-side)
 
@@ -77,7 +77,7 @@ When adding a new toggle, the only config file that requires an update is:
 
 | File | Change |
 |------|--------|
-| `com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json` | Add toggle name to `enabled` array |
+| `com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json` | Add toggle name to `enabledToggles` array |
 
 ---
 
@@ -178,6 +178,11 @@ it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples
 |------|----------------|
 | `ui.tests/test-module/specs/fragment/fragment.featuretoggles.cy.js` | FT_FORMS-24087, FT_FORMS-24343, FT_FORMS-24358 |
 | `ui.tests/test-module/specs/panelcontainer/panelcontainer.featuretoggles.cy.js` | FT_FORMS-24358 |
+| `ui.tests/test-module/specs/webmcp/webmcp.authoring.cy.js` | FT_FORMS-28233 (latest addon) |
+
+The enabled WebMCP authoring suite runs on the latest addon, uses the existing accessibility sample, enables **Enable AI assistant access (WebMCP)** in the container dialog, and opens the saved form in preview. A preview-scoped response interceptor installs a test-only `document.modelContext` host before runtime scripts load; the real runtime must register `list_forms` plus all 12 form tools and return the accessibility form's field summary. Authenticated browser cleanup restores the original opt-in property and its type, or deletes it when originally absent.
+
+Running the authoring flow requires matching Java models and standard/XFA runtime clientlibs, IT content, the examples page component package, and the IT toggle configuration. The instance must have the development toggle provider installed and expose `FT_FORMS-28233` in `/etc.clientlibs/toggles.json`; configuring `enabledToggles` without an active provider does not enable the flag. When the flag is absent, including in without-FT jobs, the suite is reported as skipped without changing the opt-in property. With the flag enabled, the full authoring and preview assertions run.
 
 ---
 
@@ -219,7 +224,7 @@ curl -s -u admin:admin "http://localhost:4502/content/forms/af/core-components-i
 
 1. **Define the constant** — add `public static final String FT_FORMS_XXXXX = "FT_FORMS-XXXXX";` to `FeatureToggleConstants.java`.
 
-2. **Enable in Granite config** — add `"FT_FORMS-XXXXX"` to the `enabled` array in `DynamicToggleProviderImpl.cfg.json`.
+2. **Enable in Granite config** — add `"FT_FORMS-XXXXX"` to the `enabledToggles` array in `DynamicToggleProviderImpl.cfg.json`.
 
 3. **Provision test content** — decide whether to reuse an existing IT sample page or create a new one under `it/content/.../samples/`. Create new JCR content only when the toggled behavior requires it.
 
diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
index 4b8c218bf4..f7b302323f 100644
--- a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
+++ b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
@@ -28,7 +28,8 @@
     "FT_FORMS-24087",
     "FT_FORMS-24343",
     "FT_FORMS-25252",
-    "FT_FORMS-27648"
+    "FT_FORMS-27648",
+    "FT_FORMS-28233"
   ],
   "disabledToggles": [
   ]
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml
index 7ce0ab65c4..2636bc1e13 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml
@@ -92,6 +92,19 @@
                                       text="Enable the hamburger menu for mobile view"
                                       fieldDescription="Select the option to display the hamburger menu for efficient navigation on mobile devices."
                                       value="{Boolean}true"/>
+                                    <webMcpEnabled
+                                      jcr:primaryType="nt:unstructured"
+                                      sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                      name="./fd:webMcpEnabled"
+                                      text="Enable AI assistant access (WebMCP)"
+                                      fieldDescription="Allows supported browser AI assistants to securely understand and help users complete this form through WebMCP tools. When enabled, assistants can read form fields and, with user confirmation, update values or submit the form."
+                                      uncheckedValue="{Boolean}false"
+                                      value="{Boolean}true">
+                                        <granite:rendercondition
+                                          jcr:primaryType="nt:unstructured"
+                                          sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                          toggleName="FT_FORMS-28233"/>
+                                    </webMcpEnabled>
                                     <fieldType
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/select"
diff --git a/ui.frontend/__tests__/guidebridge.test.js b/ui.frontend/__tests__/guidebridge.test.js
index c7a8840583..9a3feee0b3 100644
--- a/ui.frontend/__tests__/guidebridge.test.js
+++ b/ui.frontend/__tests__/guidebridge.test.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  ******************************************************************************/
 
+jest.mock('@aemforms/af-webmcp', () => ({registerFormWebMCP: jest.fn()}));
+
 import {Constants} from "../src/index";
 import FormContainer from "../src/view/FormContainer";
 import formJson from './resources/form.json';
@@ -53,14 +55,18 @@ test('GuideBridge test', () => {
            const resetButton = resultModel.getElement("reset-c7cccb1a5e");
            expect(resetButton).not.toBeNull();
            expect(resetButton.visible).toBeFalsy();
+           guideBridge.unloadAdaptiveForm("/a/b/c");
+           expect(unregisterWebMcp).toHaveBeenCalledTimes(1);
        }});
 
    });
+   const unregisterWebMcp = jest.fn();
    var formContainer = new FormContainer({
        _formJson: formJson,
        _prefillData: {data: {"textinput1662370110841" : "initialData"}},
        _path: "/a/b/c"
    });
+   formContainer._setWebMcpUnregister(unregisterWebMcp);
    const event = new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, { "detail": formContainer });
    document.dispatchEvent(event);
 });
diff --git a/ui.frontend/__tests__/webmcp.integration.test.js b/ui.frontend/__tests__/webmcp.integration.test.js
new file mode 100644
index 0000000000..53bb0ac15f
--- /dev/null
+++ b/ui.frontend/__tests__/webmcp.integration.test.js
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+import {createFormInstance} from '@aemforms/af-core';
+import {registerFormWebMCP} from '@aemforms/af-webmcp';
+import Utils from '../src/utils';
+
+describe('published WebMCP runtime integration', () => {
+    let unregister;
+    let tools;
+    let handles;
+    let host;
+    let rum;
+
+    beforeEach(() => {
+        tools = new Map();
+        handles = [];
+        host = {registerTool: jest.fn(tool => {
+            tools.set(tool.name, tool);
+            const handle = {unregister: jest.fn(() => tools.delete(tool.name))};
+            handles.push(handle);
+            return handle;
+        })};
+        document.modelContext = host;
+        rum = jest.fn();
+        window.hlx = {sampleRUM: rum};
+    });
+
+    afterEach(() => {
+        if (unregister) { unregister(); }
+        unregister = undefined;
+        delete document.modelContext;
+        delete window.hlx;
+        document.body.innerHTML = '';
+    });
+
+    function form(enabled) {
+        return createFormInstance({
+            id: 'published-runtime',
+            properties: {'fd:webMcpEnabled': enabled},
+            items: [{id: 'name', name: 'name', type: 'string', fieldType: 'text-input', value: 'before'}]
+        });
+    }
+
+    test('registers actual tools, changes values, bridges DOM focus, and cleans up', async () => {
+        const model = form(true);
+        const input = document.createElement('input');
+        document.body.appendChild(input);
+        const view = {setFocus: jest.fn(() => input.focus())};
+        unregister = registerFormWebMCP(model, Utils.getWebMcpOptions(view));
+
+        expect(tools.get('validate_form_completeness').annotations)
+            .toEqual(expect.objectContaining({readOnlyHint: true, untrustedContentHint: true}));
+        expect(await tools.get('set_field_value').execute({field: 'name', value: 'after'}))
+            .toEqual(expect.objectContaining({success: true, changed: true}));
+        expect(model.getElement('name').value).toBe('after');
+        expect(rum).toHaveBeenCalledWith('fill', {source: 'af-webmcp', target: 'set_field_value'});
+        rum.mockClear();
+        await tools.get('set_field_value').execute({field: 'name', value: 'after'});
+        expect(rum).not.toHaveBeenCalled();
+
+        expect((await tools.get('focus_field').execute({field: 'name'})).success).toBe(true);
+        expect(view.setFocus).toHaveBeenCalledWith('name');
+        expect(document.activeElement).toBe(input);
+        expect(rum).toHaveBeenCalledWith('click', {source: 'af-webmcp', target: 'focus_field'});
+
+        unregister();
+        expect(tools.size).toBe(0);
+        handles.forEach(handle => expect(handle.unregister).toHaveBeenCalledTimes(1));
+        unregister = undefined;
+    });
+
+    test('does not expose tools for a form that did not opt in', () => {
+        unregister = registerFormWebMCP(form(false));
+        expect(host.registerTool).not.toHaveBeenCalled();
+        expect(tools.size).toBe(0);
+    });
+});
diff --git a/ui.frontend/__tests__/webmcp.test.js b/ui.frontend/__tests__/webmcp.test.js
new file mode 100644
index 0000000000..6a59a947ca
--- /dev/null
+++ b/ui.frontend/__tests__/webmcp.test.js
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright 2022 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+// Adapter behavior lives in af-webmcp's suite; these tests cover bootstrap and scoped forwarding.
+jest.mock('@aemforms/af-webmcp', () => ({registerFormWebMCP: jest.fn()}));
+jest.mock('../src/HTTPAPILayer.js', () => ({
+    __esModule: true,
+    default: {getFormDefinition: jest.fn(), getJson: jest.fn()}
+}));
+jest.mock('../src/RuleUtils.js', () => ({
+    __esModule: true,
+    default: {registerCustomFunctionsV2: jest.fn(), registerCustomFunctionsByUrl: jest.fn()}
+}));
+
+import Utils from '../src/utils';
+import FormContainer from '../src/view/FormContainer';
+import {registerFormWebMCP} from '@aemforms/af-webmcp';
+import HTTPAPILayer from '../src/HTTPAPILayer.js';
+import formJson from './resources/form.json';
+import GuideBridge from '../src/GuideBridge';
+import {Constants} from '../src/constants';
+
+afterEach(() => {
+    document.body.innerHTML = '';
+    jest.clearAllMocks();
+});
+
+test('setupFormContainer registers the WebMCP catalog once with the form model', async () => {
+    HTTPAPILayer.getFormDefinition.mockResolvedValue(formJson);
+    const unregister = jest.fn();
+    registerFormWebMCP.mockReturnValue(unregister);
+
+    const el = document.createElement('div');
+    el.classList.add('cmp-adaptiveform-container');
+    el.dataset.cmpPath = '/content/a/b/c';
+    document.body.appendChild(el);
+
+    let container;
+    const createFormContainer = (params) => {
+        container = new FormContainer(params);
+        return container;
+    };
+
+    await Utils.setupFormContainer(createFormContainer, '.cmp-adaptiveform-container', 'adaptiveFormContainer');
+
+    expect(registerFormWebMCP).toHaveBeenCalledTimes(1);
+    expect(registerFormWebMCP).toHaveBeenCalledWith(container.getModel(), {onFocusRequest: expect.any(Function)});
+    expect(container.getModel().id).toBe('/content/a/b/c');
+    container._unregisterWebMcp();
+    expect(unregister).toHaveBeenCalledTimes(1);
+});
+
+test('setupFormContainer preserves pre-initialization and connect callback tools', async () => {
+    HTTPAPILayer.getFormDefinition.mockResolvedValue(formJson);
+    const unregister = jest.fn();
+    const additionalTools = jest.fn();
+    const bridge = new GuideBridge();
+    const path = '/content/a/b/domain-form';
+    bridge.registerWebMcpAdditionalTools(path, additionalTools);
+    const replacement = jest.fn();
+    bridge.connect(() => bridge.registerWebMcpAdditionalTools(path, replacement), null, path);
+    registerFormWebMCP.mockReturnValue(unregister);
+
+    const el = document.createElement('div');
+    el.classList.add('cmp-adaptiveform-container');
+    el.dataset.cmpPath = '/content/a/b/domain-form';
+    document.body.appendChild(el);
+
+    let container;
+    const createFormContainer = (params) => {
+        container = new FormContainer(params);
+        return container;
+    };
+    await Utils.setupFormContainer(createFormContainer, '.cmp-adaptiveform-container', 'adaptiveFormContainer');
+    expect(registerFormWebMCP).toHaveBeenCalledWith(container.getModel(), {additionalTools, onFocusRequest: expect.any(Function)});
+    expect(registerFormWebMCP).toHaveBeenLastCalledWith(container.getModel(), {additionalTools: replacement, onFocusRequest: expect.any(Function)});
+    bridge.unloadAdaptiveForm(path);
+});
+
+test('explicit paths isolate two forms and stale disposers cannot remove replacements', () => {
+    const bridge = new GuideBridge();
+    const first = new FormContainer({_formJson: formJson, _prefillData: {}, _path: '/first', _element: document.createElement('div')});
+    const second = new FormContainer({_formJson: formJson, _prefillData: {}, _path: '/second', _element: document.createElement('div')});
+    const factory = jest.fn();
+    const replacement = jest.fn();
+    const dispose = bridge.registerWebMcpAdditionalTools('/first', factory);
+    [first, second].forEach(container => {
+        container._setWebMcpUnregister(jest.fn());
+        document.dispatchEvent(new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, {detail: container}));
+    });
+    expect(registerFormWebMCP).toHaveBeenCalledTimes(1);
+    expect(registerFormWebMCP).toHaveBeenCalledWith(first.getModel(), {additionalTools: factory, onFocusRequest: expect.any(Function)});
+    const remove = bridge.registerWebMcpAdditionalTools('/first', replacement);
+    dispose();
+    expect(registerFormWebMCP).toHaveBeenCalledTimes(2);
+    remove();
+    expect(registerFormWebMCP).toHaveBeenLastCalledWith(first.getModel(), {onFocusRequest: expect.any(Function)});
+    bridge.registerWebMcpAdditionalTools('/second', factory);
+    const unregister = jest.fn();
+    second._setWebMcpUnregister(unregister);
+    bridge.unloadAdaptiveForm('/second');
+    expect(unregister).toHaveBeenCalledTimes(1);
+    bridge.unloadAdaptiveForm('/first');
+    registerFormWebMCP.mockClear();
+    document.dispatchEvent(new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, {detail: second}));
+    expect(registerFormWebMCP).not.toHaveBeenCalled();
+    bridge.unloadAdaptiveForm('/second');
+});
+
+test('registration rejects invalid factories and missing explicit targets before changing tools', () => {
+    const bridge = new GuideBridge();
+    expect(() => bridge.registerWebMcpAdditionalTools('', jest.fn())).toThrow(TypeError);
+    expect(() => bridge.registerWebMcpAdditionalTools('/first', {})).toThrow(TypeError);
+    expect(() => bridge.registerWebMcpAdditionalTools('/first', undefined)).toThrow(TypeError);
+    expect(registerFormWebMCP).not.toHaveBeenCalled();
+});
+
+test('renderer focus options restore focus through the owning container and detect no-ops', () => {
+    const input = document.createElement('input');
+    const outside = document.createElement('button');
+    document.body.append(input, outside);
+    const first = {setFocus: jest.fn(() => input.focus())};
+    const options = Utils.getWebMcpOptions(first);
+    expect(options.onFocusRequest('city')).toBe(true);
+    expect(document.activeElement).toBe(input);
+    expect(options.onFocusRequest('city')).toBe(false);
+    outside.focus();
+    expect(options.onFocusRequest('city')).toBe(true);
+    expect(document.activeElement).toBe(input);
+    expect(first.setFocus).toHaveBeenCalledWith('city');
+});
+
+test('scoped configuration preserves the adapter opt-out gate and does not invoke the factory itself', () => {
+    const bridge = new GuideBridge();
+    const factory = jest.fn();
+    const optedOutJson = {...formJson, properties: {...formJson.properties, 'fd:webMcpEnabled': false}};
+    const view = new FormContainer({
+        _formJson: optedOutJson, _prefillData: {}, _path: '/opted-out', _element: document.createElement('div')
+    });
+    registerFormWebMCP.mockImplementation((model, options) => {
+        if (model.properties['fd:webMcpEnabled'] !== true) { return undefined; }
+        options.additionalTools(model);
+        return jest.fn();
+    });
+    bridge.registerWebMcpAdditionalTools('/opted-out', factory);
+    document.dispatchEvent(new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, {detail: view}));
+    expect(factory).not.toHaveBeenCalled();
+    expect(view._webMcpUnregister).toBeNull();
+    bridge.unloadAdaptiveForm('/opted-out');
+    registerFormWebMCP.mockReset();
+});
diff --git a/ui.frontend/jest.config.js b/ui.frontend/jest.config.js
index 0795e79e53..69992d5600 100644
--- a/ui.frontend/jest.config.js
+++ b/ui.frontend/jest.config.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  ******************************************************************************/
 
-const esModules = ['@adobe/json-formula', '@aemforms/af-custom-functions'].join('|');
+const esModules = ['@adobe/json-formula', '@aemforms/af-custom-functions', '@aemforms/af-webmcp'].join('|');
 
 module.exports = {
     transformIgnorePatterns: [`node_modules/(?!${esModules})`],
diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
index 40bf8a7f1f..964dbef627 100644
--- a/ui.frontend/package-lock.json
+++ b/ui.frontend/package-lock.json
@@ -9,10 +9,11 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aemforms/af-core": "^1.0.4",
+        "@aemforms/af-core": "^1.0.7",
         "@aemforms/af-core-xfa": "^0.1.6",
         "@aemforms/af-custom-functions": "1.0.18",
-        "@aemforms/af-formatters": "^1.0.4"
+        "@aemforms/af-formatters": "^1.0.7",
+        "@aemforms/af-webmcp": "^1.0.7"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.18.2",
@@ -108,13 +109,13 @@
       }
     },
     "node_modules/@aemforms/af-core": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.4.tgz",
-      "integrity": "sha512-CYxtPZNFNvRbkOnCGlvwuUXWVmC2I0EmoOf0QgCW2na+GaJHcIA9CkxmzeRhSAui2LomxVkYvQNQBJRVAwTclQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.7.tgz",
+      "integrity": "sha512-hw6xDFlFwvRcySvmvqb5Xl9sHB6Q5Fz7POURfGFzSfxf+HFc2OkO7sk9mGwPKD22Og3lqC8jxnEr/uL47aa4pA==",
       "license": "Adobe Proprietary",
       "dependencies": {
         "@adobe/json-formula": "0.1.50",
-        "@aemforms/af-formatters": "^1.0.4"
+        "@aemforms/af-formatters": "^1.0.7"
       }
     },
     "node_modules/@aemforms/af-core-xfa": {
@@ -137,11 +138,20 @@
       "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
     },
     "node_modules/@aemforms/af-formatters": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.4.tgz",
-      "integrity": "sha512-ShqnAHnwTN6JpEZidP1jqZCy5rku/H+2M1oqC7OwDLenQv55LUQasfvINyhG5H7jVKrocyHpijR5BDKlPdewMw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.7.tgz",
+      "integrity": "sha512-2dEAOmYIH8FfYiiLzPSWqBDmdorrBFCzc+YsQ4JfDoZNH7qMPebnyujZsaFG3grhxUJcz8npMnKdPzDCqUjiqg==",
       "license": "Adobe Proprietary"
     },
+    "node_modules/@aemforms/af-webmcp": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-webmcp/-/af-webmcp-1.0.7.tgz",
+      "integrity": "sha512-YvX/BSwnw7/YBXuhtqaKCPoseglR9n9k/1KJKSNxWUWxD9G8JXTkYmN7y04TdDg4GeEAUxzSFaxmgdKf2fXsYQ==",
+      "license": "Adobe Proprietary",
+      "dependencies": {
+        "@aemforms/af-core": "^1.0.7"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
       "dev": true,
@@ -11139,12 +11149,12 @@
       "integrity": "sha512-dmlLYfbty8NPVIdxvI9cJ+ZdXsrRCFrCdmL1+aR2auEzXJ86rD0bm1qu+S4NOpFiZLKIyx0zvUTykms40vNjsA=="
     },
     "@aemforms/af-core": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.4.tgz",
-      "integrity": "sha512-CYxtPZNFNvRbkOnCGlvwuUXWVmC2I0EmoOf0QgCW2na+GaJHcIA9CkxmzeRhSAui2LomxVkYvQNQBJRVAwTclQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.7.tgz",
+      "integrity": "sha512-hw6xDFlFwvRcySvmvqb5Xl9sHB6Q5Fz7POURfGFzSfxf+HFc2OkO7sk9mGwPKD22Og3lqC8jxnEr/uL47aa4pA==",
       "requires": {
         "@adobe/json-formula": "0.1.50",
-        "@aemforms/af-formatters": "^1.0.4"
+        "@aemforms/af-formatters": "^1.0.7"
       }
     },
     "@aemforms/af-core-xfa": {
@@ -11169,9 +11179,17 @@
       "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
     },
     "@aemforms/af-formatters": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.4.tgz",
-      "integrity": "sha512-ShqnAHnwTN6JpEZidP1jqZCy5rku/H+2M1oqC7OwDLenQv55LUQasfvINyhG5H7jVKrocyHpijR5BDKlPdewMw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.7.tgz",
+      "integrity": "sha512-2dEAOmYIH8FfYiiLzPSWqBDmdorrBFCzc+YsQ4JfDoZNH7qMPebnyujZsaFG3grhxUJcz8npMnKdPzDCqUjiqg=="
+    },
+    "@aemforms/af-webmcp": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-webmcp/-/af-webmcp-1.0.7.tgz",
+      "integrity": "sha512-YvX/BSwnw7/YBXuhtqaKCPoseglR9n9k/1KJKSNxWUWxD9G8JXTkYmN7y04TdDg4GeEAUxzSFaxmgdKf2fXsYQ==",
+      "requires": {
+        "@aemforms/af-core": "^1.0.7"
+      }
     },
     "@ampproject/remapping": {
       "version": "2.2.1",
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
index d7a6f6f6b2..dc896810c5 100644
--- a/ui.frontend/package.json
+++ b/ui.frontend/package.json
@@ -25,9 +25,10 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@aemforms/af-core": "^1.0.4",
+    "@aemforms/af-core": "^1.0.7",
     "@aemforms/af-core-xfa": "^0.1.6",
-    "@aemforms/af-formatters": "^1.0.4",
-    "@aemforms/af-custom-functions": "1.0.18"
+    "@aemforms/af-formatters": "^1.0.7",
+    "@aemforms/af-custom-functions": "1.0.18",
+    "@aemforms/af-webmcp": "^1.0.7"
   }
 }
diff --git a/ui.frontend/src/GuideBridge.js b/ui.frontend/src/GuideBridge.js
index 2648d7171e..a0f069bbe6 100644
--- a/ui.frontend/src/GuideBridge.js
+++ b/ui.frontend/src/GuideBridge.js
@@ -19,6 +19,7 @@ import Response from "./Response.js";
 import AfFormData from "./FormData.js";
 import {readAttachments} from "@aemforms/af-core";
 import Utils from "./utils.js";
+import {registerFormWebMCP} from "@aemforms/af-webmcp";
 
 /**
  * The GuideBridge class represents the bridge between an adaptive form and JavaScript APIs.
@@ -33,6 +34,7 @@ class GuideBridge {
      * @instance
      */
     #formContainerViewMap = {};
+    #webMcpAdditionalTools = new Map();
     /**
      * Array to store the guide bridge connect handlers.
      * @member {Array}
@@ -96,6 +98,11 @@ class GuideBridge {
         function onFormContainerInitialised(e) {
             let formContainer = e.detail;
             self.#formContainerViewMap[formContainer.getPath()] = formContainer;
+            const config = self.#webMcpAdditionalTools.get(formContainer.getPath());
+            if (config) {
+                formContainer._unregisterWebMcp();
+                formContainer._setWebMcpUnregister(registerFormWebMCP(formContainer.getModel(), Utils.getWebMcpOptions(formContainer, config.factory)));
+            }
             self.#invokeConnectHandlers(formContainer.getPath());
         }
         document.addEventListener(Constants.FORM_CONTAINER_INITIALISED, onFormContainerInitialised);
@@ -114,6 +121,35 @@ class GuideBridge {
     }
 
 
+    /**
+     * Experimental/internal supported seam for form-scoped WebMCP tools.
+     * @param {string} formContainerPath Explicit target container path.
+     * @param {Function|null} factory Receives the form model and returns tools; null removes it.
+     * @returns {Function} Disposer that removes only this registration.
+     */
+    registerWebMcpAdditionalTools(formContainerPath, factory) {
+        if (typeof formContainerPath !== 'string' || !formContainerPath.trim() ||
+            (factory !== null && typeof factory !== 'function')) {
+            throw new TypeError("An explicit form container path and a function or null are required");
+        }
+        const config = factory === null ? null : {factory};
+        if (config) {
+            this.#webMcpAdditionalTools.set(formContainerPath, config);
+        } else {
+            this.#webMcpAdditionalTools.delete(formContainerPath);
+        }
+        const view = this.#formContainerViewMap[formContainerPath];
+        if (view) {
+            view._unregisterWebMcp();
+            view._setWebMcpUnregister(registerFormWebMCP(view.getModel(), Utils.getWebMcpOptions(view, factory)));
+        }
+        return () => {
+            if (config && this.#webMcpAdditionalTools.get(formContainerPath) === config) {
+                this.registerWebMcpAdditionalTools(formContainerPath, null);
+            }
+        };
+    }
+
     /**
      * Returns the string representation of the form data.
      *
@@ -481,12 +517,17 @@ class GuideBridge {
             console.warn("No form container path specified or available to unload.");
             return;
         }
+        this.#webMcpAdditionalTools.delete(pathToUnload);
         
         // Get the container element from the view and disconnect mutation observers
         let container = null;
         if (this.#formContainerViewMap[pathToUnload]) {
             const formContainerView = this.#formContainerViewMap[pathToUnload];
             container = formContainerView.getFormElement();
+
+            if (typeof formContainerView._unregisterWebMcp === 'function') {
+                formContainerView._unregisterWebMcp();
+            }
             
             // Disconnect all mutation observers for this form
             if (typeof formContainerView._disconnectMutationObservers === 'function') {
@@ -552,5 +593,3 @@ class GuideBridge {
 };
 
 export default GuideBridge;
-
-
diff --git a/ui.frontend/src/utils.js b/ui.frontend/src/utils.js
index 6c8f122a26..62bb0f9164 100644
--- a/ui.frontend/src/utils.js
+++ b/ui.frontend/src/utils.js
@@ -18,6 +18,7 @@ import {Constants} from "./constants.js";
 import HTTPAPILayer from "./HTTPAPILayer.js";
 import {customFunctions} from "./customFunctions.js";
 import {FunctionRuntime} from '@aemforms/af-core';
+import {registerFormWebMCP} from '@aemforms/af-webmcp';
 import {loadXfa} from "./handleXfa";
 import RuleUtils from "./RuleUtils.js";
 
@@ -341,6 +342,9 @@ class Utils {
                 } else {
                     _formJson = await HTTPAPILayer.getFormDefinition(_path, _pageLang);
                 }
+                if (!_formJson.id) {
+                    _formJson = {..._formJson, id: elements[i].id || _path};
+                }
                 console.debug("fetched model json", _formJson);
                 await RuleUtils.registerCustomFunctionsV2( _formJson);
                 await RuleUtils.registerCustomFunctionsByUrl(customFunctionUrl);
@@ -371,6 +375,11 @@ class Utils {
                     callback(formContainer.getModel());
                 }
                 Utils.initializeAllFields(formContainer);
+                // Expose the form's WebMCP tool catalog to in-browser AI agents. No-ops unless the
+                // form opted in via fd:webMcpEnabled and a browser modelContext is available.
+                formContainer._setWebMcpUnregister(
+                    registerFormWebMCP(formContainer.getModel(), Utils.getWebMcpOptions(formContainer))
+                );
                 const event = new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, { "detail": formContainer });
                 document.dispatchEvent(event);
             }
@@ -378,6 +387,18 @@ class Utils {
     }
 
     
+    /** Builds form-scoped renderer-focus and optional additional-tool options for WebMCP. */
+    static getWebMcpOptions(formContainer, additionalTools) {
+        return {
+            ...(additionalTools ? {additionalTools} : {}),
+            onFocusRequest: (fieldId) => {
+                const previous = document.activeElement;
+                formContainer.setFocus(fieldId);
+                return document.activeElement !== previous;
+            }
+        };
+    }
+
     /**
      * For backward compatibility with older data formats of prefill services like FDM.
      * @param {object} prefillJson - The prefill JSON object.
diff --git a/ui.frontend/src/view/FormContainer.js b/ui.frontend/src/view/FormContainer.js
index 6053e3a571..aa00ee685e 100644
--- a/ui.frontend/src/view/FormContainer.js
+++ b/ui.frontend/src/view/FormContainer.js
@@ -36,6 +36,7 @@ class FormContainer {
         this._deferredParents = {};
         this._element = params._element;
         this._mutationObservers = []; // Store mutation observers for cleanup
+        this._webMcpUnregister = null;
 
         // Prevent default behaviour on form container.
         this.#preventDefaultSubmit();
@@ -85,6 +86,27 @@ class FormContainer {
         this._mutationObservers = [];
     }
 
+    /**
+     * Replaces the active WebMCP registration cleanup for this form.
+     * @param {Function} unregister - Function that unregisters this form's WebMCP tools.
+     * @private
+     */
+    _setWebMcpUnregister(unregister) {
+        this._unregisterWebMcp();
+        this._webMcpUnregister = typeof unregister === 'function' ? unregister : null;
+    }
+
+    /**
+     * Unregisters this form's WebMCP tools.
+     * @private
+     */
+    _unregisterWebMcp() {
+        if (this._webMcpUnregister) {
+            this._webMcpUnregister();
+            this._webMcpUnregister = null;
+        }
+    }
+
     /**
      * Adds an instance manager view to the fields of the formContainer.
      * @param {object} instanceManager - The instance manager view to be added.
diff --git a/ui.tests/test-module/specs/ruleeditor/authoring/ruleEditor.authoring.cy.js b/ui.tests/test-module/specs/ruleeditor/authoring/ruleEditor.authoring.cy.js
index f35e9c1b2c..0e26f56830 100644
--- a/ui.tests/test-module/specs/ruleeditor/authoring/ruleEditor.authoring.cy.js
+++ b/ui.tests/test-module/specs/ruleeditor/authoring/ruleEditor.authoring.cy.js
@@ -141,7 +141,10 @@ describe('Rule editor authoring sanity for core-components',function(){
         cy.wait('@ruleEditorRequest').then((interception) => {
             expect(interception.response.statusCode).to.equal(201);
             const submittedData = Object.fromEntries(new URLSearchParams(interception.request.body));
-            expect(submittedData[":content"]).contains("\"fd:events\":{\"change\":[\"if(contains($event.payload.changes[].propertyName, 'value'), if($field.$value == 'abc', {visible : false()}, {}), {})\"]}");
+            const submittedContent = JSON.parse(submittedData[":content"]);
+            expect(submittedContent["fd:events"].change).to.deep.equal([
+                "if(contains($event.payload.changes[].propertyName, 'value'), if($field.$value == 'abc', {visible : false()}, {}), {})"
+            ]);
         });
 
         // check and close rule editor
@@ -466,27 +469,55 @@ describe('Rule editor authoring sanity for core-components',function(){
             cy.deleteComponentByPath(datePickerEditPath);
         })
 
-        it('should add rule on texbox equality operator to hide a text box', function () {
-            cy.openAuthoring(formPath);
-            cy.selectLayer("Edit");
-            cy.get(sitesSelectors.overlays.overlay.component + "[data-path='" + formContainerPath + "/*']").should("exist");
+        context('Text box equality rule', function () {
+            const contextPath = Cypress.env('crx.contextPath') || '';
+            const resetTextInput = () => {
+                // Retries must not reuse a persisted field whose saved rules survived a failed assertion.
+                const deleteProperty = textinputEditPath.split('/').pop() + '@Delete';
+                return cy.request(contextPath + '/libs/granite/csrf/token.json').its('body.token').then(token => {
+                    return cy.window().then(win => win.fetch(contextPath + formContainerPath, {
+                        method: 'POST',
+                        credentials: 'same-origin',
+                        headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+                        body: new win.URLSearchParams({
+                            [deleteProperty]: '',
+                            ':cq_csrf_token': token
+                        }).toString()
+                    }).then(response => {
+                        if (!response.ok) {
+                            throw new Error('Unable to clean rule-editor text input: HTTP ' + response.status);
+                        }
+                    }));
+                }).then(() => {
+                    return cy.request({
+                        url: contextPath + textinputEditPath + '.json',
+                        failOnStatusCode: false
+                    }).its('status').should('equal', 404);
+                });
+            };
+
+            beforeEach(() => {
+                cy.openAuthoring(formPath);
+                resetTextInput();
+                cy.openSiteAuthoring(formPath);
+                cy.selectLayer("Edit");
+            });
 
-            cy.insertComponent(sitesSelectors.overlays.overlay.component + "[data-path='" + formContainerPath + "/*']",
-                "Adaptive Form Text Box", afConstants.components.forms.resourceType.formtextinput);
-            // cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textinputEditPathSelector);
-            // cy.get(formsSelectors.ruleEditor.action.configure).should("exist");
-            // cy.get(formsSelectors.ruleEditor.action.configure).click();
-            // cy.get(".cmp-adaptiveform-base__editdialogbasic [name='./name']").clear().type("textinput");
-            // cy.get(".cq-dialog-actions.cq-dialog-submit").click();
+            afterEach(() => {
+                resetTextInput();
+            });
 
-            cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textinputEditPathSelector);
+            it('should add rule on texbox equality operator to hide a text box', function () {
+                cy.get(sitesSelectors.overlays.overlay.component + "[data-path='" + formContainerPath + "/*']").should("exist");
 
-            createRuleToHideTextInputOnEqualityOperator();
-            cy.get(sitesSelectors.overlays.overlay.component + textinputEditPathSelector).should("exist");
+                cy.insertComponent(sitesSelectors.overlays.overlay.component + "[data-path='" + formContainerPath + "/*']",
+                    "Adaptive Form Text Box", afConstants.components.forms.resourceType.formtextinput);
+                cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + textinputEditPathSelector);
 
-            cy.selectLayer("Edit");
-            cy.deleteComponentByPath(textinputEditPath);
-        })
+                createRuleToHideTextInputOnEqualityOperator();
+                cy.get(sitesSelectors.overlays.overlay.component + textinputEditPathSelector).should("exist");
+            });
+        });
 
         it('should add submission handler rules on form', function () {
             if (toggle_array.includes("FT_FORMS-13209")) {
diff --git a/ui.tests/test-module/specs/webmcp/webmcp.authoring.cy.js b/ui.tests/test-module/specs/webmcp/webmcp.authoring.cy.js
new file mode 100644
index 0000000000..413499b6c1
--- /dev/null
+++ b/ui.tests/test-module/specs/webmcp/webmcp.authoring.cy.js
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/// <reference types="cypress" />
+/* global cy, Cypress, expect, window, document */
+
+const sitesSelectors = require('../../libs/commons/sitesSelectors');
+const afConstants = require('../../libs/commons/formsConstants');
+
+describe('WebMCP form authoring and preview', () => {
+    if (!cy.af.isLatestAddon()) {
+        return;
+    }
+    const pagePath = '/content/forms/af/core-components-it/samples/accessibility';
+    const containerPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX;
+    const contextPath = Cypress.env('crx.contextPath') || '';
+    const resourcePath = contextPath + containerPath;
+    const toolNames = [
+        'list_forms', 'get_form_summary', 'get_field_value', 'explain_field', 'validate_form_completeness',
+        'list_repeatable_instances', 'focus_field', 'navigate_to_panel', 'set_field_value',
+        'apply_prefill', 'add_repeatable_instance', 'remove_repeatable_instance', 'submit_form'
+    ];
+    let originalProperties;
+
+    before(function () {
+        cy.openAuthoring(pagePath);
+        cy.fetchFeatureToggles().its('body.enabled').should('be.an', 'array').then(enabled => {
+            if (!enabled.includes('FT_FORMS-28233')) {
+                return this.skip();
+            }
+            cy.request(resourcePath + '.json').its('body').then(properties => {
+                originalProperties = properties;
+            });
+        });
+    });
+
+    after(() => {
+        if (!originalProperties) {
+            return;
+        }
+        const originalValue = originalProperties['fd:webMcpEnabled'];
+        const properties = originalValue === undefined ? {'fd:webMcpEnabled@Delete': ''} : {
+            'fd:webMcpEnabled': originalValue,
+            'fd:webMcpEnabled@TypeHint': typeof originalValue === 'boolean' ? 'Boolean' : 'String'
+        };
+        cy.request(contextPath + '/libs/granite/csrf/token.json').its('body.token').then(token => {
+            return cy.window().then(win => win.fetch(resourcePath, {
+                method: 'POST',
+                credentials: 'same-origin',
+                headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+                body: new win.URLSearchParams(Object.assign(properties, {':cq_csrf_token': token})).toString()
+            }).then(response => {
+                if (!response.ok) {
+                    throw new Error('Unable to restore WebMCP opt-in: HTTP ' + response.status);
+                }
+            }));
+        });
+    });
+
+    it('enables AI assistant access in the container dialog and registers the preview catalog', () => {
+        const installHost = () => {
+            const tools = new Map();
+            window.__webMcpTestTools = tools;
+            Object.defineProperty(document, 'modelContext', {
+                configurable: true,
+                value: {
+                    registerTool(tool) {
+                        tools.set(tool.name, tool);
+                        return {unregister() { tools.delete(tool.name); }};
+                    }
+                }
+            });
+        };
+        cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + '[data-path="' + containerPath + '"]');
+        cy.intercept('GET', '**/container/_cq_dialog.html/**').as('containerDialog');
+        cy.invokeEditableAction('[data-action="CONFIGURE"]');
+        cy.wait('@containerDialog').its('response.statusCode').should('eq', 200);
+        cy.get('.cmp-adaptiveform-container__editdialog', {timeout: 60000}).contains('Basic').click({force: true});
+        cy.get('coral-checkbox[name="./fd:webMcpEnabled"]').should('be.visible')
+            .find('input[type="checkbox"]').check({force: true}).should('be.checked');
+        cy.submitConfigureDialog();
+
+        // Inject into the preview document so editor navigation cannot discard the test host.
+        cy.intercept('GET', '**' + pagePath + '.html*', request => {
+            request.continue(response => {
+                expect(response.body).to.match(/<head(?:\s[^>]*)?>/i);
+                response.body = response.body.replace(/<head(?:\s[^>]*)?>/i,
+                    '$&<script>(' + installHost.toString() + ')();</script>');
+            });
+        });
+        cy.previewForm(pagePath + '.html').then(formContainer => {
+            expect(formContainer.getModel().webMcpEnabled).to.equal(true);
+        });
+        cy.window().its('__webMcpTestTools').as('tools').should(registered => {
+            expect(Array.from(registered.keys())).to.have.members(toolNames);
+            registered.forEach(tool => {
+                expect(tool.execute, tool.name).to.be.a('function');
+                expect(tool.inputSchema.type, tool.name).to.equal('object');
+            });
+            expect(registered.get('validate_form_completeness').annotations)
+                .to.include({readOnlyHint: true, untrustedContentHint: true});
+        });
+        cy.get('@tools').then(tools => tools.get('list_forms').execute({})).then(result => {
+            expect(result.success).to.equal(true);
+            expect(result.forms).to.have.length(1);
+        });
+        cy.get('@tools').then(tools => tools.get('get_form_summary').execute({})).then(summary => {
+            expect(summary.success).to.equal(true);
+            expect(summary.fields.length).to.be.greaterThan(10);
+        });
+    });
+});

From 773f049f94c0efe616774abf36f38b959d08e48c Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 2 Oct 2026 12:16:46 +0530
Subject: [PATCH 34/46] @releng [maven-scm] :prepare release
 core-forms-components-reactor-3.0.172

---
 AGENTS.md                   | 17 +++++++++++++++++
 all/pom.xml                 |  4 ++--
 bundles/af-core/pom.xml     |  4 ++--
 bundles/core/pom.xml        |  4 ++--
 examples/all/pom.xml        |  4 ++--
 examples/core/pom.xml       |  4 ++--
 examples/pom.xml            |  2 +-
 examples/ui.apps/pom.xml    |  4 ++--
 examples/ui.content/pom.xml |  4 ++--
 it/apps/pom.xml             |  4 ++--
 it/config/pom.xml           |  4 ++--
 it/content/pom.xml          |  4 ++--
 it/core/pom.xml             |  4 ++--
 jsdocs/pom.xml              |  4 ++--
 parent/pom.xml              |  4 ++--
 pom.xml                     |  4 ++--
 ui.af.apps/pom.xml          |  4 ++--
 ui.apps/pom.xml             |  4 ++--
 ui.frontend/pom.xml         |  2 +-
 ui.tests/pom.xml            |  2 +-
 20 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 AGENTS.md

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000..9d8ba79973
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,17 @@
+# aem-core-forms-components
+
+AEM Core Forms Components — Adaptive Forms v2 component library.
+
+## Key References
+
+### Architecture
+- **Project overview**: [`docs/architecture/overview.md`](docs/architecture/overview.md)
+  Module structure, Java model hierarchy, form JSON model, IT infrastructure, Cypress patterns, JCR content XML patterns.
+- **Runtime internals**: [`docs/architecture/runtime-internals.md`](docs/architecture/runtime-internals.md)
+  Deep dive into the form initialization pipeline, repeatable container/InstanceManager mechanics, FT_FORMS-24358 items-array export, common crash signatures, and debugging checklist.
+- **Component versioning**: [`docs/architecture/component-versioning.md`](docs/architecture/component-versioning.md)
+  When a change needs a new component version (`v1` → `v2`) vs. a fix-in-place, and the full checklist of what to update when bumping a version (clientlib self-containment, `_cq_dialog`/`_cq_styleConfig` inheritance, `pom.xml`, runtime clientlib embed lists, etc.).
+
+### E2E Testing
+- **Feature Toggle Tests**: [`docs/e2e-testing/feature-toggles.md`](docs/e2e-testing/feature-toggles.md)
+  How to add Cypress e2e tests for new feature toggles: OSGi config changes, system property wiring, and the isLatestAddon + fetchFeatureToggles test pattern.
diff --git a/all/pom.xml b/all/pom.xml
index 964a8a41d6..023dbb3f41 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index f468d67c72..1d01876a07 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 8d61e0d703..6021063d05 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 4f8589e754..001235ce90 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 19709d1548..4326dc30e9 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 4ad5181dd5..86fdd57285 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index 9a3fdc25aa..b009a06db6 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 43f8d9c2e2..999515bb0a 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index 9fe25442f0..80eff09883 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 08c98cec83..6e044a83fb 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index 613d33b921..9224529061 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index f41fba3000..a435033aab 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 26d39503d3..0717074269 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index 750160b975..f1321773ad 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.171-SNAPSHOT</version>
+    <version>3.0.172</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 4805f953b4..dad07873ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index d71f211233..cba162d563 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index af98f808ff..a518cb4fa7 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.172</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 44545d28a6..91a886cc62 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 314225c459..fc6b0d722f 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.171-SNAPSHOT</version>
+        <version>3.0.172</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From af4f3ef46667a7947868a9383ddc5391dbba2644 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 2 Oct 2026 12:16:47 +0530
Subject: [PATCH 35/46] @releng [maven-scm] :prepare for next development
 iteration

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index 023dbb3f41..39ccc4f18d 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 1d01876a07..91283a6e31 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 6021063d05..ab013405db 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 001235ce90..46ce291c5a 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 4326dc30e9..c3b49129a3 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 86fdd57285..888cacd831 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index b009a06db6..16f67490ca 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 999515bb0a..f962da06b5 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index 80eff09883..ab1f46829f 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 6e044a83fb..f288b3fcf1 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index 9224529061..03337deae4 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index a435033aab..781f41da27 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index 0717074269..f63443002a 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index f1321773ad..688b8880aa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.172</version>
+    <version>3.0.173-SNAPSHOT</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index dad07873ed..771454ebf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index cba162d563..4eadc5983f 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index a518cb4fa7..52ec295b4e 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.172</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 91a886cc62..e7a98efde8 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index fc6b0d722f..404d0e4ef0 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.172</version>
+        <version>3.0.173-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From efdc515deb8bec6c45b20d76c8ec234fb9bac1de Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 2 Oct 2026 12:29:34 +0530
Subject: [PATCH 36/46] fix(tests): isolate telephone policy authoring from
 component insertion

Reuse the existing telephone field with the same default policy, wait for policy save and verify persisted custom patterns before editor navigation, and clean up prepared policy attempts. Keep shared insertion commands unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../telephoneinput.authoring.cy.js            | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
index d6a5553032..e596ad7bc5 100644
--- a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
+++ b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
@@ -15,6 +15,8 @@
  */
 
 
+/* global Cypress */
+
 const sitesSelectors = require('../../libs/commons/sitesSelectors'),
     afConstants = require('../../libs/commons/formsConstants');
 
@@ -95,21 +97,34 @@ describe('Page - Authoring', function () {
   context('Adding removing patterns from design policy', function () {
     const templateDataPath = '/conf/core-components-examples/settings/wcm/templates/af-blank-v2/structure',
         telephoneInputPolicy = '[value="' + templateDataPath + '/jcr:content/guideContainer/forms-components-examples/components/form/telephoneinput' + '"] [data-action="POLICY"]',
-        authoringPagePath = '/content/forms/af/core-components-it/blank',
+        // Policy assertions do not need to create another field through the Insert dialog.
+        authoringPagePath = '/content/forms/af/core-components-it/samples/telephoneinput/basic',
         bemEditDialog = '.cmp-adaptiveform-telephoneinput__editdialog',
         bemDesignDialog = '.cmp-adaptiveform-telephoneinput__designdialog',
-        telephoneInputEditPath = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/telephoneinput",
-        telephoneInputDrop = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formtelephoneinput.split("/").pop(),
+        telephoneInputEditPath = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/telephoneinput6",
         telephoneInputEditPathSelector = "[data-path='" + telephoneInputEditPath + "']";
     const customKey = 'customKey',
         customValue = 'customValue',
-        // Shared, persistent design policy this test mutates — reset it each run so a leftover custom
-        // format from a prior run/retry can't leave the dialog in a dirty state (see reset command).
+        // The policy is shared across specs and retries.
         telephoneInputPolicyPath = '/conf/core-components-examples/settings/wcm/policies/forms-components-examples/components/form/telephoneinput/default';
+    let policyPrepared = false;
 
     beforeEach(function () {
-      cy.openAuthoring(templateDataPath + ".html");
+      policyPrepared = false;
+      cy.openAuthoring(templateDataPath);
+      cy.resetTelephoneInputDesignPolicy(telephoneInputPolicyPath).then(() => {
+        policyPrepared = true;
+      });
+    });
+
+    afterEach(function () {
+      if (!policyPrepared) {
+        return;
+      }
       cy.resetTelephoneInputDesignPolicy(telephoneInputPolicyPath);
+      const contextPath = Cypress.env('crx.contextPath') || '';
+      cy.request(contextPath + telephoneInputPolicyPath + '.json')
+          .its('body').should('not.have.property', 'allowedCustomFormats');
     });
 
     it('Adding removing patterns from design policy', function () {
@@ -121,18 +136,25 @@ describe('Page - Authoring', function () {
       cy.get('[name="./allowedCustomFormats/item0/customFormatKey"]').should('exist').then(() => {
         cy.get('[name="./allowedCustomFormats/item0/customFormatKey"]').focus().type(customKey);
         cy.get('[name="./allowedCustomFormats/item0/customFormatValue"]').focus().type(customValue);
-        cy.get('[title="Done"]').click();
+        cy.intercept('POST', '**' + telephoneInputPolicyPath + '*').as('saveTelephonePolicy');
+        cy.get('[title="Done"]:visible').click();
+        cy.wait('@saveTelephonePolicy').its('response.statusCode').should('be.oneOf', [200, 201]);
+        cy.get(bemDesignDialog + ':visible').should('not.exist');
+        const contextPath = Cypress.env('crx.contextPath') || '';
+        cy.request(contextPath + telephoneInputPolicyPath + '.infinity.json')
+            .its('body.allowedCustomFormats.item0')
+            .should('include', {customFormatKey: customKey, customFormatValue: customValue});
       }).then(() => {
         cy.openSiteAuthoring(authoringPagePath);
-        dropTelephoneInputInContainer();
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + telephoneInputEditPathSelector);
         cy.invokeEditableAction("[data-action='CONFIGURE']");
         cy.get(bemEditDialog).contains('Validation').click({force: true}).then(() => {
           cy.get('.cmp-adaptiveform-telephoneinput__validationformat').should('have.value', '^[+][0-9]{0,14}$');
+          cy.get('.cmp-adaptiveform-telephoneinput__validationpattern select')
+              .find('option[value="^[+]44[0-9]{0,10}$"]').should('not.exist');
           cy.get('.cmp-adaptiveform-telephoneinput__validationpattern select').select(customKey, {force: true}).then(() => {
             cy.get('.cmp-adaptiveform-telephoneinput__validationformat').should('have.value', customValue);
             cy.get('.cq-dialog-cancel').click();
-            cy.deleteComponentByPath(telephoneInputDrop);
           })
         });
       });

From 919bde26017f627a3c6a8c8b125092df83812a69 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 2 Oct 2026 12:48:31 +0530
Subject: [PATCH 37/46] fix(tests): synchronize blank-page telephone policy
 authoring

Preserve insertion of a new telephone field into the blank form. Await policy persistence, actual layer transitions and insertion events; query only the visible insertion dialog and re-query its search input after clearing. Preserve original assertions and wait for the edit dialog to close before cleanup.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../telephoneinput.authoring.cy.js            | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
index e596ad7bc5..164cc16db2 100644
--- a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
+++ b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
@@ -97,16 +97,17 @@ describe('Page - Authoring', function () {
   context('Adding removing patterns from design policy', function () {
     const templateDataPath = '/conf/core-components-examples/settings/wcm/templates/af-blank-v2/structure',
         telephoneInputPolicy = '[value="' + templateDataPath + '/jcr:content/guideContainer/forms-components-examples/components/form/telephoneinput' + '"] [data-action="POLICY"]',
-        // Policy assertions do not need to create another field through the Insert dialog.
-        authoringPagePath = '/content/forms/af/core-components-it/samples/telephoneinput/basic',
+        authoringPagePath = '/content/forms/af/core-components-it/blank',
         bemEditDialog = '.cmp-adaptiveform-telephoneinput__editdialog',
         bemDesignDialog = '.cmp-adaptiveform-telephoneinput__designdialog',
-        telephoneInputEditPath = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/telephoneinput6",
+        telephoneInputEditPath = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/telephoneinput",
+        telephoneInputDrop = authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.formtelephoneinput.split("/").pop(),
         telephoneInputEditPathSelector = "[data-path='" + telephoneInputEditPath + "']";
     const customKey = 'customKey',
         customValue = 'customValue',
         // The policy is shared across specs and retries.
-        telephoneInputPolicyPath = '/conf/core-components-examples/settings/wcm/policies/forms-components-examples/components/form/telephoneinput/default';
+        telephoneInputPolicyPath = '/conf/core-components-examples/settings/wcm/policies/forms-components-examples/components/form/telephoneinput/default',
+        sitesConstants = require('../../libs/commons/sitesConstants');
     let policyPrepared = false;
 
     beforeEach(function () {
@@ -146,15 +147,40 @@ describe('Page - Authoring', function () {
             .should('include', {customFormatKey: customKey, customFormatValue: customValue});
       }).then(() => {
         cy.openSiteAuthoring(authoringPagePath);
+        cy.get(sitesSelectors.selectLayer.current).then($layers => {
+          if (!$layers.filter('[data-layer="Edit"].is-selected').length) {
+            cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as('telephoneEditLayerReady');
+            cy.selectLayer('Edit');
+            cy.get('@telephoneEditLayerReady').its('done').should('equal', true);
+          }
+        });
+        cy.cleanTest(telephoneInputDrop);
+        const dropZone = sitesSelectors.overlays.overlay.component +
+            '[data-path="' + authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + '/*"]';
+        const insertDialog = '.InsertComponentDialog:visible';
+        const searchField = insertDialog + ' .InsertComponentDialog-components input[type="search"]';
+        cy.openEditableToolbar(dropZone);
+        cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_EDITABLES_UPDATED).as('telephoneInserted');
+        cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as('telephoneInsertSettled');
+        cy.get(sitesSelectors.editableToolbar.actions.insert).should('be.visible').click();
+        cy.get(insertDialog).should('have.length', 1).and('be.visible');
+        cy.get(searchField).should('be.visible').clear();
+        cy.get(searchField).should('be.visible').type('Adaptive Form Telephone input');
+        cy.get(searchField).should('have.value', 'Adaptive Form Telephone input').type('{enter}');
+        cy.get(insertDialog + ' .InsertComponentDialog-components [value="' +
+            afConstants.components.forms.resourceType.formtelephoneinput + '"]').should('be.visible').click();
+        cy.get('@telephoneInserted').its('done').should('equal', true);
+        cy.get('@telephoneInsertSettled').its('done').should('equal', true);
+        cy.get(insertDialog).should('not.exist');
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + telephoneInputEditPathSelector);
         cy.invokeEditableAction("[data-action='CONFIGURE']");
         cy.get(bemEditDialog).contains('Validation').click({force: true}).then(() => {
           cy.get('.cmp-adaptiveform-telephoneinput__validationformat').should('have.value', '^[+][0-9]{0,14}$');
-          cy.get('.cmp-adaptiveform-telephoneinput__validationpattern select')
-              .find('option[value="^[+]44[0-9]{0,10}$"]').should('not.exist');
           cy.get('.cmp-adaptiveform-telephoneinput__validationpattern select').select(customKey, {force: true}).then(() => {
             cy.get('.cmp-adaptiveform-telephoneinput__validationformat').should('have.value', customValue);
             cy.get('.cq-dialog-cancel').click();
+            cy.get(bemEditDialog + ':visible').should('not.exist');
+            cy.deleteComponentByPath(telephoneInputDrop);
           })
         });
       });

From 56097a50abf3a2b6fe43db64180d64bc1c442b3a Mon Sep 17 00:00:00 2001
From: Rishi Mehta <69448117+rismehta@users.noreply.github.com>
Date: Fri, 2 Oct 2026 12:50:11 +0530
Subject: [PATCH 38/46] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d633a577ba..4a04aa488e 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s
 
 | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java  | Maven  |  
 |-----------------------|---------------------| ---------------------------- | ----- | ------ | 
-| 3.0.158                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
+| 3.0.172                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 
 For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md).
 

From fc839c72ef1bdbbd9dcb6e1d099196d5a625de5f Mon Sep 17 00:00:00 2001
From: Rishi Mehta <69448117+rismehta@users.noreply.github.com>
Date: Fri, 2 Oct 2026 12:50:35 +0530
Subject: [PATCH 39/46] Update VERSIONS.md

---
 VERSIONS.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/VERSIONS.md b/VERSIONS.md
index 5f2a51b242..b2a9f5eea5 100644
--- a/VERSIONS.md
+++ b/VERSIONS.md
@@ -4,10 +4,9 @@ See below for a full list of minimum system requirements for historical versions
 
 | Forms Core Components  | WCM Core Components | AEM Forms as a cloud service | Java  | Maven  |  
 |------------------------|---------------------| ---------------------------- | ----- | ------ |
+| 3.0.172                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.158                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
-| 3.0.156-ssv001                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.156                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
-| 3.0.154-ssv002                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.154                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.152                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.150                | 2.24.6             | Continual                    | 11 | 3.3.9+ |

From 717917d8ab57ee8e6721f3bfd9d7309239bd66ed Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 2 Oct 2026 14:18:34 +0530
Subject: [PATCH 40/46] Fix shared authoring synchronization and flaky Sites
 replacement tests

Retry opening the Insert dialog after lost actions, target only visible dialog controls, and wait for layer, insertion and replacement refreshes. Restore the original replace-group policy state using existing editor helpers and named actions.

Add a deterministic lost-Insert-click regression with delayed persistence responses. Validation: five Chrome repeats (25 passing), Electron Sites/Forms replacement tests (11 passing), and PR-branch Chrome replacement/telephone-input tests (11 passing), all with test retries disabled.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 ui.tests/test-module/libs/support/commands.js |  73 ++++++++----
 .../replacelayout-sites.authoring.cy.js       | 109 ++++++++++++------
 2 files changed, 129 insertions(+), 53 deletions(-)

diff --git a/ui.tests/test-module/libs/support/commands.js b/ui.tests/test-module/libs/support/commands.js
index e6abd79ef7..eb37a80019 100644
--- a/ui.tests/test-module/libs/support/commands.js
+++ b/ui.tests/test-module/libs/support/commands.js
@@ -297,13 +297,23 @@ Cypress.Commands.add("openPage", (pagePath, options = {}) => {
     cy.visit(path, options);
 });
 
-// cypress command to select layer in authoring
+/**
+ * Selects an authoring layer and waits for its overlays to be repositioned.
+ * @param {string} layer Authoring layer name.
+ */
 Cypress.Commands.add("selectLayer", (layer) => {
-    // please note: when switching from style to other layer, we refresh guide, so these events need to be checked here
-    cy.get(siteSelectors.selectLayer.trigger).click();
-    cy.get(siteSelectors.selectLayer.popover.self + ' [data-layer="' + layer + '"]').should('be.visible');
-    cy.get(siteSelectors.selectLayer.popover.self + ' [data-layer="' + layer + '"]').click({force: true});
-    cy.get(siteSelectors.selectLayer.current + '[data-layer="' + layer + '"].is-selected');
+    const selectedLayer = siteSelectors.selectLayer.current + '[data-layer="' + layer + '"].is-selected';
+    return cy.get(siteSelectors.selectLayer.current).then(($layers) => {
+        if ($layers.filter('[data-layer="' + layer + '"].is-selected').length) {
+            return cy.get(selectedLayer).should('be.visible');
+        }
+        cy.initializeEventHandlerOnChannel(siteConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as("isLayerOverlaysRepositioned");
+        cy.get(siteSelectors.selectLayer.trigger).click();
+        cy.get(siteSelectors.selectLayer.popover.self + ' [data-layer="' + layer + '"]')
+            .should('be.visible').click({force: true});
+        cy.get(selectedLayer).should('be.visible');
+        return cy.get("@isLayerOverlaysRepositioned").its('done').should('equal', true);
+    });
 });
 
 // cypress command to open editable toolbar
@@ -656,24 +666,47 @@ Cypress.Commands.add("deleteComponentByTitle", (title) => {
 });
 
 
-// cypress command to insert component
+/**
+ * Inserts a component through the visible dialog and waits for the editor refresh.
+ * @param {string} selector Drop-zone overlay selector.
+ * @param {string} componentString Component search text.
+ * @param {string} componentType Component resource type.
+ */
 Cypress.Commands.add("insertComponent", (selector, componentString, componentType) => {
-    //Open toolbar of root panel
-    const insertComponentDialog_Selector = '.InsertComponentDialog-components [value="' + componentType + '"]',
-        insertComponentDialog_searchField = ".InsertComponentDialog-components input[type='search']";
-    cy.openEditableToolbar(selector);
-    cy.get(guideSelectors.editableToolbar.actions.insert).should('be.visible').click();
+    const insertComponentDialog = 'coral-dialog.InsertComponentDialog:visible',
+        insertComponentDialog_Selector = insertComponentDialog + ' .InsertComponentDialog-components [value="' + componentType + '"]',
+        insertComponentDialog_searchField = insertComponentDialog + " .InsertComponentDialog-components input[type='search']";
+    // Overlay refreshes can discard an Insert click; retry opening, not interactions with a hidden dialog.
     recurse(
-        // the commands to repeat, and they yield the input element
-        () => cy.get(insertComponentDialog_searchField).clear().type(componentString),
-        // the predicate takes the output of the above commands
-        // and returns a boolean. If it returns true, the recursion stops
+        () => {
+            cy.get('body').then(($body) => {
+                if (!$body.find(insertComponentDialog).length) {
+                    cy.openEditableToolbar(selector);
+                    cy.get(guideSelectors.editableToolbar.actions.insert).should('be.visible').click();
+                }
+            });
+            return cy.get('body');
+        },
+        ($body) => $body.find(insertComponentDialog).length === 1,
+        {limit: 5, delay: 1000, timeout: 30000, log: false}
+    );
+    cy.get(insertComponentDialog).should('have.length', 1).and('be.visible');
+    recurse(
+        () => {
+            cy.get(insertComponentDialog_searchField).should('be.visible').clear();
+            cy.get(insertComponentDialog_searchField).should('be.visible').type(componentString);
+            return cy.get(insertComponentDialog_searchField);
+        },
         ($input) => $input.val() === componentString,
-    )
+    );
     cy.get(insertComponentDialog_searchField).type('{enter}');
-    cy.get(insertComponentDialog_Selector).should('be.visible');// basically should assertions does implicit retry in cypress
-    // refer https://docs.cypress.io/guides/references/error-messages.html#cy-failed-because-the-element-you-are-chaining-off-of-has-become-detached-or-removed-from-the-dom
-    cy.get(insertComponentDialog_Selector).click({force: true}); // sometimes AEM popover is visible, hence adding force here
+    cy.get(insertComponentDialog_Selector).should('be.visible');
+    cy.initializeEventHandlerOnChannel(siteConstants.EVENT_NAME_EDITABLES_UPDATED).as("isInsertEditableUpdated");
+    cy.initializeEventHandlerOnChannel(siteConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as("isInsertOverlaysRepositioned");
+    cy.get(insertComponentDialog_Selector).click();
+    cy.get(insertComponentDialog).should('not.exist');
+    cy.get("@isInsertEditableUpdated").its('done').should('equal', true);
+    return cy.get("@isInsertOverlaysRepositioned").its('done').should('equal', true);
 });
 
 /**
diff --git a/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js b/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js
index e4a941aec5..37bcc2e60b 100644
--- a/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js
+++ b/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js
@@ -15,7 +15,10 @@
  */
 
 
+/* global Cypress */
+
 const sitesSelectors = require('../../libs/commons/sitesSelectors'),
+    sitesConstants = require('../../libs/commons/sitesConstants'),
     afConstants = require('../../libs/commons/formsConstants');
 
 /**
@@ -26,6 +29,19 @@ describe('Replace functionality - sites', function () {
     const pagePath = "/content/forms/sites/core-components-it/blank",
         pageDropZoneSuffix = "/jcr:content/root/responsivegrid/container";
 
+    const replaceDialog = 'coral-dialog:visible .cmp-replace-dialog-search-components';
+
+    const selectReplacement = (resourceTypeSelector, componentPath) => {
+        cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_EDITABLES_UPDATED).as('replacementEditableUpdated');
+        cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as('replacementOverlaysRepositioned');
+        cy.intercept('POST', '**' + componentPath).as('replaceComponent');
+        cy.get(replaceDialog + ' ' + resourceTypeSelector).should('be.visible').click();
+        cy.wait('@replaceComponent').its('response.statusCode').should('be.oneOf', [200, 201]);
+        cy.get(replaceDialog).should('not.exist');
+        cy.get('@replacementEditableUpdated').its('done').should('equal', true);
+        cy.get('@replacementOverlaysRepositioned').its('done').should('equal', true);
+    };
+
     const dropComponentInSites = function (componentName, resourceType) {
         const dataPath = "/content/forms/sites/core-components-it/blank/jcr:content/root/responsivegrid/container/container/*",
             responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
@@ -46,14 +62,13 @@ describe('Replace functionality - sites', function () {
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + editPathSelector);
         cy.invokeEditableAction("[data-action='replace']"); // this line is causing frame busting which is causing cypress to fail
 
-        cy.get('.cmp-replace-dialog-search-components').should('exist');
+        cy.get(replaceDialog).should('be.visible');
         // Check If Dialog Options Are Visible
         cy.get(textInput)
             .should("not.exist");
         cy.get(submitButton)
             .should("exist");
-        cy.get(title)
-            .click();
+        selectReplacement(title, pagePath + pageDropZoneSuffix + "/container/button");
 
         cy.get('[title="'+titleName+'"]')
             .should('exist');
@@ -85,8 +100,7 @@ describe('Replace functionality - sites', function () {
             .should("exist");
         cy.get(wizard)
             .should("exist");
-        cy.get(accordion)
-            .click();
+        selectReplacement(accordion, pagePath + pageDropZoneSuffix + "/container/panelcontainer");
         cy.get(accordionDefaultPanel)
             .should("not.exist");
 
@@ -107,38 +121,56 @@ describe('Replace functionality - sites', function () {
             testButtonReplaceBehaviour(buttonEditPathSelector);
         });
 
-        it('test behaviour of replace button', function () {
+        it('test behaviour of replace panel with accordion', function () {
             testPanelReplaceBehaviourWithAccordion(panelEditPathSelector);
         });
 
-    });
-
-    const checkTestGroupPolicy = () => {
-        cy.openAuthoring("/conf/core-components-examples/settings/wcm/templates/content-page/structure");
-        cy.get('[data-text="Layout Container"]').eq(0).click()
-            .then(() => {
-                cy.get('.cq-editable-action').eq(3).click().then(() => {
-                    cy.get('[value="group:replace test group"]').eq(0).click().then(() => {
-                        cy.get('[title="Done"]').scrollIntoView().click();
-                    })
-                });
+        it('recovers when the first insert action is lost during an editor refresh', function () {
+            cy.intercept('POST', '**/content/forms/sites/core-components-it/blank/**', (request) => {
+                request.on('response', (response) => response.setDelay(500));
             });
-    }
-
-    const uncheckTestGroupPolicy = () => {
-        cy.openSiteAuthoring("/conf/core-components-examples/settings/wcm/templates/content-page/structure");
-        cy.get('[data-text="Layout Container"]').eq(0).click()
-            .then(() => {
-                cy.get('.cq-editable-action').eq(3).click().then(() => {
-                    cy.get('[value="group:replace test group"]').eq(0).click().then(() => {
-                        cy.get('[title="Done"]').scrollIntoView().click();
-                    })
-                });
+            const lostInsertAction = cy.stub().as('lostInsertAction');
+            cy.window().then((win) => {
+                const discardFirstInsert = (event) => {
+                    if (event.target.closest(sitesSelectors.editableToolbar.actions.insert)) {
+                        event.preventDefault();
+                        event.stopImmediatePropagation();
+                        win.document.removeEventListener('click', discardFirstInsert, true);
+                        lostInsertAction();
+                    }
+                };
+                win.document.addEventListener('click', discardFirstInsert, true);
             });
-    }
+            testButtonReplaceBehaviour(buttonEditPathSelector);
+            cy.get('@lostInsertAction').should('have.been.calledOnce');
+        });
+
+    });
 
     context('Test replace action within different groups', function () {
         const templatePath = "/conf/core-components-examples/settings/wcm/templates/content-page/structure";
+        const policyDialog = 'coral-dialog:visible:has([value="group:replace test group"])',
+            policyCheckbox = policyDialog + ' coral-checkbox[value="group:replace test group"]';
+        let originalTestGroupAllowed;
+
+        const updateTestGroupPolicy = (allow) => {
+            cy.openEditableToolbar(sitesSelectors.overlays.overlay.self + '[data-path="' + templatePath + '/jcr:content/root/responsivegrid"]');
+            cy.invokeEditableAction(sitesSelectors.editableToolbar.actions.policy);
+            cy.get(policyCheckbox).scrollIntoView().should('be.visible').invoke('prop', 'checked')
+                .should('be.a', 'boolean').then((checked) => {
+                    if (originalTestGroupAllowed === undefined) {
+                        originalTestGroupAllowed = checked;
+                    }
+                    if (checked !== allow) {
+                        cy.get(policyCheckbox).click();
+                    }
+                });
+            cy.get(policyCheckbox).should('have.prop', 'checked', allow);
+            cy.intercept('POST', '**/conf/core-components-examples/settings/wcm/policies/**').as('saveReplacePolicy');
+            cy.get(policyDialog + ' [title="Done"]').scrollIntoView().should('be.visible').click();
+            cy.wait('@saveReplacePolicy').its('response.statusCode').should('be.oneOf', [200, 201]);
+            cy.get(policyDialog).should('not.exist');
+        };
 
         const   pagePath = "/content/forms/sites/core-components-it/blank",
             replaceCompTestGroup = "/apps/forms-core-components-it/form/image",
@@ -153,23 +185,31 @@ describe('Replace functionality - sites', function () {
             replaceCompTestGroupDrop = pagePath + containerSuffix + "/container/image";
 
         beforeEach(function () {
-            checkTestGroupPolicy();
+            originalTestGroupAllowed = undefined;
+            cy.openAuthoring(templatePath);
+            updateTestGroupPolicy(true);
         });
 
         afterEach(function () {
-            uncheckTestGroupPolicy();
+            if (originalTestGroupAllowed !== undefined) {
+                cy.openSiteAuthoring(templatePath);
+                updateTestGroupPolicy(originalTestGroupAllowed);
+            }
         });
 
         it('test behaviour of replace within different groups same component type', function () {
             cy.openSiteAuthoring(pagePath);
             cy.selectLayer("Edit");
+            cy.cleanTest(editPath);
             cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Image", afConstants.components.forms.resourceType.formimage);
             cy.get('body').click( 0,0);
 
             cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + editPathSelector);
             cy.invokeEditableAction("[data-action='replace']");
 
-            cy.get(image).click();
+            selectReplacement(image, editPath);
+            cy.request((Cypress.env('crx.contextPath') || '') + editPath + '.0.json')
+                .its('body.sling:resourceType').should('equal', replaceCompTestGroup.replace('/apps/', ''));
 
             cy.deleteComponentByPath(replaceCompTestGroupDrop);
         });
@@ -180,13 +220,16 @@ describe('Replace functionality - sites', function () {
 
             cy.openSiteAuthoring(pagePath);
             cy.selectLayer("Edit");
+            cy.cleanTest(buttonEditPath);
 
             cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Button", afConstants.components.forms.resourceType.formbutton);
             cy.get('body').click( 0,0);
 
             cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + buttonEditPathSelector);
             cy.invokeEditableAction("[data-action='replace']");
-            cy.get(image).click();
+            selectReplacement(image, buttonEditPath);
+            cy.request((Cypress.env('crx.contextPath') || '') + buttonEditPath + '.0.json')
+                .its('body.sling:resourceType').should('equal', replaceCompTestGroup.replace('/apps/', ''));
             cy.deleteComponentByPath(buttonEditPath);
         });
     });

From f52ad850e2a0e804b130cbb955a2f2f9dfc1a9e8 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 2 Oct 2026 14:35:41 +0530
Subject: [PATCH 41/46] Reuse shared insertion flow and make authoring
 selectors backport-friendly

Replace duplicated telephone policy layer/insertion sequencing with existing helpers. Scope insertion to guideSelectors.insertComponentDialog.dialog and replacement to the Forms content hook; policy controls use cq-dialog and value hooks rather than Coral element tags.

Document shared helper reuse. Validate 10 authoring specs: 67 passing and 2 pre-existing skipped tests. One Button cancel-dialog assertion used its existing retry; a standalone rerun passed all 6 active Button tests on their first attempt. Insertion and layer synchronization checks passed across Forms, Sites, fields, layouts, nested wizard panels and Footer.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 docs/architecture/overview.md                 |  4 +++
 ui.tests/test-module/libs/support/commands.js |  6 ++--
 .../replacelayout-sites.authoring.cy.js       | 12 ++++----
 .../telephoneinput.authoring.cy.js            | 29 ++-----------------
 4 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/docs/architecture/overview.md b/docs/architecture/overview.md
index bde15e70e4..f26bd1e25e 100644
--- a/docs/architecture/overview.md
+++ b/docs/architecture/overview.md
@@ -155,6 +155,10 @@ curl -s -u admin:admin \
 | `cy.previewForm(pagePath)` | Loads form at `<pagePath>?wcmmode=disabled`, waits for AF runtime init, returns `formContainer` |
 | `cy.previewFormWithPanel(pagePath)` | Same as above but waits for panel-specific initialization |
 | `cy.fetchFeatureToggles()` | `GET /etc.clientlibs/toggles.json`, returns `{ enabled: ["FT_FORMS-XXXXX", ...] }` |
+| `cy.selectLayer(layer)` | Keeps an already-selected layer; otherwise waits for the selected layer and overlay repositioning |
+| `cy.insertComponent(dropZone, searchText, resourceType)` | Opens the Insert dialog with bounded retries, searches its visible component region, and waits for insertion and overlay refresh |
+
+Authoring specs should reuse these commands instead of implementing their own layer-switch or insertion sequence. Insert-dialog selectors use `guideSelectors.insertComponentDialog.dialog` (`.InsertComponentDialog-components`) and replacement selectors use the Forms hook `.cmp-replace-dialog-search-components`; visibility is scoped to those content regions without depending on a `coral-dialog` element or an outer dialog wrapper.
 
 ### Key `cy.af` helpers (defined in `libs/support/functions.js`)
 
diff --git a/ui.tests/test-module/libs/support/commands.js b/ui.tests/test-module/libs/support/commands.js
index eb37a80019..20e5519a26 100644
--- a/ui.tests/test-module/libs/support/commands.js
+++ b/ui.tests/test-module/libs/support/commands.js
@@ -673,9 +673,9 @@ Cypress.Commands.add("deleteComponentByTitle", (title) => {
  * @param {string} componentType Component resource type.
  */
 Cypress.Commands.add("insertComponent", (selector, componentString, componentType) => {
-    const insertComponentDialog = 'coral-dialog.InsertComponentDialog:visible',
-        insertComponentDialog_Selector = insertComponentDialog + ' .InsertComponentDialog-components [value="' + componentType + '"]',
-        insertComponentDialog_searchField = insertComponentDialog + " .InsertComponentDialog-components input[type='search']";
+    const insertComponentDialog = guideSelectors.insertComponentDialog.dialog + ':visible',
+        insertComponentDialog_Selector = insertComponentDialog + ' [value="' + componentType + '"]',
+        insertComponentDialog_searchField = insertComponentDialog + " input[type='search']";
     // Overlay refreshes can discard an Insert click; retry opening, not interactions with a hidden dialog.
     recurse(
         () => {
diff --git a/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js b/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js
index 37bcc2e60b..d0fb644268 100644
--- a/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js
+++ b/ui.tests/test-module/specs/replaceaction/replacelayout-sites.authoring.cy.js
@@ -29,7 +29,7 @@ describe('Replace functionality - sites', function () {
     const pagePath = "/content/forms/sites/core-components-it/blank",
         pageDropZoneSuffix = "/jcr:content/root/responsivegrid/container";
 
-    const replaceDialog = 'coral-dialog:visible .cmp-replace-dialog-search-components';
+    const replaceDialog = '.cmp-replace-dialog-search-components:visible';
 
     const selectReplacement = (resourceTypeSelector, componentPath) => {
         cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_EDITABLES_UPDATED).as('replacementEditableUpdated');
@@ -149,23 +149,23 @@ describe('Replace functionality - sites', function () {
 
     context('Test replace action within different groups', function () {
         const templatePath = "/conf/core-components-examples/settings/wcm/templates/content-page/structure";
-        const policyDialog = 'coral-dialog:visible:has([value="group:replace test group"])',
-            policyCheckbox = policyDialog + ' coral-checkbox[value="group:replace test group"]';
+        const policyDialog = '.cq-dialog:visible:has([value="group:replace test group"])',
+            policyCheckbox = policyDialog + ' [value="group:replace test group"]';
         let originalTestGroupAllowed;
 
         const updateTestGroupPolicy = (allow) => {
             cy.openEditableToolbar(sitesSelectors.overlays.overlay.self + '[data-path="' + templatePath + '/jcr:content/root/responsivegrid"]');
             cy.invokeEditableAction(sitesSelectors.editableToolbar.actions.policy);
-            cy.get(policyCheckbox).scrollIntoView().should('be.visible').invoke('prop', 'checked')
+            cy.get(policyCheckbox).first().scrollIntoView().should('be.visible').invoke('prop', 'checked')
                 .should('be.a', 'boolean').then((checked) => {
                     if (originalTestGroupAllowed === undefined) {
                         originalTestGroupAllowed = checked;
                     }
                     if (checked !== allow) {
-                        cy.get(policyCheckbox).click();
+                        cy.get(policyCheckbox).first().click();
                     }
                 });
-            cy.get(policyCheckbox).should('have.prop', 'checked', allow);
+            cy.get(policyCheckbox).first().should('have.prop', 'checked', allow);
             cy.intercept('POST', '**/conf/core-components-examples/settings/wcm/policies/**').as('saveReplacePolicy');
             cy.get(policyDialog + ' [title="Done"]').scrollIntoView().should('be.visible').click();
             cy.wait('@saveReplacePolicy').its('response.statusCode').should('be.oneOf', [200, 201]);
diff --git a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
index 164cc16db2..ca84c383b6 100644
--- a/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
+++ b/ui.tests/test-module/specs/telephoneinput/telephoneinput.authoring.cy.js
@@ -106,8 +106,7 @@ describe('Page - Authoring', function () {
     const customKey = 'customKey',
         customValue = 'customValue',
         // The policy is shared across specs and retries.
-        telephoneInputPolicyPath = '/conf/core-components-examples/settings/wcm/policies/forms-components-examples/components/form/telephoneinput/default',
-        sitesConstants = require('../../libs/commons/sitesConstants');
+        telephoneInputPolicyPath = '/conf/core-components-examples/settings/wcm/policies/forms-components-examples/components/form/telephoneinput/default';
     let policyPrepared = false;
 
     beforeEach(function () {
@@ -147,31 +146,9 @@ describe('Page - Authoring', function () {
             .should('include', {customFormatKey: customKey, customFormatValue: customValue});
       }).then(() => {
         cy.openSiteAuthoring(authoringPagePath);
-        cy.get(sitesSelectors.selectLayer.current).then($layers => {
-          if (!$layers.filter('[data-layer="Edit"].is-selected').length) {
-            cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as('telephoneEditLayerReady');
-            cy.selectLayer('Edit');
-            cy.get('@telephoneEditLayerReady').its('done').should('equal', true);
-          }
-        });
+        cy.selectLayer('Edit');
         cy.cleanTest(telephoneInputDrop);
-        const dropZone = sitesSelectors.overlays.overlay.component +
-            '[data-path="' + authoringPagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + '/*"]';
-        const insertDialog = '.InsertComponentDialog:visible';
-        const searchField = insertDialog + ' .InsertComponentDialog-components input[type="search"]';
-        cy.openEditableToolbar(dropZone);
-        cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_EDITABLES_UPDATED).as('telephoneInserted');
-        cy.initializeEventHandlerOnChannel(sitesConstants.EVENT_NAME_OVERLAYS_REPOSITIONED).as('telephoneInsertSettled');
-        cy.get(sitesSelectors.editableToolbar.actions.insert).should('be.visible').click();
-        cy.get(insertDialog).should('have.length', 1).and('be.visible');
-        cy.get(searchField).should('be.visible').clear();
-        cy.get(searchField).should('be.visible').type('Adaptive Form Telephone input');
-        cy.get(searchField).should('have.value', 'Adaptive Form Telephone input').type('{enter}');
-        cy.get(insertDialog + ' .InsertComponentDialog-components [value="' +
-            afConstants.components.forms.resourceType.formtelephoneinput + '"]').should('be.visible').click();
-        cy.get('@telephoneInserted').its('done').should('equal', true);
-        cy.get('@telephoneInsertSettled').its('done').should('equal', true);
-        cy.get(insertDialog).should('not.exist');
+        dropTelephoneInputInContainer();
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + telephoneInputEditPathSelector);
         cy.invokeEditableAction("[data-action='CONFIGURE']");
         cy.get(bemEditDialog).contains('Validation').click({force: true}).then(() => {

From f7de780dfa573592b38a7c2189f08abe7dae81d1 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <69448117+rismehta@users.noreply.github.com>
Date: Fri, 23 Oct 2026 16:28:58 +0530
Subject: [PATCH 42/46] fix: consume af-core 1.0.10 and cover legacy
 custom-function access (#2009)

Add runtime-only coverage for the legacy _options.parent._setProperty chain. Use the maintained IT page so repeated previews retain working custom-function registration.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../js/functions.js                           |  9 ++++++
 .../af2-custom-function/basic/.content.xml    | 26 +++++++++++++++-
 ui.frontend/package-lock.json                 | 30 +++++++++----------
 ui.frontend/package.json                      |  2 +-
 .../runtime/customFunction.runtime.cy.js      | 18 +++++++++--
 5 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/clientlibs/clientlib-it-custom-function/js/functions.js b/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/clientlibs/clientlib-it-custom-function/js/functions.js
index 04d864596e..26002c8cf8 100644
--- a/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/clientlibs/clientlib-it-custom-function/js/functions.js
+++ b/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/clientlibs/clientlib-it-custom-function/js/functions.js
@@ -329,3 +329,12 @@ function removePanelInstance(panel,globals)
         globals.functions.dispatchEvent(p, 'initialize');
     })
 }
+
+/**
+ * Hides a field's parent section using legacy private model access.
+ * @name hideParentSectionUsingPrivateModel
+ * @param {object} hideSom field in the section to hide
+ */
+function hideParentSectionUsingPrivateModel(hideSom) {
+    hideSom._options.parent._setProperty('visible', false);
+}
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/ruleeditor/af2-custom-function/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/ruleeditor/af2-custom-function/basic/.content.xml
index b07276b417..fa6b38a888 100644
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/ruleeditor/af2-custom-function/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/ruleeditor/af2-custom-function/basic/.content.xml
@@ -9,7 +9,7 @@
             jcr:language="en"
             jcr:primaryType="cq:PageContent"
             jcr:title="Adaptive Form V2 (IT)"
-            sling:resourceType="forms-components-examples/components/page">
+            sling:resourceType="forms-core-components-it/components/page">
         <guideContainer
                 fd:version="2.1"
                 jcr:primaryType="nt:unstructured"
@@ -266,6 +266,30 @@
                         jcr:primaryType="nt:unstructured"
                         click="[testRemoveInstance()]"/>
             </button_476277589>
+            <legacyAddressSection
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Legacy Address Section"
+                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
+                    fieldType="panel"
+                    name="legacyAddressSection"
+                    visible="{Boolean}true">
+                <streetNumber
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Street Number"
+                        sling:resourceType="forms-components-examples/components/form/textinput"
+                        fieldType="text-input"
+                        name="streetNumber"/>
+            </legacyAddressSection>
+            <hideLegacyAddressSection
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Hide Legacy Address Section"
+                    sling:resourceType="forms-components-examples/components/form/button"
+                    fieldType="button"
+                    name="hideLegacyAddressSection">
+                <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        click="[hideParentSectionUsingPrivateModel(legacyAddressSection.streetNumber)]"/>
+            </hideLegacyAddressSection>
         </guideContainer>
     </jcr:content>
 </jcr:root>
diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
index 964dbef627..2a1dbbe654 100644
--- a/ui.frontend/package-lock.json
+++ b/ui.frontend/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aemforms/af-core": "^1.0.7",
+        "@aemforms/af-core": "^1.0.10",
         "@aemforms/af-core-xfa": "^0.1.6",
         "@aemforms/af-custom-functions": "1.0.18",
         "@aemforms/af-formatters": "^1.0.7",
@@ -109,13 +109,13 @@
       }
     },
     "node_modules/@aemforms/af-core": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.7.tgz",
-      "integrity": "sha512-hw6xDFlFwvRcySvmvqb5Xl9sHB6Q5Fz7POURfGFzSfxf+HFc2OkO7sk9mGwPKD22Og3lqC8jxnEr/uL47aa4pA==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.10.tgz",
+      "integrity": "sha512-U9oPROwbzi3Uh5jKnHlISQApFT1tpQ/oLvfimOBsqrMtYmpvq2iHCh9JDqs6TO61WQhO2lHxOTkvhO8R2gsLHg==",
       "license": "Adobe Proprietary",
       "dependencies": {
         "@adobe/json-formula": "0.1.50",
-        "@aemforms/af-formatters": "^1.0.7"
+        "@aemforms/af-formatters": "^1.0.10"
       }
     },
     "node_modules/@aemforms/af-core-xfa": {
@@ -138,9 +138,9 @@
       "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
     },
     "node_modules/@aemforms/af-formatters": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.7.tgz",
-      "integrity": "sha512-2dEAOmYIH8FfYiiLzPSWqBDmdorrBFCzc+YsQ4JfDoZNH7qMPebnyujZsaFG3grhxUJcz8npMnKdPzDCqUjiqg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.10.tgz",
+      "integrity": "sha512-Q7IRSpGV8E6cR/hCBhWDyzXa2jYEl1yHWPep1rU24AqsbzWU0s+KtCoEkKln6l9t8G71czDg8+FJB21/yPhsvA==",
       "license": "Adobe Proprietary"
     },
     "node_modules/@aemforms/af-webmcp": {
@@ -11149,12 +11149,12 @@
       "integrity": "sha512-dmlLYfbty8NPVIdxvI9cJ+ZdXsrRCFrCdmL1+aR2auEzXJ86rD0bm1qu+S4NOpFiZLKIyx0zvUTykms40vNjsA=="
     },
     "@aemforms/af-core": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.7.tgz",
-      "integrity": "sha512-hw6xDFlFwvRcySvmvqb5Xl9sHB6Q5Fz7POURfGFzSfxf+HFc2OkO7sk9mGwPKD22Og3lqC8jxnEr/uL47aa4pA==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-1.0.10.tgz",
+      "integrity": "sha512-U9oPROwbzi3Uh5jKnHlISQApFT1tpQ/oLvfimOBsqrMtYmpvq2iHCh9JDqs6TO61WQhO2lHxOTkvhO8R2gsLHg==",
       "requires": {
         "@adobe/json-formula": "0.1.50",
-        "@aemforms/af-formatters": "^1.0.7"
+        "@aemforms/af-formatters": "^1.0.10"
       }
     },
     "@aemforms/af-core-xfa": {
@@ -11179,9 +11179,9 @@
       "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
     },
     "@aemforms/af-formatters": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.7.tgz",
-      "integrity": "sha512-2dEAOmYIH8FfYiiLzPSWqBDmdorrBFCzc+YsQ4JfDoZNH7qMPebnyujZsaFG3grhxUJcz8npMnKdPzDCqUjiqg=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-1.0.10.tgz",
+      "integrity": "sha512-Q7IRSpGV8E6cR/hCBhWDyzXa2jYEl1yHWPep1rU24AqsbzWU0s+KtCoEkKln6l9t8G71czDg8+FJB21/yPhsvA=="
     },
     "@aemforms/af-webmcp": {
       "version": "1.0.7",
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
index dc896810c5..b1532b0786 100644
--- a/ui.frontend/package.json
+++ b/ui.frontend/package.json
@@ -25,7 +25,7 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@aemforms/af-core": "^1.0.7",
+    "@aemforms/af-core": "^1.0.10",
     "@aemforms/af-core-xfa": "^0.1.6",
     "@aemforms/af-formatters": "^1.0.7",
     "@aemforms/af-custom-functions": "1.0.18",
diff --git a/ui.tests/test-module/specs/ruleeditor/runtime/customFunction.runtime.cy.js b/ui.tests/test-module/specs/ruleeditor/runtime/customFunction.runtime.cy.js
index 0468fce5de..d919c9bc9a 100644
--- a/ui.tests/test-module/specs/ruleeditor/runtime/customFunction.runtime.cy.js
+++ b/ui.tests/test-module/specs/ruleeditor/runtime/customFunction.runtime.cy.js
@@ -59,10 +59,24 @@ describe('Form with custom functions configured in client lib', () => {
     it("should have set textinput value based on custom function rule", () => {
         // Rule on textBox1: set value of textBox1 to "test", which is output of custom function testFunction1()
         expect(formContainer, "formcontainer is initialized").to.not.be.null;
-        const [textbox1, textBox1FieldView] = Object.entries(formContainer._fields)[0];
-        cy.get(`#${textbox1}`).find("input").should('have.value', "test")
+        cy.get('input[name="textinput1"]').should('have.value', "test")
     })
 
+    it('should hide the parent section using private field model access in a custom function', () => {
+        expect(formContainer, 'formcontainer is initialized').to.not.be.null;
+        const section = Object.values(formContainer._fields)
+            .find(field => field.getModel().name === 'legacyAddressSection');
+        expect(section, 'legacy address section is initialized').to.not.be.undefined;
+        const sectionModel = section.getModel();
+
+        cy.get(`#${sectionModel.id}`).should('be.visible');
+        cy.get('input[name="streetNumber"]').should('be.visible');
+        cy.contains('button', 'Hide Legacy Address Section').click();
+
+        cy.wrap(sectionModel).its('visible').should('equal', false);
+        cy.get(`#${sectionModel.id}`).should('not.be.visible');
+    });
+
 
     it("should submit custom formData on button click", () => {
         if (cy.af.isLatestAddon() && toggle_array.includes("FT_FORMS-11541")) {

From d99db3ebbf2cb4e1ebf8b2cc756582aa8712745d Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 23 Oct 2026 17:26:58 +0530
Subject: [PATCH 43/46] @releng [maven-scm] :prepare release
 core-forms-components-reactor-3.0.174

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index 39ccc4f18d..c89470125c 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 91283a6e31..224a19124e 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index ab013405db..54a6ca3049 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 46ce291c5a..7106422a80 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index c3b49129a3..24e4feb4f4 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 888cacd831..71cb22ac47 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index 16f67490ca..8c6f8cd146 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index f962da06b5..967673f4f7 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index ab1f46829f..bfdf8b6bb5 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index f288b3fcf1..2c2db4e2e4 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index 03337deae4..576103eceb 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index 781f41da27..2de613ac4d 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index f63443002a..b9f282bee2 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index 688b8880aa..19170bb88b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.173-SNAPSHOT</version>
+    <version>3.0.174</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 771454ebf2..035231393c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 4eadc5983f..60a04b8e7b 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 52ec295b4e..0c09b9118a 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>HEAD</tag>
+        <tag>core-forms-components-reactor-3.0.174</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index e7a98efde8..0739f81559 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index 404d0e4ef0..b8c01f3358 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.173-SNAPSHOT</version>
+        <version>3.0.174</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From 799688bd805b0c4de3ebefebe99c545b74999e4f Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Fri, 23 Oct 2026 17:27:00 +0530
Subject: [PATCH 44/46] @releng [maven-scm] :prepare for next development
 iteration

---
 all/pom.xml                 | 4 ++--
 bundles/af-core/pom.xml     | 4 ++--
 bundles/core/pom.xml        | 4 ++--
 examples/all/pom.xml        | 4 ++--
 examples/core/pom.xml       | 4 ++--
 examples/pom.xml            | 2 +-
 examples/ui.apps/pom.xml    | 4 ++--
 examples/ui.content/pom.xml | 4 ++--
 it/apps/pom.xml             | 4 ++--
 it/config/pom.xml           | 4 ++--
 it/content/pom.xml          | 4 ++--
 it/core/pom.xml             | 4 ++--
 jsdocs/pom.xml              | 4 ++--
 parent/pom.xml              | 4 ++--
 pom.xml                     | 4 ++--
 ui.af.apps/pom.xml          | 4 ++--
 ui.apps/pom.xml             | 4 ++--
 ui.frontend/pom.xml         | 2 +-
 ui.tests/pom.xml            | 2 +-
 19 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index c89470125c..13e146ac0f 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml
index 224a19124e..a0345e5b9e 100644
--- a/bundles/af-core/pom.xml
+++ b/bundles/af-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index 54a6ca3049..6d3965f122 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/all/pom.xml b/examples/all/pom.xml
index 7106422a80..9eda8f4510 100644
--- a/examples/all/pom.xml
+++ b/examples/all/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/core/pom.xml b/examples/core/pom.xml
index 24e4feb4f4..8a56097683 100644
--- a/examples/core/pom.xml
+++ b/examples/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 71cb22ac47..2a0bde782d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
index 8c6f8cd146..51ba0ccd33 100644
--- a/examples/ui.apps/pom.xml
+++ b/examples/ui.apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
index 967673f4f7..4df6a15e15 100644
--- a/examples/ui.content/pom.xml
+++ b/examples/ui.content/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/apps/pom.xml b/it/apps/pom.xml
index bfdf8b6bb5..8208e10626 100644
--- a/it/apps/pom.xml
+++ b/it/apps/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/config/pom.xml b/it/config/pom.xml
index 2c2db4e2e4..a77b550e8d 100644
--- a/it/config/pom.xml
+++ b/it/config/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/content/pom.xml b/it/content/pom.xml
index 576103eceb..1de5351157 100644
--- a/it/content/pom.xml
+++ b/it/content/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/it/core/pom.xml b/it/core/pom.xml
index 2de613ac4d..a8b73d0ada 100644
--- a/it/core/pom.xml
+++ b/it/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml
index b9f282bee2..171c9a787a 100644
--- a/jsdocs/pom.xml
+++ b/jsdocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -39,7 +39,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/parent/pom.xml b/parent/pom.xml
index 19170bb88b..d50fd9b441 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.adobe.aem</groupId>
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.174</version>
+    <version>3.0.175-SNAPSHOT</version>
 
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <organization>
diff --git a/pom.xml b/pom.xml
index 035231393c..5fdc42a952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
@@ -77,7 +77,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     
     <build>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 60a04b8e7b..96b7fcee9a 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 0c09b9118a..7fac39f661 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->
@@ -37,7 +37,7 @@
         <connection>scm:git:https://github.com/adobe/aem-core-forms-components</connection>
         <developerConnection>scm:git:git@github.com:adobe/aem-core-forms-components.git</developerConnection>
         <url>https://github.com/adobe/aem-core-forms-components</url>
-        <tag>core-forms-components-reactor-3.0.174</tag>
+        <tag>HEAD</tag>
     </scm>
     <organization>
         <name>Adobe</name>
diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml
index 0739f81559..c2ca523db4 100644
--- a/ui.frontend/pom.xml
+++ b/ui.frontend/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml
index b8c01f3358..c93ae60e68 100644
--- a/ui.tests/pom.xml
+++ b/ui.tests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>3.0.174</version>
+        <version>3.0.175-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

From 62086332528e34157d92d4ac263a8c14cbd30d33 Mon Sep 17 00:00:00 2001
From: ci-build <ci-build@aemforms>
Date: Fri, 23 Oct 2026 12:19:44 +0000
Subject: [PATCH 45/46] Update VERSIONS.md and README.md to include version
 3.0.174

---
 README.md   | 2 +-
 VERSIONS.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4a04aa488e..18944dd862 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s
 
 | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java  | Maven  |  
 |-----------------------|---------------------| ---------------------------- | ----- | ------ | 
-| 3.0.172                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
+| 3.0.174                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 
 For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md).
 
diff --git a/VERSIONS.md b/VERSIONS.md
index b2a9f5eea5..ff5451bc83 100644
--- a/VERSIONS.md
+++ b/VERSIONS.md
@@ -4,6 +4,7 @@ See below for a full list of minimum system requirements for historical versions
 
 | Forms Core Components  | WCM Core Components | AEM Forms as a cloud service | Java  | Maven  |  
 |------------------------|---------------------| ---------------------------- | ----- | ------ |
+| 3.0.174                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.172                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.158                | 2.24.6             | Continual                    | 11 | 3.3.9+ |
 | 3.0.156                | 2.24.6             | Continual                    | 11 | 3.3.9+ |

From 9e6517e8ec7ec10765e79cbf64015c219ffae701 Mon Sep 17 00:00:00 2001
From: Rishi Mehta <rismehta@adobe.com>
Date: Mon, 26 Oct 2026 10:38:22 +0530
Subject: [PATCH 46/46] Exclude CAPTCHA updates from release/650 merge

Restore CAPTCHA implementation, tests, documentation, and custom-functions dependency to release/650. Remove reCAPTCHA v3 fixtures and its feature toggle while retaining WebMCP and the af-core compatibility fix.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../models/v1/form/RecaptchaImpl.java         | 28 --------
 .../components/util/AbstractCaptchaImpl.java  |  5 --
 .../models/v1/form/RecaptchaImplTest.java     | 37 ----------
 .../form/recaptcha/exporter-recaptcha.json    |  1 -
 ...mpl.dev.DynamicToggleProviderImpl.cfg.json |  1 -
 .../cloudconfigs/recaptcha/v3/.content.xml    | 17 -----
 .../samples/recaptcha/v3/.content.xml         | 67 -------------------
 .../form/recaptcha/v1/recaptcha/README.md     |  5 +-
 .../clientlibs/editor/js/editDialog.js        |  4 +-
 .../clientlibs/site/js/recaptchawidget.js     |  7 +-
 ui.frontend/package-lock.json                 | 15 +++--
 ui.frontend/package.json                      |  2 +-
 ui.frontend/src/customFunctions.js            |  2 +-
 .../specs/recaptcha/recaptcha.authoring.cy.js |  6 --
 14 files changed, 14 insertions(+), 183 deletions(-)
 delete mode 100644 it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
 delete mode 100644 it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml

diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java
index d7b53b7a6b..3f93b6f050 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImpl.java
@@ -31,8 +31,6 @@
 import org.apache.sling.models.annotations.injectorspecific.OSGiService;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
 import org.osgi.service.component.annotations.Reference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.adobe.aemds.guide.model.ReCaptchaConfigurationModel;
 import com.adobe.aemds.guide.service.CloudConfigurationProvider;
@@ -52,8 +50,6 @@
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public class RecaptchaImpl extends AbstractCaptchaImpl implements Captcha {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RecaptchaImpl.class);
-
     @Inject
     private ResourceResolver resourceResolver;
 
@@ -127,28 +123,4 @@ public Map<String, Object> getCaptchaProperties() throws GuideException {
         return customCaptchaProperties;
 
     }
-
-    @Override
-    public String getCaptchaDisplayMode() {
-        // reCAPTCHA v3 has no visible challenge (badge-only), so it is treated as invisible. This
-        // lets the runtime's built-in submitForm auto-fetch the token before submit, the same way
-        // it already does for invisible turnstile and enterprise-score keys.
-        CaptchaDisplayMode captchaDisplayMode = CaptchaDisplayMode.VISIBLE;
-        String version = null;
-        resource = resourceResolver.getResource(this.getPath());
-        if (resource != null && cloudConfigurationProvider != null) {
-            try {
-                reCaptchaConfiguration = cloudConfigurationProvider.getRecaptchaCloudConfiguration(resource);
-                if (reCaptchaConfiguration != null) {
-                    version = reCaptchaConfiguration.version();
-                }
-            } catch (GuideException e) {
-                LOGGER.error("[AF] [Captcha] [RECAPTCHA] Error while fetching cloud configuration to resolve display mode.", e);
-            }
-        }
-        if ("v3".equals(version)) {
-            captchaDisplayMode = CaptchaDisplayMode.INVISIBLE;
-        }
-        return captchaDisplayMode.getValue();
-    }
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java
index 1b635b7b17..4b82de8c63 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractCaptchaImpl.java
@@ -47,11 +47,6 @@ public String getFieldType() {
         return super.getFieldType(FieldType.CAPTCHA);
     }
 
-    @Override
-    public Boolean isRequired() {
-        return Boolean.TRUE;
-    }
-
     @JsonIgnore
     public abstract Map<String, Object> getCaptchaProperties();
 
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
index 436f390565..cca499db8a 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RecaptchaImplTest.java
@@ -121,18 +121,6 @@ void testIsEnabled() {
         assertEquals(null, recaptchaMock.isEnabled());
     }
 
-    @Test
-    void testIsRequired() {
-        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
-        assertEquals(Boolean.TRUE, recaptcha.isRequired());
-    }
-
-    @Test
-    void testIsRequiredWithoutFieldType() {
-        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA_WITHOUT_FEILDTYPE, Captcha.class, context);
-        assertEquals(Boolean.TRUE, recaptcha.isRequired());
-    }
-
     @Test
     void testJSONExport() throws Exception {
         Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
@@ -148,31 +136,6 @@ void getEnterpriseUrl() {
         assertEquals("https://www.recaptcha.net/recaptcha/enterprise.js", enterpriseUrl);
     }
 
-    @Test
-    void getV3Url() {
-        // reCAPTCHA v3 uses the classic (non-enterprise) endpoint, same as v2.
-        when(reCaptchaConfiguration.version()).thenReturn("v3");
-        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
-        Map<String, Object> captchaProps = recaptcha.getCaptchaProperties();
-        assertEquals("https://www.recaptcha.net/recaptcha/api.js", captchaProps.get("uri"));
-        assertEquals("v3", captchaProps.get("version"));
-    }
-
-    @Test
-    void getCaptchaDisplayModeForV3() {
-        // v3 has no visible challenge, so it must report as invisible for auto token fetch on submit.
-        when(reCaptchaConfiguration.version()).thenReturn("v3");
-        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
-        assertEquals("invisible", recaptcha.getCaptchaDisplayMode());
-    }
-
-    @Test
-    void getCaptchaDisplayModeForNonV3() {
-        when(reCaptchaConfiguration.version()).thenReturn("enterprise");
-        Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA, Captcha.class, context);
-        assertEquals("visible", recaptcha.getCaptchaDisplayMode());
-    }
-
     @Test
     void testNoFieldType() {
         Captcha recaptcha = Utils.getComponentUnderTest(PATH_RECAPTCHA_WITHOUT_FEILDTYPE, Captcha.class, context);
diff --git a/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json b/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json
index 22d6912e65..636bd13dc3 100644
--- a/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json
+++ b/bundles/af-core/src/test/resources/form/recaptcha/exporter-recaptcha.json
@@ -31,6 +31,5 @@
     },
     "customProp": "customPropValue"
   },
-  "captchaDisplayMode": "visible",
   ":type": "core/fd/components/form/recaptcha/v1/recaptcha"
 }
\ No newline at end of file
diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
index f7b302323f..5ba4383e49 100644
--- a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
+++ b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
@@ -28,7 +28,6 @@
     "FT_FORMS-24087",
     "FT_FORMS-24343",
     "FT_FORMS-25252",
-    "FT_FORMS-27648",
     "FT_FORMS-28233"
   ],
   "disabledToggles": [
diff --git a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
deleted file mode 100644
index c729bef5c7..0000000000
--- a/it/content/src/main/content/jcr_root/conf/core-components-it/samples/recaptcha/basic/settings/cloudconfigs/recaptcha/v3/.content.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-    jcr:primaryType="cq:Page">
-    <jcr:content
-        cq:lastModified="{Date}2024-05-21T17:20:26.859+05:30"
-        cq:lastModifiedBy="admin"
-        cq:template="/libs/fd/af/cloudservices/recaptcha/template"
-        jcr:lastModified="{Date}2024-05-21T17:20:26.842+05:30"
-        jcr:lastModifiedBy="admin"
-        jcr:primaryType="cq:PageContent"
-        jcr:title="v3Config"
-        sling:resourceType="fd/af/cloudservices/recaptcha/page"
-        name="v3"
-        secretKey="placeholder-v3-secret-key"
-        siteKey="6LdV1LUtAAAAAM4xLHqg4bxuxl1LKWvWoIcG9Zqd"
-        version="v3"/>
-</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml
deleted file mode 100644
index 0e8ecf4e34..0000000000
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/recaptcha/v3/.content.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
-    jcr:primaryType="cq:Page">
-    <jcr:content
-        cq:conf="/conf/core-components-it/samples/recaptcha/basic"
-        cq:deviceGroups="[/etc/mobile/groups/responsive]"
-        cq:lastModified="{Date}2024-05-24T17:33:40.560+05:30"
-        cq:lastModifiedBy="admin"
-        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
-        jcr:language="en"
-        jcr:primaryType="cq:PageContent"
-        jcr:title="v3"
-        sling:configRef="/conf/forms/core-components-it/samples/recaptcha/v3/"
-        sling:resourceType="forms-components-examples/components/page">
-        <guideContainer
-            fd:version="2.1"
-            jcr:lastModified="{Date}2024-05-24T17:33:40.543+05:30"
-            jcr:lastModifiedBy="admin"
-            jcr:primaryType="nt:unstructured"
-            sling:resourceType="forms-components-examples/components/form/container"
-            actionType="forms-core-components-it/customsubmission/logsubmit"
-            dorType="none"
-            fieldType="form"
-            schemaType="none"
-            specVersion="0.13.0"
-            textIsRich="true"
-            thankYouMessage="Thank you for submitting the form."
-            thankYouOption="page"
-            themeRef="/libs/fd/af/themes/canvas"
-            title="v3">
-            <recaptcha
-                jcr:lastModified="{Date}2024-05-24T17:33:17.916+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="CAPTCHA"
-                sling:resourceType="forms-core-components-it/form/recaptcha"
-                cloudServicePath="v2checkbox"
-                enabled="{Boolean}true"
-                fieldType="captcha"
-                hideTitle="false"
-                name="recaptcha-test"
-                rcCloudServicePath="v3"
-                readOnly="{Boolean}false"
-                size="normal"
-                textIsRich="true"
-                unboundFormElement="{Boolean}false"
-                required="{Boolean}true"
-                visible="{Boolean}true"/>
-            <submit
-                jcr:created="{Date}2024-05-24T17:33:23.737+05:30"
-                jcr:createdBy="admin"
-                jcr:lastModified="{Date}2024-05-24T17:33:23.737+05:30"
-                jcr:lastModifiedBy="admin"
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Submit"
-                sling:resourceType="forms-components-examples/components/form/actions/submit"
-                buttonType="submit"
-                dorExclusion="true"
-                fieldType="button"
-                name="submit1716552204262">
-                <fd:events
-                    jcr:primaryType="nt:unstructured"
-                    click="[submitForm()]"/>
-            </submit>
-        </guideContainer>
-    </jcr:content>
-</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md
index eec07ce132..71194988f5 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/README.md
@@ -24,9 +24,6 @@ Adaptive Form Recaptcha field component written in HTL.
 * Supports the following recaptcha versions:
   * v2
     * Only visible behaviour is supported
-  * v3
-    * Only invisible behaviour is supported (badge-only, no visible challenge); the token is
-      auto-fetched at submit. Requires the FT_FORMS-27648 feature toggle to be enabled.
   * Enterprise
     * Checkbox keys (Visible Behaviour)
     * Score-based keys (Invisible behaviour)
@@ -48,7 +45,7 @@ The following properties are written to JCR for this Form Recaptcha component an
 7. `./requiredMessage` - defines the message displayed as tooltip when submitting the form if the value is left empty
 8. `./readOnly` - if set to `true`, the filed will be read only
 9. `./rcCloudServicePath` - defines the path of cloud configuration resource for reCAPTCHA
-10. `./recaptchaSize` - defines the size attribute of Google reCAPTCHA. This property is only valid for reCAPTCHA v2 and the checkbox keys of reCAPTCHA enterprise. This property will be disabled for reCAPTCHA Enterprise score-based keys and for reCAPTCHA v3 (both invisible).
+10. `./recaptchaSize` - defines the size attribute of Google reCAPTCHA. This property is only valid for reCAPTCHA v2 and the checkbox keys of reCAPTCHA enterprise. This property will be disabled for reCAPTCHA Enteprise score-based keys.
 
 ## Client Libraries
 The component provides a `core.forms.components.recaptcha.v1.runtime` client library category that contains the Javascript runtime for the component.
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js
index 90435bc98c..898a177076 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/editor/js/editDialog.js
@@ -40,9 +40,7 @@
         const selectedVersion = selectedConfig.getAttribute("data-version");
         const selectedKeyType = selectedConfig.getAttribute("data-key.type");
         const inputs = recaptchaSize.querySelectorAll('input');
-        // v3 has no keyType concept - it is always invisible/score-based, same as
-        // Enterprise's score-based key case.
-        if ((selectedVersion === "enterprise" && selectedKeyType === "score") || selectedVersion === "v3") {
+        if (selectedVersion === "enterprise" && selectedKeyType === "score") {
             inputs.forEach(input => input.setAttribute("disabled", true));
         } else {
             inputs.forEach(input => input.removeAttribute("disabled"));
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js
index 0811650296..7e9e67e149 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/recaptcha/v1/recaptcha/clientlibs/site/js/recaptchawidget.js
@@ -45,14 +45,11 @@ if (typeof window.RecaptchaWidget === 'undefined') {
 
             var self = this;
             var recaptchaConfigData = this.#options;
-            // reCAPTCHA v3 has no "invisible" size setting like classic v2 - it is always
-            // badge-only/invisible, so it needs the same treatment as an explicit invisible size.
-            var isRecaptchaV3 = recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.version === "v3";
             element.innerHTML = '<div class="g-recaptcha"></div>';
             var gcontainer = document.getElementsByClassName("g-recaptcha")[0];
             var widgetId;
             var url = recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.uri;
-            if (recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.size == "invisible" || isRecaptchaV3) {
+            if (recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.size == "invisible") {
                 gcontainer.classList.add('g-recaptcha-invisible');
                 recaptchaConfigData.required = false;
             }
@@ -97,7 +94,7 @@ if (typeof window.RecaptchaWidget === 'undefined') {
             var runtimeLocale = this.#lang;
 
             var scr = document.createElement('script');
-            let queryParams = (isScoreBasedKey() || isRecaptchaV3) ? "?render=" + recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.siteKey
+            let queryParams = isScoreBasedKey() ? "?render=" + recaptchaConfigData.properties[RecaptchaWidget.FD_CAPTCHA].config.siteKey
                 : "?onload=onloadRecaptchaCallback&render=explicit";
             queryParams += "&hl=" + runtimeLocale;
             scr.src = url + queryParams;
diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
index 41e2645e55..1287e4e8b3 100644
--- a/ui.frontend/package-lock.json
+++ b/ui.frontend/package-lock.json
@@ -10,7 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@aemforms/af-core": "^1.0.10",
-        "@aemforms/af-custom-functions": "1.0.18",
+        "@aemforms/af-custom-functions": "1.0.17",
         "@aemforms/af-formatters": "^1.0.7",
         "@aemforms/af-webmcp": "^1.0.7"
       },
@@ -118,9 +118,10 @@
       }
     },
     "node_modules/@aemforms/af-custom-functions": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.18.tgz",
-      "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.17.tgz",
+      "integrity": "sha512-gDPC/Ly/+aQ7ojSPWm4JM3Zs+NUA+8c6bhjVbKm058AX5UEsXRk+N2o9wK4AHrdsaiR21vmvDuIUyUR2Jb2LTA==",
+      "license": "MIT License, Copyright 2024 Adobe Systems Incorporated"
     },
     "node_modules/@aemforms/af-formatters": {
       "version": "1.0.10",
@@ -11143,9 +11144,9 @@
       }
     },
     "@aemforms/af-custom-functions": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.18.tgz",
-      "integrity": "sha512-Hg7dkONjmR3aH/Iec+/HRY/lCzVvP3GI6H9wD5FNGsE9zSxPcCzMtnAA0P7n/RKMjcnqYBMt4pFQ6MVb+YvIGg=="
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.17.tgz",
+      "integrity": "sha512-gDPC/Ly/+aQ7ojSPWm4JM3Zs+NUA+8c6bhjVbKm058AX5UEsXRk+N2o9wK4AHrdsaiR21vmvDuIUyUR2Jb2LTA=="
     },
     "@aemforms/af-formatters": {
       "version": "1.0.10",
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
index 9bf6242577..92d28f6b30 100644
--- a/ui.frontend/package.json
+++ b/ui.frontend/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@aemforms/af-core": "^1.0.10",
     "@aemforms/af-formatters": "^1.0.7",
-    "@aemforms/af-custom-functions": "1.0.18",
+    "@aemforms/af-custom-functions": "1.0.17",
     "@aemforms/af-webmcp": "^1.0.7"
   }
 }
diff --git a/ui.frontend/src/customFunctions.js b/ui.frontend/src/customFunctions.js
index 42cbab36b3..64ae259d79 100644
--- a/ui.frontend/src/customFunctions.js
+++ b/ui.frontend/src/customFunctions.js
@@ -124,7 +124,7 @@ export const customFunctions = {
     /**
      * Fetches the captcha token for the form.
      *
-     * Supports turnstile, reCAPTCHA Enterprise, and reCAPTCHA v3 via @aemforms/af-custom-functions.
+     * This function uses the Google reCAPTCHA Enterprise service to fetch the captcha token.
      *
      * @async
      * @param {object} globals - An object containing read-only form instance, read-only target field instance and methods for form modifications.
diff --git a/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js b/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js
index ebc55b75de..0d4422af2e 100644
--- a/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js
+++ b/ui.tests/test-module/specs/recaptcha/recaptcha.authoring.cy.js
@@ -75,12 +75,6 @@ describe('Page - Authoring', function () {
         cy.get("input[name='./recaptchaSize'][value='normal']").should("be.disabled");
         cy.get("input[name='./recaptchaSize'][value='compact']").should("be.disabled");
 
-        // reCAPTCHA v3 is badge-only (no visible challenge), so size must be disabled like enterprise-score.
-        cy.get(".cmp-adaptiveform-recaptcha__configuration").click().then(() => {
-            cy.get("coral-selectlist-item[value='v3']").click();
-            cy.get("input[name='./recaptchaSize'][value='normal']").should("be.disabled");
-            cy.get("input[name='./recaptchaSize'][value='compact']").should("be.disabled");
-        })
 
         cy.get(".cmp-adaptiveform-recaptcha__configuration").click().then(() => {
             cy.get("coral-selectlist-item[value='v2checkbox']").click();