diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/checkboxgroup/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/checkboxgroup/.content.xml
index e8ccbbc826..699201714a 100644
--- a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/checkboxgroup/.content.xml
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/checkboxgroup/.content.xml
@@ -3,5 +3,5 @@
   jcr:primaryType="cq:Component"
   jcr:title="Adaptive Form CheckBox Group"
   jcr:description="Add checkboxes to select one or more of the available options."
-  sling:resourceSuperType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+  sling:resourceSuperType="core/fd/components/form/checkboxgroup/v2/checkboxgroup"
   componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/.content.xml b/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/.content.xml
new file mode 100644
index 0000000000..27ceb8ec10
--- /dev/null
+++ b/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/.content.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:description="Page Component for v1 Dynamic Options Testing"
+    jcr:primaryType="cq:Component"
+    jcr:title="Page - Dynamic Options V1"
+    sling:resourceSuperType="forms-components-examples/components/page"
+    componentGroup=".hidden"/>
diff --git a/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/customfooterlibs.html b/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/customfooterlibs.html
new file mode 100644
index 0000000000..2d858eeed2
--- /dev/null
+++ b/it/apps/src/main/content/jcr_root/apps/forms-core-components-it/components/page-dynamicoptionsv1/customfooterlibs.html
@@ -0,0 +1,29 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html"
+     data-sly-use.formclientlibmanager="com.adobe.cq.forms.core.components.models.form.FormClientLibManager">
+    <sly data-sly-repeat="${formclientlibmanager.clientLibRefList}" data-sly-call="${clientlib.js @ categories=item, async=true}"/>
+</sly>
+<!-- Adding v1 component clientlibs for dynamic options test -->
+<!-- core.forms.components.radiobutton.v1.runtime and core.forms.components.checkboxgroup.v1.runtime are loaded explicitly -->
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html">
+    <sly data-sly-test="${!wcmmode.edit}" data-sly-call="${clientlib.js @ categories=['core.forms.components.runtime.base','core.forms.components.container.v2.runtime','core.forms.components.radiobutton.v1.runtime','core.forms.components.checkboxgroup.v1.runtime','core.forms.components.dropdown.v1.runtime','core.forms.components.button.v1.runtime'], async=false}"/>
+</sly>
+<sly data-sly-use.page="com.adobe.cq.wcm.core.components.models.Page">
+    <sly data-sly-test="${page.data && page.dataLayerClientlibIncluded}" data-sly-call="${clientlib.js @ categories='core.forms.components.commons.v1.datalayer', async=true}"></sly>
+</sly>
+
+
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml
new file mode 100755
index 0000000000..de0e81ebaf
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          lcFolder="{Long}0"
+          type="lcFolder"/>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic/.content.xml
similarity index 82%
rename from it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/basic/.content.xml
rename to it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic/.content.xml
index 5f2376f365..5c5fbd3bd4 100755
--- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic/.content.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
           jcr:primaryType="dam:Asset">
     <jcr:content
-            jcr:lastModified="{Date}2023-05-03T11:33:58.405+05:30"
+            jcr:lastModified="{Date}2025-11-16T16:00:00.000+05:30"
             jcr:primaryType="dam:AssetContent"
             sling:resourceType="fd/fm/af/render"
             guide="1"
@@ -16,6 +16,6 @@
                 dorType="none"
                 formmodel="none"
                 hasCustomThumbnail="{Boolean}false"
-                title="Adaptive Form V2 (IT)"/>
+                title="basic"/>
     </jcr:content>
 </jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml
new file mode 100755
index 0000000000..de0e81ebaf
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          lcFolder="{Long}0"
+          type="lcFolder"/>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml
new file mode 100755
index 0000000000..5c5fbd3bd4
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+          jcr:primaryType="dam:Asset">
+    <jcr:content
+            jcr:lastModified="{Date}2025-11-16T16:00:00.000+05:30"
+            jcr:primaryType="dam:AssetContent"
+            sling:resourceType="fd/fm/af/render"
+            guide="1"
+            type="guide">
+        <metadata
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                allowedRenderFormat="HTML"
+                author="admin"
+                availableInMobileApp="{Boolean}false"
+                dorType="none"
+                formmodel="none"
+                hasCustomThumbnail="{Boolean}false"
+                title="basic"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml
new file mode 100755
index 0000000000..aecaaab4b2
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/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="dam:Asset">
+    <jcr:content
+            jcr:lastModified="{Date}2025-11-16T16:00:00.000+05:30"
+            jcr:primaryType="dam:AssetContent"
+            sling:resourceType="fd/fm/af/render"
+            guide="1"
+            type="guide">
+        <metadata
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                xmp:CreatorTool="AEM Forms"
+                allowedRenderFormat="HTML"
+                author="admin"
+                availableInMobileApp="{Boolean}false"
+                dorTemplateChanged="Boolean"
+                dorType="none"
+                formmodel="none"
+                themeRef="/libs/fd/af/themes/canvas"
+                title="Populate-Checkboxv2"/>
+    </jcr:content>
+</jcr:root>
\ No newline at end of file
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml
new file mode 100644
index 0000000000..f526f99e84
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/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="dam:Asset">
+    <jcr:content
+        cq:conf="\0"
+        jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+        jcr:primaryType="dam:AssetContent"
+        sling:resourceType="fd/fm/af/render"
+        guide="1"
+        type="guide">
+        <metadata
+            fd:version="2.1"
+            jcr:language="en"
+            jcr:primaryType="nt:unstructured"
+            xmp:CreatorTool="AEM Forms AF Wizard"
+            allowedRenderFormat="HTML"
+            author="admin"
+            dorType="none"
+            formmodel="none"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="dynamicOptionsv2"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
index e4df0943fb..dab11d370f 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/af2-form-translation/.content.xml
@@ -44,7 +44,7 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Check Box Group"
-                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                 enum="[0,1]"
                 enumNames="[Item 1, Item 2]"
                 fieldType="checkbox-group"
@@ -224,7 +224,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     areOptionsRichText="true"
                     enabled="{Boolean}true"
                     enum="[0,1]"
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml
new file mode 100755
index 0000000000..8f415a05ec
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic/.content.xml
similarity index 98%
rename from it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
rename to it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic/.content.xml
index 2b87557fc7..df0addbc5f 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic/.content.xml
@@ -63,7 +63,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 3"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1]"
                     enumNames="[Item 1, Item 2]"
@@ -118,7 +118,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 5"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1]"
                     enumNames="[Item 1, Item 2]"
@@ -141,7 +141,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 6"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1,0]"
                     enumNames="[Item 1, Item 2,Item 3]"
@@ -160,7 +160,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
-                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     areOptionsRichText="true"
                     enabled="{Boolean}true"
                     enum="[0,1]"
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest/.content.xml
new file mode 100644
index 0000000000..2c26fbd49b
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest/.content.xml
@@ -0,0 +1,57 @@
+<?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:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2023-10-19T13:14:31.885+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="focustest"
+        sling:configRef="/conf/forms/core-components-it/samples/checkboxgroup/focustest/"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container"
+            dorType="none"
+            fieldType="form"
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="focustest">
+            <button
+                jcr:created="{Date}2023-10-19T13:13:52.618+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-10-19T13:13:52.618+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Button"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button1697701432805">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1697701432805&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1697701432805&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_FOCUS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1697701437345&quot;\,&quot;displayName&quot;:&quot;Check Box Group&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group/&quot;\,&quot;name&quot;:&quot;checkboxgroup1697701437345&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;setFocus(checkboxgroup1697701437345)&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[setFocus(checkboxgroup1697701437345)]"/>
+            </button>
+            <checkboxgroup
+                jcr:created="{Date}2023-10-19T13:13:56.745+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-10-19T13:13:56.745+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Check Box Group"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+                enum="[0,1]"
+                enumNames="[Item 1, Item 2]"
+                fieldType="checkbox-group"
+                name="checkboxgroup1697701437345"
+                type="number[]"/>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml
new file mode 100755
index 0000000000..8f415a05ec
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          jcr:mixinTypes="[rep:AccessControllable]"
+          jcr:primaryType="sling:Folder"
+          hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml
new file mode 100755
index 0000000000..f1535245f1
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic/.content.xml
@@ -0,0 +1,196 @@
+<?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:deviceGroups="[mobile/groups/responsive]"
+            cq:lastModified="{Date}2025-11-07T11:33:58.406+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="Adaptive Form V2 (IT)"
+            sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="forms-components-examples/components/form/container"
+                fieldType="form">
+            <checkboxgroup1
+                    jcr:lastModified="{Date}2025-11-07T12:23:13.884+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 1"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    autocomplete="off"
+                    enabled="{Boolean}false"
+                    enum="[0,1,2,3]"
+                    enumNames="[Item 1, Item 2, Item 3, Item 4]"
+                    fieldType="checkbox-group"
+                    name="checkboxgroup1662722663424"
+                    orientation="vertical"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true]"
+                    type="string[]"
+                    visible="{Boolean}true"/>
+            <checkboxgroup2
+                    jcr:lastModified="{Date}2025-11-07T23:45:20.572+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 2"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    assistPriority="label"
+                    autocomplete="off"
+                    enabled="{Boolean}true"
+                    enum="[0,1,2,3]"
+                    enumNames="[Item 1, Item 2, Item 3, Item 4]"
+                    fieldType="checkbox-group"
+                    mandatoryMessage="This is a custom required checkboxgroup"
+                    name="checkboxgroup1662722663425"
+                    orientation="horizontal"
+                    required="true"
+                    type="string[]"
+                    visible="{Boolean}true">
+                <fd:rules
+                        fd:valueCommit="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;BINARY_EVENT_CONDITION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663425&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX|STRING[]&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663425&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HAS_SELECTED&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;0&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;AND&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663425&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX|STRING[]&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663425&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HAS_SELECTED&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;3&quot;}}]}\,&quot;nested&quot;:false}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HIDE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup31671860692147&quot;\,&quot;displayName&quot;:&quot;Check Box Group 4&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 4/&quot;\,&quot;name&quot;:&quot;checkboxgroup31671860692147&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SHOW_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup_16425955381671860957891&quot;\,&quot;displayName&quot;:&quot;Check Box Group 3&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 3/&quot;\,&quot;name&quot;:&quot;checkboxgroup_16425955381671860957891&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;if((contains($field\, '0') &amp;&amp; contains($field\, '3'))\, dispatchEvent(checkboxgroup31671860692147\, 'custom:setProperty'\, {visible : false()})\, {})&quot;\,&quot;if((contains($field\, '0') &amp;&amp; contains($field\, '3'))\, dispatchEvent(checkboxgroup_16425955381671860957891\, 'custom:setProperty'\, {visible : true()})\, {})&quot;]\,&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;},{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;BINARY_EVENT_CONDITION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663425&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663425&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HAS_SELECTED&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;1&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;AND&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663425&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663425&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HAS_SELECTED&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;2&quot;}}]}\,&quot;nested&quot;:false}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;ENABLE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663424&quot;\,&quot;displayName&quot;:&quot;Check Box Group&quot;\,&quot;type&quot;:&quot;FIELD&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group/&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663424&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;DISABLE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup31671860692147&quot;\,&quot;displayName&quot;:&quot;Check Box Group 4&quot;\,&quot;type&quot;:&quot;FIELD&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 4/&quot;\,&quot;name&quot;:&quot;checkboxgroup31671860692147&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;if((contains($field\, '1') &amp;&amp; contains($field\, '2'))\, dispatchEvent(checkboxgroup1662722663424\, 'custom:setProperty'\, {enabled : true()})\, {})&quot;\,&quot;if((contains($field\, '1') &amp;&amp; contains($field\, '2'))\, dispatchEvent(checkboxgroup31671860692147\, 'custom:setProperty'\, {enabled : false()})\, {})&quot;]\,&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        change="[if((contains($field\, '0') &amp;&amp; contains($field\, '3'))\, dispatchEvent(checkboxgroup31671860692147\, 'custom:setProperty'\, {visible : false()})\, {}),if((contains($field\, '0') &amp;&amp; contains($field\, '3'))\, dispatchEvent(checkboxgroup_16425955381671860957891\, 'custom:setProperty'\, {visible : true()})\, {}),if((contains($field\, '1') &amp;&amp; contains($field\, '2'))\, dispatchEvent(checkboxgroup1662722663424\, 'custom:setProperty'\, {enabled : true()})\, {}),if((contains($field\, '1') &amp;&amp; contains($field\, '2'))\, dispatchEvent(checkboxgroup31671860692147\, 'custom:setProperty'\, {enabled : false()})\, {})]"/>
+            </checkboxgroup2>
+            <checkboxgroup3
+                    jcr:lastModified="{Date}2025-11-07T11:19:33.329+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 3"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    enabled="{Boolean}true"
+                    enum="[0,1]"
+                    enumNames="[Item 1, Item 2]"
+                    fieldType="checkbox-group"
+                    name="checkboxgroup_16425955381671860957891"
+                    orientation="horizontal"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true]"
+                    type="number[]"
+                    visible="{Boolean}false">
+                <fd:rules
+                        fd:valueCommit="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup_16425955381671860957891&quot;\,&quot;type&quot;:&quot;NUMBER[]&quot;\,&quot;name&quot;:&quot;checkboxgroup_16425955381671860957891&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HAS_SELECTED&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:&quot;1&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;CLEAR_VALUE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;VALUE_FIELD&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663425&quot;\,&quot;displayName&quot;:&quot;Check Box Group 2&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 2/&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663425&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_VALUE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;VALUE_FIELD&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup_10272300251673590771006&quot;\,&quot;displayName&quot;:&quot;Check Box Group 5&quot;\,&quot;type&quot;:&quot;NUMBER[]&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 5/&quot;\,&quot;name&quot;:&quot;checkboxgroup_10272300251673590771006&quot;\,&quot;parent&quot;:&quot;$form&quot;}}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;mid&quot;\,&quot;displayName&quot;:&quot;Substring Of&quot;\,&quot;type&quot;:&quot;NUMBER[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING|ARRAY&quot;\,&quot;name&quot;:&quot;subject&quot;\,&quot;description&quot;:&quot;subject&quot;}\,{&quot;type&quot;:&quot;NUMBER&quot;\,&quot;name&quot;:&quot;startPos&quot;\,&quot;description&quot;:&quot;startPos&quot;}\,{&quot;type&quot;:&quot;NUMBER&quot;\,&quot;name&quot;:&quot;length&quot;\,&quot;description&quot;:&quot;length&quot;}]\,&quot;impl&quot;:&quot;$0($1\,$2\,$3)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;0&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:&quot;0&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:&quot;1&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;if(contains($field\, 1)\, dispatchEvent(checkboxgroup1662722663425\, 'custom:setProperty'\, {value : `null`})\, {})&quot;\,&quot;if(contains($field\, 1)\, dispatchEvent(checkboxgroup_10272300251673590771006\, 'custom:setProperty'\, {value : mid('0'\,0\,1)})\, {})&quot;]\,&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        change="[if(contains($field\, 1)\, dispatchEvent(checkboxgroup1662722663425\, 'custom:setProperty'\, {value : `null`})\, {}),if(contains($field\, 1)\, dispatchEvent(checkboxgroup_10272300251673590771006\, 'custom:setProperty'\, {value : mid('0'\,0\,1)})\, {})]"/>
+            </checkboxgroup3>
+            <checkboxgroup4
+                    jcr:lastModified="{Date}2025-11-07T11:19:11.733+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 4"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    autocomplete="off"
+                    description="This is long description"
+                    enabled="{Boolean}true"
+                    enum="[0,1,2,3]"
+                    enumNames="[Item 1, Item 2, Item 3, Item 4]"
+                    fieldType="checkbox-group"
+                    id="tooltip_scenario_test"
+                    mandatoryMessage="This is a custom required checkboxgroup"
+                    name="checkboxgroup31671860692147"
+                    orientation="horizontal"
+                    readOnly="{Boolean}false"
+                    required="true"
+                    textIsRich="[true,true]"
+                    tooltip="This is short description"
+                    tooltipVisible="true"
+                    type="string[]"
+                    visible="{Boolean}true">
+                <fd:rules
+                        fd:valueCommit="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup31671860692147&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;name&quot;:&quot;checkboxgroup31671860692147&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;HAS_SELECTED&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;2&quot;}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;ENABLE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663424&quot;\,&quot;displayName&quot;:&quot;Check Box Group&quot;\,&quot;type&quot;:&quot;FIELD&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group/&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663424&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;DISABLE_STATEMENT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup1662722663425&quot;\,&quot;displayName&quot;:&quot;Check Box Group 2&quot;\,&quot;type&quot;:&quot;FIELD&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 2/&quot;\,&quot;name&quot;:&quot;checkboxgroup1662722663425&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;if(contains($field\, '2')\, dispatchEvent(checkboxgroup1662722663424\, 'custom:setProperty'\, {enabled : true()})\, {})&quot;\,&quot;if(contains($field\, '2')\, dispatchEvent(checkboxgroup1662722663425\, 'custom:setProperty'\, {enabled : false()})\, {})&quot;]\,&quot;eventName&quot;:&quot;Value Commit&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        change="[if(contains($field\, '2')\, dispatchEvent(checkboxgroup1662722663424\, 'custom:setProperty'\, {enabled : true()})\, {}),if(contains($field\, '2')\, dispatchEvent(checkboxgroup1662722663425\, 'custom:setProperty'\, {enabled : false()})\, {})]"/>
+            </checkboxgroup4>
+            <checkboxgroup5
+                    jcr:lastModified="{Date}2025-11-07T11:49:37.118+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 5"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    enabled="{Boolean}true"
+                    enum="[0,1]"
+                    enumNames="[Item 1, Item 2]"
+                    fieldType="checkbox-group"
+                    name="checkboxgroup_10272300251673590771006"
+                    orientation="horizontal"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true]"
+                    type="number[]"
+                    validationExpression="$field == checkboxgroup_16425955381671860957891"
+                    visible="{Boolean}true">
+                <fd:rules
+                        fd:validate="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;VALIDATE_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;AFCOMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup_10272300251673590771006&quot;\,&quot;type&quot;:&quot;AFCOMPONENT&quot;\,&quot;name&quot;:&quot;checkboxgroup_10272300251673590771006&quot;}}\,{&quot;nodeName&quot;:&quot;Using&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;Expression&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPARISON_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup_10272300251673590771006&quot;\,&quot;displayName&quot;:&quot;Check Box Group 5&quot;\,&quot;type&quot;:&quot;NUMBER[]&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 5/&quot;\,&quot;name&quot;:&quot;checkboxgroup_10272300251673590771006&quot;\,&quot;parent&quot;:&quot;$form&quot;}}}\,{&quot;nodeName&quot;:&quot;OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EQUALS_TO&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.checkboxgroup_16425955381671860957891&quot;\,&quot;displayName&quot;:&quot;Check Box Group 3&quot;\,&quot;type&quot;:&quot;NUMBER[]&quot;\,&quot;displayPath&quot;:&quot;FORM/Check Box Group 3/&quot;\,&quot;name&quot;:&quot;checkboxgroup_16425955381671860957891&quot;\,&quot;parent&quot;:&quot;$form&quot;}}}]}\,&quot;nested&quot;:false}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:&quot;$field == checkboxgroup_16425955381671860957891&quot;\,&quot;eventName&quot;:&quot;Validate&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                <fd:events jcr:primaryType="nt:unstructured"/>
+            </checkboxgroup5>
+            <checkboxgroup
+                    jcr:lastModified="{Date}2025-11-07T11:33:58.397+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 6"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    enabled="{Boolean}true"
+                    enum="[0,1,0]"
+                    enumNames="[Item 1, Item 2,Item 3]"
+                    fieldType="checkbox-group"
+                    hideTitle="false"
+                    name="checkboxgroup1683093797337"
+                    orientation="horizontal"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true]"
+                    type="number[]"
+                    visible="{Boolean}true"/>
+            <checkboxgroup7
+                    jcr:created="{Date}2025-11-07T11:32:51.920+05:30"
+                    jcr:createdBy="admin"
+                    jcr:lastModified="{Date}2025-11-07T11:33:40.225+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="&lt;p>&lt;b>Select Animal&lt;/b>&lt;/p>"
+                    sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                    areOptionsRichText="true"
+                    enabled="{Boolean}true"
+                    enum="[0,1]"
+                    enumNames="[&lt;p>&lt;i>Dog&lt;/i>&lt;/p>,&lt;p> &lt;u>Cat&lt;/u>&lt;/p>]"
+                    fieldType="checkbox-group"
+                    hideTitle="false"
+                    isTitleRichText="true"
+                    name="checkboxgroup_19427271491696572172217"
+                    orientation="horizontal"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true,true,true,true]"
+                    type="number[]"
+                    unboundFormElement="{Boolean}false"
+                    visible="{Boolean}true"/>
+            <resetbutton
+                    jcr:created="{Date}2025-11-07T18:03:13.181+05:30"
+                    jcr:createdBy="admin"
+                    jcr:lastModified="{Date}2025-11-07T18:03:13.181+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Reset"
+                    sling:resourceType="forms-components-examples/components/form/actions/reset"
+                    buttonType="reset"
+                    dorExclusion="true"
+                    fieldType="button"
+                    name="reset1731587593205">
+                <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        click="[dispatchEvent('reset')]"/>
+            </resetbutton>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/focustest/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/focustest/.content.xml
similarity index 100%
rename from it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/focustest/.content.xml
rename to it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/focustest/.content.xml
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkbox/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkbox/.content.xml
index fa12cfbd69..20d376016d 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkbox/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkbox/.content.xml
@@ -33,7 +33,7 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="checkbox with no options"
-                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                 enabled="{Boolean}true"
                 fieldType="checkbox-group"
                 hideTitle="false"
@@ -109,7 +109,7 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="len(current options) = len(enums/enumNames)"
-                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                 enabled="{Boolean}true"
                 enum="[1,2,3]"
                 enumNames="[country1,country2,country3]"
@@ -187,7 +187,7 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="len(current options) &lt; len(enums/enumNames)"
-                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                 enabled="{Boolean}true"
                 enum="[1,2]"
                 enumNames="[country1,country2]"
@@ -265,7 +265,7 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="len(current options) > len(enums/enumNames)"
-                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                 enabled="{Boolean}true"
                 enum="[1,2,3,4]"
                 enumNames="[country1,country2,country3,country4]"
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml
new file mode 100755
index 0000000000..d37671f337
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/customfunctions/populate-checkboxv2/.content.xml
@@ -0,0 +1,360 @@
+<?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:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2025-11-06T12:07:40.140+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="populate-checkbox"
+        sling:configRef="/conf/forms/core-components-it/samples/customfunctions/populate-checkbox/"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            jcr:lastModified="{Date}2025-11-06T12:54:28.955+05:30"
+            jcr:lastModifiedBy="admin"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container"
+            clientLibRef="corecomponent.it.customfunction"
+            dorType="none"
+            fieldType="form"
+            schemaType="none"
+            textIsRich="true"
+            thankYouMessage="Thank you for submitting the form."
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="populate-checkbox">
+            <dropdown
+                jcr:created="{Date}2025-11-06T12:54:23.313+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:07:10.887+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="checkbox with no options"
+                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                enabled="{Boolean}true"
+                fieldType="checkbox-group"
+                hideTitle="false"
+                name="dropdown1700810663441"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true]"
+                type="number[]"
+                typeIndex="0"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true"/>
+            <button_1974094835
+                jcr:created="{Date}2025-11-06T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:02.492+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enumNames"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_19740948351700810750903">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_19740948351700810750903&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_19740948351700810750903&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dropdown1700810663441&quot;\,&quot;displayName&quot;:&quot;Dropdown with no options&quot;\,&quot;type&quot;:&quot;DROPDOWN&quot;\,&quot;isDuplicate&quot;:true\,&quot;displayPath&quot;:&quot;FORM/Dropdown with no options/&quot;\,&quot;name&quot;:&quot;dropdown1700810663441&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(dropdown1700810663441\, 'custom:setProperty'\, {enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(dropdown1700810663441\, 'custom:setProperty'\, {enumNames : getEnumNames1()})]"/>
+            </button_1974094835>
+            <button
+                jcr:created="{Date}2025-11-06T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:55:43.176+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enums"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button1700810715377">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1700810715377&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1700810715377&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dropdown1700810663441&quot;\,&quot;displayName&quot;:&quot;Dropdown with no options&quot;\,&quot;type&quot;:&quot;DROPDOWN&quot;\,&quot;isDuplicate&quot;:true\,&quot;displayPath&quot;:&quot;FORM/Dropdown with no options/&quot;\,&quot;name&quot;:&quot;dropdown1700810663441&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(dropdown1700810663441\, 'custom:setProperty'\, {enum : getEnum1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(dropdown1700810663441\, 'custom:setProperty'\, {enum : getEnum1()})]"/>
+            </button>
+            <button_804696822
+                jcr:created="{Date}2025-11-06T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:23.997+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add both"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_8046968221700810772130">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_8046968221700810772130&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_8046968221700810772130&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dropdown1700810663441&quot;\,&quot;displayName&quot;:&quot;Dropdown with no options&quot;\,&quot;type&quot;:&quot;DROPDOWN&quot;\,&quot;isDuplicate&quot;:true\,&quot;displayPath&quot;:&quot;FORM/Dropdown with no options/&quot;\,&quot;name&quot;:&quot;dropdown1700810663441&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dropdown1700810663441&quot;\,&quot;displayName&quot;:&quot;Dropdown with no options&quot;\,&quot;type&quot;:&quot;DROPDOWN&quot;\,&quot;isDuplicate&quot;:true\,&quot;displayPath&quot;:&quot;FORM/Dropdown with no options/&quot;\,&quot;name&quot;:&quot;dropdown1700810663441&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(dropdown1700810663441\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(dropdown1700810663441\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})]"/>
+            </button_804696822>
+            <dropdown_copy
+                jcr:created="{Date}2025-11-06T12:54:23.313+0"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:07:00.456+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="len(current options) = len(enums/enumNames)"
+                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                enabled="{Boolean}true"
+                enum="[1,2,3]"
+                enumNames="[country1,country2,country3]"
+                fieldType="checkbox-group"
+                hideTitle="false"
+                name="ddw2"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true]"
+                type="number[]"
+                typeIndex="0"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true"/>
+            <button_1974094835_co
+                jcr:created="{Date}2025-11-06T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:02.492+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enumNames"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_19740948351700810750903_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_19740948351700810750903_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_19740948351700810750903_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw2&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) = len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) = len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw2&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw2\, 'custom:setProperty'\, {enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw2\, 'custom:setProperty'\, {enumNames : getEnumNames1()})]"/>
+            </button_1974094835_co>
+            <button_copy
+                jcr:created="{Date}2025-11-06T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:55:43.176+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enums"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button1700810715377_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1700810715377_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1700810715377_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw2&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) = len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) = len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw2&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw2\, 'custom:setProperty'\, {enum : getEnum1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw2\, 'custom:setProperty'\, {enum : getEnum1()})]"/>
+            </button_copy>
+            <button_804696822_cop
+                jcr:created="{Date}2025-11-06T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:23.997+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add both"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_8046968221700810772130_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_8046968221700810772130_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_8046968221700810772130_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw2&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) = len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) = len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw2&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw2&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) = len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) = len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw2&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw2\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw2\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})]"/>
+            </button_804696822_cop>
+            <dropdown_copy_copy_c_2041651304
+                jcr:created="{Date}2025-11-06T12:54:23.313+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:07:26.444+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="len(current options) &lt; len(enums/enumNames)"
+                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                enabled="{Boolean}true"
+                enum="[1,2]"
+                enumNames="[country1,country2]"
+                fieldType="checkbox-group"
+                hideTitle="false"
+                name="ddw3"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true]"
+                type="number[]"
+                typeIndex="0"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true"/>
+            <button_1974094835_co_1428056074
+                jcr:created="{Date}2025-11-06T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:02.492+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enumNames"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_19740948351700810750903_copy_1_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_19740948351700810750903_copy_1_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_19740948351700810750903_copy_1_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw3&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) &lt; len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) &lt; len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw3&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw3\, 'custom:setProperty'\, {enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw3\, 'custom:setProperty'\, {enumNames : getEnumNames1()})]"/>
+            </button_1974094835_co_1428056074>
+            <button_copy_copy
+                jcr:created="{Date}2025-11-06T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:55:43.176+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enums"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button1700810715377_copy_1_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1700810715377_copy_1_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1700810715377_copy_1_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw3&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) &lt; len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) &lt; len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw3&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw3\, 'custom:setProperty'\, {enum : getEnum1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw3\, 'custom:setProperty'\, {enum : getEnum1()})]"/>
+            </button_copy_copy>
+            <button_804696822_cop_1328789925
+                jcr:created="{Date}2025-11-06T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:23.997+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add both"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_8046968221700810772130_copy_1_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_8046968221700810772130_copy_1_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_8046968221700810772130_copy_1_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw3&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) &lt; len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) &lt; len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw3&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw3&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) &lt; len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) &lt; len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw3&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw3\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw3\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})]"/>
+            </button_804696822_cop_1328789925>
+            <dropdown_copy_copy_c
+                jcr:created="{Date}2025-11-06T12:54:23.313+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:06:48.542+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="len(current options) > len(enums/enumNames)"
+                sling:resourceType="forms-components-examples/components/form/checkboxgroup"
+                enabled="{Boolean}true"
+                enum="[1,2,3,4]"
+                enumNames="[country1,country2,country3,country4]"
+                fieldType="checkbox-group"
+                hideTitle="false"
+                name="ddw4"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true]"
+                type="number[]"
+                typeIndex="0"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true"/>
+            <button_1974094835_co_788386745
+                jcr:created="{Date}2025-11-06T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:02.492+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enumNames"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_19740948351700810750903_copy_1_copy_1_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_19740948351700810750903_copy_1_copy_1_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_19740948351700810750903_copy_1_copy_1_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw4&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) > len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) > len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw4\, 'custom:setProperty'\, {enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw4\, 'custom:setProperty'\, {enumNames : getEnumNames1()})]"/>
+            </button_1974094835_co_788386745>
+            <button_copy_copy_cop
+                jcr:created="{Date}2025-11-06T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:55:43.176+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add enums"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button1700810715377_copy_1_copy_1_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button1700810715377_copy_1_copy_1_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button1700810715377_copy_1_copy_1_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw4&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) > len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) > len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw4\, 'custom:setProperty'\, {enum : getEnum1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw4\, 'custom:setProperty'\, {enum : getEnum1()})]"/>
+            </button_copy_copy_cop>
+            <button_804696822_cop_329945282
+                jcr:created="{Date}2025-11-06T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T12:56:23.997+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="add both"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_8046968221700810772130_copy_1_copy_1_copy_1">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_8046968221700810772130_copy_1_copy_1_copy_1&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_8046968221700810772130_copy_1_copy_1_copy_1&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw4&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) > len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) > len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnum1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw4&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) > len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) > len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;getEnumNames1&quot;\,&quot;displayName&quot;:&quot;Get_Enum_Names_1&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw4\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw4\, 'custom:setProperty'\, {enum : getEnum1()\, enumNames : getEnumNames1()})]"/>
+            </button_804696822_cop_329945282>
+            <button_1117995909
+                jcr:created="{Date}2025-11-06T11:18:43.310+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-06T11:18:49.326+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="clear"
+                sling:resourceType="forms-components-examples/components/form/button"
+                dorExclusion="true"
+                fieldType="button"
+                name="button_11179959091701064123378">
+                <fd:rules
+                    fd:click="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.button_11179959091701064123378&quot;\,&quot;type&quot;:&quot;BUTTON&quot;\,&quot;name&quot;:&quot;button_11179959091701064123378&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is clicked&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:null}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.ddw4&quot;\,&quot;displayName&quot;:&quot;len(Dropdown options) > len(enums/enumNames)&quot;\,&quot;type&quot;:&quot;DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/len(Dropdown options) > len(enums/enumNames)/&quot;\,&quot;name&quot;:&quot;ddw4&quot;\,&quot;parent&quot;:&quot;$form&quot;}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;clearEnums&quot;\,&quot;displayName&quot;:&quot;clear_enum&quot;\,&quot;type&quot;:&quot;ARRAY&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[]\,&quot;impl&quot;:&quot;$0()&quot;}\,&quot;params&quot;:[]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;dispatchEvent(ddw4\, 'custom:setProperty'\, {enum : clearEnums()})&quot;]\,&quot;eventName&quot;:&quot;Click&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    click="[dispatchEvent(ddw4\, 'custom:setProperty'\, {enum : clearEnums()})]"/>
+            </button_1117995909>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptions/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptions/.content.xml
index b664212d88..52d4324ab3 100755
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptions/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptions/.content.xml
@@ -11,7 +11,7 @@
         jcr:primaryType="cq:PageContent"
         jcr:title="dynamicOptions"
         sling:configRef="/conf/forms/core-components-it/samples/dynamicenumenumnames/dynamicoptions"
-        sling:resourceType="core/fd/components/page/v2/page">
+        sling:resourceType="forms-core-components-it/components/page-dynamicoptionsv1">
         <container1
             jcr:primaryType="nt:unstructured"
             sling:resourceType="core/wcm/components/container/v1/container"
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml
new file mode 100644
index 0000000000..09f23535ea
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2/.content.xml
@@ -0,0 +1,223 @@
+<?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:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+        cq:lastModifiedBy="admin"
+        cq:template="/conf/a/settings/wcm/templates/aa"
+        fd:ignoreTranslationInvalidation="{Boolean}true"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="dynamicOptionsv2"
+        sling:configRef="/conf/forms/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2"
+        sling:resourceType="core/fd/components/page/v2/page">
+        <container1
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/wcm/components/container/v1/container"
+            layout="responsiveGrid"/>
+        <guideContainer
+            fd:version="2.1"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/fd/components/form/container/v2/container"
+            dorType="none"
+            fieldType="form"
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="dynamicOptionsv2">
+            <checkboxgroup
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="changeOptions one"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/checkboxgroup"
+                enabled="{Boolean}true"
+                enum="[0,1]"
+                enumNames="[Item 1, Item 2]"
+                fieldType="checkbox-group"
+                hideTitle="false"
+                name="changeOptions"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true,true,true,true]"
+                type="string[]"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.changeOptions&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX&quot;\,&quot;name&quot;:&quot;changeOptions&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.changeOptions&quot;\,&quot;displayName&quot;:&quot;changeOptions&quot;\,&quot;type&quot;:&quot;CHECK BOX&quot;\,&quot;displayPath&quot;:&quot;FORM/changeOptions/&quot;\,&quot;name&quot;:&quot;changeOptions&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.changeOptions&quot;\,&quot;displayName&quot;:&quot;changeOptions&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX&quot;\,&quot;displayPath&quot;:&quot;FORM/changeOptions/&quot;\,&quot;name&quot;:&quot;changeOptions&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}]"/>
+            </checkboxgroup>
+            <checkboxgroup_813721690
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="addOptions one"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/checkboxgroup"
+                enabled="{Boolean}true"
+                fieldType="checkbox-group"
+                hideTitle="false"
+                name="addOptions"
+                orientation="horizontal"
+                readOnly="{Boolean}true"
+                textIsRich="[true,true,true]"
+                type="string[]"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.addOptions&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX|STRING[]&quot;\,&quot;name&quot;:&quot;addOptions&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.addOptions&quot;\,&quot;displayName&quot;:&quot;addOptions&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX&quot;\,&quot;displayPath&quot;:&quot;FORM/addOptions/&quot;\,&quot;name&quot;:&quot;addOptions&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.addOptions&quot;\,&quot;displayName&quot;:&quot;addOptions&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|CHECK BOX&quot;\,&quot;displayPath&quot;:&quot;FORM/addOptions/&quot;\,&quot;name&quot;:&quot;addOptions&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}]"/>
+            </checkboxgroup_813721690>
+            <dropdown
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="dynamicDropDown one"
+                sling:resourceType="core/fd/components/form/dropdown/v1/dropdown"
+                enabled="{Boolean}true"
+                fieldType="drop-down"
+                hideTitle="false"
+                multiSelect="{Boolean}true"
+                name="dynamicDropDown"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true,true]"
+                typeIndex="0"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dynamicDropDown&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN|STRING&quot;\,&quot;name&quot;:&quot;dynamicDropDown&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dynamicDropDown&quot;\,&quot;displayName&quot;:&quot;dynamicDropDown&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/dynamicDropDown/&quot;\,&quot;name&quot;:&quot;dynamicDropDown&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dynamicDropDown&quot;\,&quot;displayName&quot;:&quot;dynamicDropDown&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/dynamicDropDown/&quot;\,&quot;name&quot;:&quot;dynamicDropDown&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}]"/>
+            </dropdown>
+            <radiobutton
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="dynamicRadio one"
+                sling:resourceType="core/fd/components/form/radiobutton/v2/radiobutton"
+                enabled="{Boolean}true"
+                enum="[0,1]"
+                enumNames="[Item 1,Item 2]"
+                fieldType="radio-group"
+                hideTitle="false"
+                name="dynamicRadio"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true,true,true,true]"
+                type="string"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dynamicRadio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON|STRING&quot;\,&quot;name&quot;:&quot;dynamicRadio&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dynamicRadio&quot;\,&quot;displayName&quot;:&quot;dynamicRadio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON&quot;\,&quot;displayPath&quot;:&quot;FORM/dynamicRadio/&quot;\,&quot;name&quot;:&quot;dynamicRadio&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.dynamicRadio&quot;\,&quot;displayName&quot;:&quot;dynamicRadio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON&quot;\,&quot;displayPath&quot;:&quot;FORM/dynamicRadio/&quot;\,&quot;name&quot;:&quot;dynamicRadio&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}]"/>
+            </radiobutton>
+            <radiobutton_842887331
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="newradio one"
+                sling:resourceType="core/fd/components/form/radiobutton/v2/radiobutton"
+                enabled="{Boolean}false"
+                fieldType="radio-group"
+                hideTitle="false"
+                name="newradio"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true,true]"
+                type="number"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.newradio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON|NUMBER&quot;\,&quot;name&quot;:&quot;newradio&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.newradio&quot;\,&quot;displayName&quot;:&quot;newradio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON&quot;\,&quot;displayPath&quot;:&quot;FORM/newradio/&quot;\,&quot;name&quot;:&quot;newradio&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.newradio&quot;\,&quot;displayName&quot;:&quot;newradio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON&quot;\,&quot;displayPath&quot;:&quot;FORM/newradio/&quot;\,&quot;name&quot;:&quot;newradio&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}]"/>
+            </radiobutton_842887331>
+            <dropdown_1051629916
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="newdropdown one"
+                sling:resourceType="core/fd/components/form/dropdown/v1/dropdown"
+                enabled="{Boolean}false"
+                enum="[1,2]"
+                enumNames="[1,2]"
+                fieldType="drop-down"
+                hideTitle="false"
+                name="newdropdown"
+                readOnly="{Boolean}true"
+                textIsRich="[true,true,true]"
+                typeIndex="0"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.newdropdown&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN|STRING&quot;\,&quot;name&quot;:&quot;newdropdown&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.newdropdown&quot;\,&quot;displayName&quot;:&quot;newdropdown&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/newdropdown/&quot;\,&quot;name&quot;:&quot;newdropdown&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.newdropdown&quot;\,&quot;displayName&quot;:&quot;newdropdown&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|DROPDOWN&quot;\,&quot;displayPath&quot;:&quot;FORM/newdropdown/&quot;\,&quot;name&quot;:&quot;newdropdown&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b\,c\,d&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b\,c\,d'\,'\,')\, enumNames : split('a\,b\,c\,d'\,'\,')}]"/>
+            </dropdown_1051629916>
+            <radiobutton_1601157190
+                jcr:created="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-01-09T12:00:00.000+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="extraRadio One"
+                sling:resourceType="core/fd/components/form/radiobutton/v2/radiobutton"
+                enabled="{Boolean}true"
+                enum="[0,1,2]"
+                enumNames="[Item 1,Item 2,Item 3]"
+                fieldType="radio-group"
+                hideTitle="false"
+                name="extraRadio"
+                orientation="horizontal"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true,true,true,true,true]"
+                type="string"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true">
+                <fd:rules
+                    fd:init="[{&quot;nodeName&quot;:&quot;ROOT&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_SCRIPTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;EVENT_CONDITION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.extraRadio&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON|STRING&quot;\,&quot;name&quot;:&quot;extraRadio&quot;}}\,{&quot;nodeName&quot;:&quot;EVENT_AND_COMPARISON_OPERATOR&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;is initialized&quot;\,&quot;value&quot;:null}}\,{&quot;nodeName&quot;:&quot;PRIMITIVE_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;NUMERIC_LITERAL&quot;\,&quot;value&quot;:null}}]}\,&quot;nested&quot;:false}\,{&quot;nodeName&quot;:&quot;Then&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENTS&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enum&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.extraRadio&quot;\,&quot;displayName&quot;:&quot;extraRadio One&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON&quot;\,&quot;displayPath&quot;:&quot;FORM/extraRadio One/&quot;\,&quot;name&quot;:&quot;extraRadio&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;a\,b&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}\,{&quot;nodeName&quot;:&quot;BLOCK_STATEMENT&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;SET_PROPERTY&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;MEMBER_EXPRESSION&quot;\,&quot;items&quot;:[{&quot;nodeName&quot;:&quot;PROPERTY_LIST&quot;\,&quot;value&quot;:&quot;enumNames&quot;}\,{&quot;nodeName&quot;:&quot;of&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;COMPONENT&quot;\,&quot;value&quot;:{&quot;id&quot;:&quot;$form.extraRadio&quot;\,&quot;displayName&quot;:&quot;extraRadio One&quot;\,&quot;type&quot;:&quot;AFCOMPONENT|FIELD|RADIO BUTTON&quot;\,&quot;displayPath&quot;:&quot;FORM/extraRadio One/&quot;\,&quot;name&quot;:&quot;extraRadio&quot;\,&quot;parent&quot;:&quot;$form&quot;\,&quot;metadata&quot;:{&quot;isAncestorRepeatable&quot;:false}}}]}\,{&quot;nodeName&quot;:&quot;to&quot;\,&quot;value&quot;:null}\,{&quot;nodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;FUNCTION_CALL&quot;\,&quot;parentNodeName&quot;:&quot;EXTENDED_EXPRESSION&quot;\,&quot;functionName&quot;:{&quot;id&quot;:&quot;split&quot;\,&quot;displayName&quot;:&quot;Split a string into array&quot;\,&quot;type&quot;:&quot;STRING[]&quot;\,&quot;isDuplicate&quot;:false\,&quot;displayPath&quot;:&quot;&quot;\,&quot;args&quot;:[{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;string&quot;\,&quot;description&quot;:&quot;string to split&quot;\,&quot;isMandatory&quot;:true}\,{&quot;type&quot;:&quot;STRING&quot;\,&quot;name&quot;:&quot;separator&quot;\,&quot;description&quot;:&quot;separator where the split should occur&quot;\,&quot;isMandatory&quot;:true}]\,&quot;impl&quot;:&quot;$0($1\,$2)&quot;}\,&quot;params&quot;:[{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;Alpha\,Beta&quot;}}\,{&quot;nodeName&quot;:&quot;EXPRESSION&quot;\,&quot;choice&quot;:{&quot;nodeName&quot;:&quot;STRING_LITERAL&quot;\,&quot;value&quot;:&quot;\,&quot;}}]}}]}}]}]}}]\,&quot;isValid&quot;:true\,&quot;enabled&quot;:true\,&quot;version&quot;:1\,&quot;script&quot;:[&quot;{enum : split('a\,b'\,'\,')\, enumNames : split('Alpha\,Beta'\,'\,')}&quot;]\,&quot;eventName&quot;:&quot;Initialize&quot;\,&quot;ruleType&quot;:&quot;&quot;\,&quot;description&quot;:&quot;&quot;\,&quot;communicationComposerRuleType&quot;:&quot;server&quot;\,&quot;communicationComposerRuleLanguageType&quot;:&quot;javascript&quot;}]"
+                    jcr:primaryType="nt:unstructured"
+                    validationStatus="valid"/>
+                <fd:events
+                    jcr:primaryType="nt:unstructured"
+                    initialize="[{enum : split('a\,b'\,'\,')\, enumNames : split('Alpha\,Beta'\,'\,')}]"/>
+            </radiobutton_1601157190>
+        </guideContainer>
+        <container2
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="core/wcm/components/container/v1/container"
+            layout="responsiveGrid"/>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml
index 2811d2b483..34e36d5911 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[core.forms.components.runtime.all.xfa]"
-    embed="[core.forms.components.runtime.base.xfa,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v3.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime, core.forms.components.hcaptcha.v1.runtime,core.forms.components.review.v1.runtime, core.forms.components.turnstile.v1.runtime]"/>
+    embed="[core.forms.components.runtime.base.xfa,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v2.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v3.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime, core.forms.components.hcaptcha.v1.runtime,core.forms.components.review.v1.runtime, core.forms.components.turnstile.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
index d69f17261b..19acdf17de 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[core.forms.components.runtime.all]"
-    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v4.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime, core.forms.components.hcaptcha.v1.runtime,core.forms.components.review.v1.runtime, core.forms.components.turnstile.v1.runtime,core.forms.components.scribble.v1.runtime,core.forms.components.datetime.v1.runtime]"/>
+    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v2.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v4.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime, core.forms.components.hcaptcha.v1.runtime,core.forms.components.review.v1.runtime, core.forms.components.turnstile.v1.runtime,core.forms.components.scribble.v1.runtime,core.forms.components.datetime.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/.content.xml
new file mode 100644
index 0000000000..5e25fbe65e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/.content.xml
@@ -0,0 +1,4 @@
+<?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"
+    jcr:primaryType="nt:unstructured">
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/.content.xml
new file mode 100644
index 0000000000..a52f6f2f99
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/.content.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="select"
+    jcr:description="Allows visitors to input checkbox"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Check Box Group (v2)"
+    sling:resourceSuperType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/checkboxgroup.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/checkboxgroup.html
new file mode 100644
index 0000000000..d4c690a2fc
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/checkboxgroup.html
@@ -0,0 +1,52 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2025 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+  <sly data-sly-use.renderer="${'checkboxgroup.js'}"
+     data-sly-use.widget="widget.html"
+     data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}"
+     data-sly-use.label="${renderer.labelPath}"
+     data-sly-use.legend="${renderer.legendPath}"
+     data-sly-use.shortDescription="${renderer.shortDescriptionPath}"
+     data-sly-use.longDescription="${renderer.longDescriptionPath}"
+     data-sly-use.errorMessage="${renderer.errorMessagePath}"
+     data-sly-use.questionMark="${renderer.questionMarkPath}"></sly>
+     
+
+<fieldset class="cmp-adaptiveform-checkboxgroup cmp-adaptiveform-checkboxgroup--v2"
+     data-cmp-is="adaptiveFormCheckBoxGroup"
+     id="${checkboxgroup.id}"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     data-sly-use.checkboxgroup="com.adobe.cq.forms.core.components.models.form.CheckBoxGroup"
+     data-cmp-visible="${checkboxgroup.visible ? 'true' : 'false'}"
+     data-cmp-enabled="${checkboxgroup.enabled ? 'true' : 'false'}"
+     data-cmp-required="${checkboxgroup.required ? 'true': 'false'}"
+     data-cmp-readonly="${checkboxgroup.readOnly ? 'true' : 'false'}"
+     data-cmp-data-layer="${checkboxgroup.data.json}"
+     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
+     data-sly-test.widgetId="${'{0}-{1}' @ format=[checkboxgroup.id, 'widget']}">
+
+     <legend class="cmp-adaptiveform-checkboxgroup__label-container">
+          <span data-sly-call="${legend.legend @ componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, labelRichText=checkboxgroup.label.richText, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></span>
+          <span data-sly-call="${questionMark.questionMark @ componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></span>
+     </legend>
+
+     <sly data-sly-call="${widget.widget @ checkboxgroup = checkboxgroup}"></sly>
+
+    <div data-sly-call="${shortDescription.shortDescription @componentId=checkboxgroup.id, shortDescriptionVisible=checkboxgroup.tooltipVisible, shortDescription=checkboxgroup.tooltip, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+
+    <div data-sly-call="${longDescription.longDescription @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+
+    <div data-sly-call="${errorMessage.errorMessage @componentId=checkboxgroup.id, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+</fieldset>
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/checkboxgroup.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/checkboxgroup.js
new file mode 100644
index 0000000000..659d1e2d96
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/checkboxgroup.js
@@ -0,0 +1,35 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2025 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+ use(function () {
+
+    var clientlibsArr = ['core.forms.components.base.v1.editor'];
+    var labelPath = 'core/fd/components/af-commons/v1/fieldTemplates/label.html';
+    var shortDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/shortDescription.html";
+    var longDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/longDescription.html";
+    var questionMarkPath = "core/fd/components/af-commons/v1/fieldTemplates/questionMark.html"
+    var errorMessagePath = "core/fd/components/af-commons/v1/fieldTemplates/errorMessage.html";
+    var legendPath = "core/fd/components/af-commons/v1/fieldTemplates/legend.html"
+    return {
+      labelPath: labelPath,
+      shortDescriptionPath: shortDescriptionPath,
+      longDescriptionPath: longDescriptionPath,
+      questionMarkPath: questionMarkPath,
+      errorMessagePath: errorMessagePath,
+      legendPath: legendPath,
+      clientlibs: clientlibsArr
+    }
+  });
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..3509e665e5
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="[core.forms.components.checkboxgroup.v2.runtime]"
+    dependencies="[core.forms.components.runtime.base]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/js.txt
new file mode 100644
index 0000000000..31f64068cd
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/js.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#base=js
+checkboxgroupview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/js/checkboxgroupview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/js/checkboxgroupview.js
new file mode 100644
index 0000000000..b30244639a
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/clientlibs/site/js/checkboxgroupview.js
@@ -0,0 +1,232 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+(function() {
+
+
+    "use strict";
+    class CheckBoxGroup extends FormView.FormOptionFieldBase {
+
+        static NS = FormView.Constants.NS;
+        /**
+         * Each FormField has a data attribute class that is prefixed along with the global namespace to
+         * distinguish between them. If a component wants to put a data-attribute X, the attribute in HTML would be
+         * data-{NS}-{IS}-x=""
+         * @type {string}
+         */
+        static IS = "adaptiveFormCheckBoxGroup";
+        static bemBlock = 'cmp-adaptiveform-checkboxgroup'
+        static checkboxBemBlock = 'cmp-adaptiveform-checkbox'
+        static selectors  = {
+            self: "[data-" + this.NS + '-is="' + this.IS + '"]',
+            widgets: `.${CheckBoxGroup.bemBlock}__widget`,
+            widget: `.${CheckBoxGroup.bemBlock}__option__widget`,
+            widgetLabel: `.${CheckBoxGroup.bemBlock}__label`,
+            label: `.${CheckBoxGroup.bemBlock}__label`,
+            description: `.${CheckBoxGroup.bemBlock}__longdescription`,
+            qm: `.${CheckBoxGroup.bemBlock}__questionmark`,
+            errorDiv: `.${CheckBoxGroup.bemBlock}__errormessage`,
+            tooltipDiv: `.${CheckBoxGroup.bemBlock}__shortdescription`,
+            item:  `.${CheckBoxGroup.bemBlock}-item`,
+            optionLabel: `${CheckBoxGroup.bemBlock}__option-label`,
+            optionLink: `${CheckBoxGroup.bemBlock}__links`
+        };
+
+        constructor(params) {
+            super(params);
+            this.qm = this.element.querySelector(CheckBoxGroup.selectors.qm)
+            this.widgetLabel = this.element.querySelector(CheckBoxGroup.selectors.widgetLabel)
+        }
+
+        getWidgets() {
+            return this.element.querySelector(CheckBoxGroup.selectors.widgets);
+        }
+
+        getWidget() {
+          return this.element.querySelectorAll(CheckBoxGroup.selectors.widget);
+        }
+
+        getDescription() {
+            return this.element.querySelector(CheckBoxGroup.selectors.description);
+        }
+
+        getLabel() {
+            return this.element.querySelector(CheckBoxGroup.selectors.label);
+        }
+
+        getErrorDiv() {
+            return this.element.querySelector(CheckBoxGroup.selectors.errorDiv);
+        }
+
+        getQuestionMarkDiv() {
+            return this.element.querySelector(CheckBoxGroup.selectors.qm);
+        }
+
+        getTooltipDiv() {
+            return this.element.querySelector(CheckBoxGroup.selectors.tooltipDiv);
+        }
+
+        getOptions() {
+            return this.element.querySelectorAll(CheckBoxGroup.selectors.item);
+        }
+
+        #addWidgetListeners(optionWidget) {
+            optionWidget.addEventListener('change', (e) => {
+                this.#updateModelValue(optionWidget);
+            });
+            optionWidget.addEventListener('focus', (e) => {
+                this.setActive();
+            });
+            optionWidget.addEventListener('blur', (e) => {
+                this.setInactive();
+            });
+        }
+
+        setModel(model) {
+            super.setModel(model);
+            this.widget.forEach(optionWidget => {
+                this.#addWidgetListeners(optionWidget);
+            });
+            let optionLinks = this.element.querySelectorAll(`.${CheckBoxGroup.selectors.optionLink}`);
+            const actionKeys = ['Enter', ' ', 'Spacebar', 'Space'];
+            optionLinks.forEach(optionLink => {
+                optionLink.addEventListener('keydown', (e)=>{
+                    if(actionKeys.includes(e.key)) {
+                        optionLink.click();
+                    }
+                });
+            });
+            this.#updateModelValue();
+        }
+
+        #updateModelValue() {
+            let value = [];
+            this.widget.forEach(widget => {
+                if (widget.checked) {
+                    value.push(widget.value)
+                }
+            }, this);
+            if (value.length !== 0 || this._model.value != null) {
+                this.setModelValue(value)
+            }
+        }
+
+        updateValidity(validity) {
+            if(validity.valid === undefined) {
+                this.element.removeAttribute(FormView.Constants.DATA_ATTRIBUTE_VALID);
+                this.widget.forEach(widget => widget.removeAttribute(FormView.Constants.ARIA_INVALID));
+            } else {
+                this.element.setAttribute(FormView.Constants.DATA_ATTRIBUTE_VALID, validity.valid);
+                this.widget.forEach(widget => widget.setAttribute(FormView.Constants.ARIA_INVALID, !validity.valid));
+            }
+        }
+
+        updateValue(modelValue) {
+            modelValue = [].concat(modelValue);
+            let selectedWidgetValues = modelValue.map(String);
+            this.widget.forEach(widget => {
+                if (selectedWidgetValues.includes((widget.value))) {
+                    widget.checked = true
+                    widget.setAttribute(FormView.Constants.HTML_ATTRS.CHECKED, FormView.Constants.HTML_ATTRS.CHECKED);
+                } else {
+                    widget.checked = false
+                    widget.removeAttribute(FormView.Constants.HTML_ATTRS.CHECKED);
+                }
+            }, this)
+            super.updateEmptyStatus();
+        }
+
+        #createCheckBoxItem(value, itemLabel) {
+            // This doesn't cater for optionLink __links as toggelablelink component is hidden
+            let richScreenReaderText = `${this._model.label.value}:  ${itemLabel}`;
+            let plainScreenReaderText = window.DOMPurify ? window.DOMPurify.sanitize(richScreenReaderText, { ALLOWED_TAGS: [] }) : richScreenReaderText;
+            const optionTemplate = `
+            <div class="${CheckBoxGroup.selectors.item.slice(1)}">
+                <label class="${CheckBoxGroup.selectors.optionLabel}">
+                    <input type="checkbox" class="${CheckBoxGroup.selectors.widget.slice(1)}" name="${this._model.name}" value="${value}" tabindex="0">
+                    <span>${itemLabel}</span>
+                </label>
+            </div>`;
+
+            const container = document.createElement('div'); // Create a container element to hold the template
+            container.innerHTML = optionTemplate;
+            let addedOptionWidget = container.querySelector(CheckBoxGroup.selectors.widget);
+            if(this._model.readOnly === true || this._model.enabled === false) {
+                addedOptionWidget.setAttribute("disabled", true);
+                if(this._model.readOnly === true) {
+                    addedOptionWidget.setAttribute("aria-readonly", true);
+                }
+            }
+            this.#addWidgetListeners(addedOptionWidget);
+            return container.firstElementChild; // Return the first child, which is the created option
+        }
+        updateEnum(newEnums) {
+            super.updateEnumForRadioButtonAndCheckbox(newEnums, this.#createCheckBoxItem);
+            // refresh the widget references, to dynamically added options
+            this.widget = this.getWidget();
+        }
+
+        updateEnumNames(newEnumNames) {
+            super.updateEnumNamesForRadioButtonAndCheckbox(newEnumNames, this.#createCheckBoxItem);
+            // refresh the widget references, to dynamically added options
+            this.widget = this.getWidget();
+        }
+
+        updateEnabled(enabled, state) {
+            this.element.setAttribute(FormView.Constants.DATA_ATTRIBUTE_ENABLED, enabled);
+            let widgets = this.widget;
+            widgets.forEach(widget => {
+                if (enabled === false) {
+                    if(state.readOnly === false){
+                        widget.setAttribute(FormView.Constants.HTML_ATTRS.DISABLED, "disabled");
+                    }
+                } else if (state.readOnly === false) {
+                    widget.removeAttribute(FormView.Constants.HTML_ATTRS.DISABLED);
+                }
+            });
+        }
+
+        updateReadOnly(readonly) {
+            let widgets = this.widget;
+            this.element.setAttribute(FormView.Constants.DATA_ATTRIBUTE_READONLY, readonly);
+            widgets.forEach(widget => {
+                if (readonly === true) {
+                    widget.setAttribute(FormView.Constants.HTML_ATTRS.DISABLED, "disabled");
+                    widget.setAttribute("aria-readonly", true);
+                } else {
+                    widget.removeAttribute(FormView.Constants.HTML_ATTRS.DISABLED);
+                    widget.removeAttribute("aria-readonly");
+                }
+            });
+        }
+        updateRequired(required, state) {
+            if (this.widget) {
+                this.element.toggleAttribute("required", required);
+                this.element.setAttribute("data-cmp-required", required);
+            }
+        }
+
+        syncMarkupWithModel() {
+            super.syncMarkupWithModel();
+            this.updateEnum(this._model.enum);
+            this.updateEnumNames(this._model.enumNames);
+        }
+    }
+
+    FormView.Utils.setupField(({element, formContainer}) => {
+        return new CheckBoxGroup({element, formContainer})
+    }, CheckBoxGroup.selectors.self);
+
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/widget.html
new file mode 100644
index 0000000000..b4346e27c2
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/checkboxgroup/widget.html
@@ -0,0 +1,35 @@
+
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2023 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+  <template data-sly-template.widget="${ @ checkboxgroup }">
+    <div class="cmp-adaptiveform-checkboxgroup__widget ${checkboxgroup.orientation}" id="${widgetId}">
+      <div data-sly-list="${checkboxgroup.enums}" data-sly-unwrap>
+        <div class="cmp-adaptiveform-checkboxgroup-item ${checkboxgroup.name}">
+          <label class="cmp-adaptiveform-checkboxgroup__option-label"
+                 title="${checkboxgroup.tooltipVisible ? '' : checkboxgroup.tooltipText}">
+            <input class="cmp-adaptiveform-checkboxgroup__option__widget" type="checkbox"
+                   name="${checkboxgroup.name}"
+                   value="${checkboxgroup.enums[itemList.index].toString}"
+                   checked="${checkboxgroup.enums[itemList.index] in checkboxgroup.default }"
+                   disabled="${!checkboxgroup.enabled || checkboxgroup.readOnly}"
+                   aria-readonly="${checkboxgroup.readOnly ? 'true' : ''}" tabindex="0"/>
+            <span>${checkboxgroup.enumNames[itemList.index] @ context = 'html'}</span>
+          </label>
+        </div>
+      </div>
+    </div>
+  </template>
+  
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v2/radiobutton/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v2/radiobutton/widget.html
index efd6bd1ba3..0789d8630d 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v2/radiobutton/widget.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v2/radiobutton/widget.html
@@ -24,7 +24,7 @@
                  value="${item.toString}"
                  checked="${radiobutton.enums[itemList.index] == radiobutton.default[0]}"
                  disabled="${!radiobutton.enabled || radiobutton.readOnly}"
-                 aria-readonly="${radiobutton.readOnly ? 'true' : ''}"/>
+                 aria-readonly="${radiobutton.readOnly ? 'true' : ''}" tabindex="0"/>
           <span>${radiobutton.enumNames[itemList.index] @ context = 'html'}</span>
         </label>
       </div>
diff --git a/ui.frontend/src/view/FormOptionFieldBase.js b/ui.frontend/src/view/FormOptionFieldBase.js
index dea46b3361..6edad7efff 100644
--- a/ui.frontend/src/view/FormOptionFieldBase.js
+++ b/ui.frontend/src/view/FormOptionFieldBase.js
@@ -126,7 +126,9 @@ class FormOptionFieldBase extends FormFieldBase {
                 span.innerHTML = purifiedValue;
                 let richScreenReaderText = `${this._model.label.value}:  ${purifiedValue}`;
                 let plainScreenReaderText = window.DOMPurify ? window.DOMPurify.sanitize(richScreenReaderText, { ALLOWED_TAGS: [] }) : richScreenReaderText;
-                input.setAttribute("aria-label", plainScreenReaderText);
+                if (input.hasAttribute("aria-label")) {
+                    input.setAttribute("aria-label", plainScreenReaderText);
+                }
             });
         } else {
             [...this.getOptions()].forEach((option, index) => {
@@ -136,7 +138,7 @@ class FormOptionFieldBase extends FormFieldBase {
                 if(span) {
                     span.innerHTML = purifiedValue;
                 }
-                if(input) {
+                if (input && input.hasAttribute("aria-label")) {
                     let richScreenReaderText = `${this._model.label.value}:  ${purifiedValue}`;
                     let plainScreenReaderText = window.DOMPurify ? window.DOMPurify.sanitize(richScreenReaderText, { ALLOWED_TAGS: [] }) : richScreenReaderText;
                     input.setAttribute("aria-label", plainScreenReaderText);
diff --git a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.cy.js b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.cy.js
index f095eca80c..31e7d1bf0c 100644
--- a/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.cy.js
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroup.runtime.cy.js
@@ -15,7 +15,7 @@
  ******************************************************************************/
 describe("Form Runtime with CheckBoxGroup Input", () => {
 
-    const pagePath = "content/forms/af/core-components-it/samples/checkboxgroup/basic.html"
+    const pagePath = "content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/basic.html"
     const bemBlock = 'cmp-adaptiveform-checkboxgroup'
     const IS = "adaptiveFormCheckBoxGroup"
     const selectors = {
@@ -253,7 +253,7 @@ describe("Form Runtime with CheckBoxGroup Input", () => {
 
 describe("setFocus on checkboxgroup via rules", () => {
 
-    const pagePath = "content/forms/af/core-components-it/samples/checkboxgroup/focustest.html"
+    const pagePath = "content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest.html"
     let formContainer = null
 
     beforeEach(() => {
diff --git a/ui.tests/test-module/specs/checkboxgroup/checkboxgroupv2.runtime.cy.js b/ui.tests/test-module/specs/checkboxgroup/checkboxgroupv2.runtime.cy.js
new file mode 100644
index 0000000000..fcfb73ed0e
--- /dev/null
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroupv2.runtime.cy.js
@@ -0,0 +1,281 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+describe("Form Runtime with CheckBoxGroup Input", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/basic.html"
+    const bemBlock = 'cmp-adaptiveform-checkboxgroup'
+    const IS = "adaptiveFormCheckBoxGroup"
+    const selectors = {
+        checkboxgroup : `[data-cmp-is="${IS}"]`
+    }
+
+    let formContainer = null
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        })
+    });
+
+    const checkHTML = (id, state) => {
+        const visible = state.visible;
+        const passVisibleCheck = `${visible === true ? "" : "not."}be.visible`;
+        const passDisabledAttributeCheck = `${state.enabled === false || state.readOnly === true ? "" : "not."}have.attr`;
+        const value = state.value
+        cy.get(`#${id}`)
+            .should(passVisibleCheck)
+            .invoke('attr', 'data-cmp-visible')
+            .should('eq', visible.toString());
+        cy.get(`#${id}`)
+            .invoke('attr', 'data-cmp-enabled')
+            .should('eq', state.enabled.toString());
+        return cy.get(`#${id}`).within((root) => {
+            cy.get('*').should(passVisibleCheck)
+            cy.get('input')
+                .should('have.length', 4)
+            cy.get('input')
+                .should(passDisabledAttributeCheck, 'disabled');
+            cy.get('input').eq(1).should('be.checked')
+        })
+    }
+
+    it(" should get model and view initialized properly ", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        expect(formContainer._model.items.length, "model and view elements match").to.equal(Object.keys(formContainer._fields).length);
+        Object.entries(formContainer._fields).forEach(([id, field]) => {
+            expect(field.getId()).to.equal(id)
+            expect(formContainer._model.getElement(id), `model and view are in sync`).to.equal(field.getModel())
+        });
+    })
+
+    it(" model's changes are reflected in the html ", () => {
+        const [id, fieldView] = Object.entries(formContainer._fields)[0]
+        const model = formContainer._model.getElement(id)
+        const val = Array('1','2')
+        model.value = '1'
+        cy.get(`#${id}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('have.class', 'VERTICAL')
+        const [id2, fieldView2] = Object.entries(formContainer._fields)[1]
+        cy.get(`#${id2}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('have.class', 'HORIZONTAL')
+
+
+        checkHTML(model.id, model.getState()).then(() => {
+            model.visible = false
+            return checkHTML(model.id, model.getState())
+        }).then(() => {
+            model.enable = false
+            return checkHTML(model.id, model.getState())
+        })
+    });
+
+    it(" html changes are reflected in model ", () => {
+        const [id, fieldView] = Object.entries(formContainer._fields)[1]
+        const model = formContainer._model.getElement(id)
+
+        cy.log(model.getState().value)
+        cy.get(`#${id}`).find("input").eq(1).click().then(x => {
+            cy.log(model.getState().value)
+            expect(model.getState().value).to.contain('1');
+        })
+
+        cy.get(`#${id}`).find("input").eq(2).click().then(x => {
+            cy.log(model.getState().value)
+            expect(model.getState().value).to.contain('2');
+        })
+    });
+
+    it(" should show error messages in the HTML ", () => {
+        const [id, fieldView] = Object.entries(formContainer._fields)[1]
+        const model = formContainer._model.getElement(id)
+
+        cy.get(`#${id}`).find("input").eq(1).click().then(x => {
+            cy.log(model.getState().value)
+            expect(model.getState().value).to.contain('1');
+        })
+
+        cy.get(`#${id}`).find("input").eq(1).click().then(x => {
+            cy.get(`#${id}`).find(".cmp-adaptiveform-checkboxgroup__errormessage").should('have.text',"This is a custom required checkboxgroup")
+        })
+
+        cy.get(`#${id}`).find("input").eq(1).click().then(x => {
+            cy.get(`#${id}`).find(".cmp-adaptiveform-checkboxgroup__errormessage").should('have.text',"")
+        })
+    });
+
+    it("should toggle description and tooltip", () => {
+        cy.toggleDescriptionTooltip(bemBlock, 'tooltip_scenario_test');
+    })
+
+    it("should show and hide components on certain checkbox input", () => {
+        // Rule on checkbox2: When checkbox2 has Item 1 AND Item 3 selected => Show checkbox3 and Hide checkBox4
+
+        const [checkBox2, checkBox2FieldView] = Object.entries(formContainer._fields)[1];
+        const [checkBox3, checkBox3FieldView] = Object.entries(formContainer._fields)[2];
+        const [checkBox4, checkBox4FieldView] = Object.entries(formContainer._fields)[3];
+
+        cy.get(`#${checkBox2}`).find("input").check(["0","3"]).then(x => {
+            cy.get(`#${checkBox3}`).should('be.visible')
+            cy.get(`#${checkBox4}`).should('not.be.visible')
+        })
+    })
+
+    it("Checkbox group should not have aria-disabled attribute if enable is false", () => {
+        const [id, fieldView] = Object.entries(formContainer._fields)[0];
+        cy.get(`#${id}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('not.have.attr', 'aria-disabled');
+    })
+
+    it("should enable and disable components on certain checkbox input", () => {
+        // Rule on checkbox4: When checkbox4 has Item 3 selected => Enable checkbox1 and Disable checkBox2
+
+        const [checkBox1, checkBox1FieldView] = Object.entries(formContainer._fields)[0];
+        const [checkBox2, checkBox2FieldView] = Object.entries(formContainer._fields)[1];
+        const [checkBox4, checkBox4FieldView] = Object.entries(formContainer._fields)[3];
+
+        cy.get(`#${checkBox4}`).find("input").check(["2"]).then(x => {
+            cy.get(`#${checkBox1}`).find("input").should('be.enabled')
+            cy.get(`#${checkBox2}`).find("input").should('not.be.enabled')
+        })
+    })
+
+    it("should show validation error messages based on expression rules", () => {
+        // Rule on checkBox5: Validate checkBox using Expression: checkBox5 === checkBox3
+
+        const [checkBox2, checkBox2FieldView] = Object.entries(formContainer._fields)[1];
+        const [checkBox3, checkBox3FieldView] = Object.entries(formContainer._fields)[2];
+        const [checkBox5, checkBox5FieldView] = Object.entries(formContainer._fields)[4];
+
+        // Making checkBox3 visible
+        cy.get(`#${checkBox2}`).find("input").check(["0","3"])
+
+        cy.get(`#${checkBox3}`).find("input").uncheck().check(["0"]).blur().then(x => {
+            cy.get(`#${checkBox5}`).find("input").uncheck().check(["1"])
+            cy.get(`#${checkBox5}`).find(".cmp-adaptiveform-checkboxgroup__errormessage").should('have.text',"Please enter a valid value.")
+            cy.get(`#${checkBox5}`).should('have.attr', 'data-cmp-valid', 'false')
+            cy.get(`#${checkBox5}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('not.have.attr', 'aria-checked')
+            cy.get(`#${checkBox5}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('have.attr', 'aria-describedby', `${checkBox5}__errormessage`)
+        })
+
+        cy.get(`#${checkBox3}`).find("input").uncheck().check(["0"]).blur().then(x => {
+            cy.get(`#${checkBox5}`).find("input").uncheck().check(["0"])
+            cy.get(`#${checkBox5}`).find(".cmp-adaptiveform-checkboxgroup__errormessage").should('have.text',"")
+            cy.get(`#${checkBox5}`).should('have.attr', 'data-cmp-valid', 'true')
+            cy.get(`#${checkBox5}`).find(".cmp-adaptiveform-checkboxgroup__option__widget").should('have.attr', 'aria-invalid', 'false');
+            cy.get(`#${checkBox5}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('have.attr', 'aria-describedby', '');
+        })
+    })
+
+    it("should set and clear value based on rules", () => {
+        // Rule on checkBox3: When input has Item2 selected, set value of checkBox5 to Item 1 and clear value of checkBox2
+
+        const [checkBox2, checkBox2FieldView] = Object.entries(formContainer._fields)[1];
+        const [checkBox3, checkBox3FieldView] = Object.entries(formContainer._fields)[2];
+        const [checkBox5, checkBox5FieldView] = Object.entries(formContainer._fields)[4];
+
+        // Make checkbox3 visible
+        cy.get(`#${checkBox2}`).find("input").check(["0", "3"])
+        cy.get(`#${checkBox3}`).find("input").check("1").blur().then(x => {
+            cy.get(`#${checkBox5}`).find("input").should('be.checked')
+            cy.get(`#${checkBox2}`).find("input").should('not.be.checked')
+        })
+    })
+
+    it("should update enum values on providing duplicate enums", () => {
+
+        const [checkBox6, checkBox6FieldView] = Object.entries(formContainer._fields)[5];
+        cy.get(`#${checkBox6}`).find(".cmp-adaptiveform-checkboxgroup-item").should('have.length', 2);
+        cy.get(`#${checkBox6}`).find(".cmp-adaptiveform-checkboxgroup__option-label").contains('Item 3');
+        cy.get(`#${checkBox6}`).find(".cmp-adaptiveform-checkboxgroup__option-label").contains('Item 2');
+        cy.get(`#${checkBox6}`).find(".cmp-adaptiveform-checkboxgroup__option-label").contains('Item 1').should('not.exist');
+
+    })
+
+    it("rich text should render correctly", () => {
+        const [checkBox7, checkBox7FieldView] = Object.entries(formContainer._fields)[6];
+        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup-item").should('have.length', 2);
+        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__label").contains('Select Animal').should('have.css', 'font-weight', '700');
+        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__option-label span").contains('Dog').should('have.css', 'font-style', 'italic');
+        cy.get(`#${checkBox7}`).find(".cmp-adaptiveform-checkboxgroup__option-label span").contains('Cat').should('have.css', 'text-decoration', 'underline solid rgb(50, 50, 50)');
+    });
+
+    it("decoration element should not have same class name", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        cy.wrap().then(() => {
+            const id = formContainer._model._children[0].id;
+            cy.get(`#${id}`).parent().should("not.have.class", bemBlock);
+        })
+
+    })
+
+    it(" should add filled/empty class at container div ", () => {
+      const [id, fieldView] = Object.entries(formContainer._fields)[2]
+      cy.get(`#${id}`).should('have.class', 'cmp-adaptiveform-checkboxgroup--empty');
+      cy.get(`#${id}`).invoke('attr', 'data-cmp-required').should('eq', 'false');
+      cy.get(`#${id}`).invoke('attr', 'data-cmp-readonly').should('eq', 'false');
+      const [checkBox2, checkBox2FieldView] = Object.entries(formContainer._fields)[1];
+      cy.get(`#${checkBox2}`).find("input").check(["0","3"])
+      cy.get(`#${id}`).find("input").eq(1).click().then(x => {
+        cy.get(`#${id}`).should('have.class', 'cmp-adaptiveform-checkboxgroup--filled');
+      });
+    });
+
+    it("test if required property updated in model is reflected in view", () => {
+        const [id, checkboxview] = Object.entries(formContainer._fields)[5];
+        cy.get(`#${id}`).invoke('attr', 'data-cmp-required').should('eq', 'false').then(() => {
+            checkboxview._model.required = true;
+        })
+        cy.get(`#${id}`).invoke('attr', 'data-cmp-required').should('eq', 'true');
+    });
+
+    it("reset of checkbox group resulting in invalidation", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        const [resetButton, resetButtonView] = Object.entries(formContainer._fields)[7];
+        const [checkBox2, checkBox2FieldView] = Object.entries(formContainer._fields)[1];
+        cy.get(`#${checkBox2}`).find("input").check(["0","3"]);
+        cy.get(`#${checkBox2}`).invoke('attr', 'data-cmp-valid').should('eq', 'true');
+        cy.get(`#${resetButton} button`).click().then(() => {
+            cy.get(`#${checkBox2}`).find("input").should('not.be.checked');
+            cy.get(`#${checkBox2}`).invoke('attr', 'data-cmp-valid').should('not.exist');
+        });
+    })
+
+    it("checkbox group MUST be wrapped in a <fieldset> and have a legend", () => {
+        const [checkBox1] = Object.entries(formContainer._fields)[0];
+        cy.get(`#${checkBox1}`).then($el => {
+            expect($el.prop('tagName')).to.eq('FIELDSET');
+        });
+        cy.get(`#${checkBox1}`).find('legend').should('exist');
+    })
+})
+
+describe("setFocus on checkboxgroup via rules", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/focustest.html"
+    let formContainer = null
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        })
+    });
+
+    it("should focus on checkbox group when button is clicked", () => {
+        const [button] = Object.entries(formContainer._fields).filter(it => it[1].getModel()._jsonModel.fieldType==='button')[0];
+        const [radioButton] = Object.entries(formContainer._fields).filter(it => it[1].getModel()._jsonModel.fieldType==='checkbox-group')[0];
+        cy.get(`#${radioButton}`).find("input").eq(0).should('not.have.focus');
+        cy.get(`#${button}-widget`).click().then(() => {
+            cy.get(`#${radioButton}`).find("input").eq(0).should('have.focus')
+        })
+    })
+})
diff --git a/ui.tests/test-module/specs/customfunctions/checkboxv2.enum.enumName.cy.js b/ui.tests/test-module/specs/customfunctions/checkboxv2.enum.enumName.cy.js
new file mode 100644
index 0000000000..a79b0fd9b5
--- /dev/null
+++ b/ui.tests/test-module/specs/customfunctions/checkboxv2.enum.enumName.cy.js
@@ -0,0 +1,205 @@
+/*
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2023 Adobe Systems Incorporated
+ * All Rights Reserved.
+ *
+ * NOTICE:  All information contained herein is, and remains
+ * the property of Adobe Systems Incorporated and its suppliers,
+ * if any.  The intellectual and technical concepts contained
+ * herein are proprietary to Adobe Systems Incorporated and its
+ * suppliers and are protected by trade secret or copyright law.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe Systems Incorporated.
+ */
+
+describe('Test UpdateEnum, UpdateEnumName for Checkbox', () => {
+    const pagePath = "/content/forms/af/core-components-it/samples/customfunctions/populate-checkboxv2.html";
+    let formContainer = null;
+
+    let addEnumNameBtn1= '#button-63e4112562-widget',
+        addEnumBtn1 = '#button-d3f0135b2a-widget',
+        addBothBtn1 = '#button-b8030d3ba9-widget',
+
+        addEnumNameBtn2 = '#button-a267804deb-widget',
+        addEnumBtn2 = '#button-dfeea3ad14-widget',
+        addBothBtn2 = '#button-8fefc34d70-widget',
+
+        addEnumNameBtn3 = '#button-47854ea2ca-widget',
+        addEnumBtn3 = '#button-db8c627349-widget',
+        addBothBtn3  = '#button-83abf9e912-widget',
+
+        addEnumNameBtn4 = '#button-a19425d446-widget',
+        addEnumBtn4 = '#button-c23e50636b-widget',
+        addBothBtn4  = '#button-59054d2649-widget',
+        clearBtn = '#button-f7826f3a39-widget';
+
+    let checkbox1 = '#checkboxgroup-72fdea5dfd-widget',
+        checkbox2 = '#checkboxgroup-5f607707dc-widget',
+        checkbox3 = '#checkboxgroup-36e44551e0-widget',
+        checkbox4 = '#checkboxgroup-146eaab9bf-widget';
+
+    let enums = ["one", "two", "three"],
+        enumNames = ["India", "US", "Singapore"];
+
+    /**
+     * initialization of form container before every test
+     * */
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        })
+    });
+
+    describe('Checkbox with no options', () => {
+        it('add enums', () => {
+            cy.get(addEnumBtn1).click().then(() => {
+                cy.get(checkbox1).children().should('have.length', 3);
+                cy.get(checkbox1).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(enums[index]);
+                })
+            })
+        });
+
+        it('add enums Names', () => {
+            cy.get(addEnumNameBtn1).click().then(() => {
+                cy.get(checkbox1).children().should('have.length', 3);
+                cy.get(checkbox1).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enumNames[index]);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+
+        it('add both', () => {
+            cy.get(addBothBtn1).click().then(() => {
+                cy.get(checkbox1).children().should('have.length', 3);
+                cy.get(checkbox1).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+    });
+
+    describe('length of current options = length of new enums, enumNames', () => {
+        it('add enums', () => {
+            cy.get(addEnumBtn2).click().then(() => {
+                cy.get(checkbox2).children().should('have.length', 3);
+                cy.get(checkbox2).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(`country${index + 1}`);
+                })
+            })
+        });
+
+        it('add enums Names', () => {
+            cy.get(addEnumNameBtn2).click().then(() => {
+                cy.get(checkbox2).children().should('have.length', 3);
+                cy.get(checkbox2).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(`${index + 1}`);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+
+        it('add both', () => {
+            cy.get(addBothBtn2).click().then(() => {
+                cy.get(checkbox2).children().should('have.length', 3);
+                cy.get(checkbox2).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+    });
+
+    describe('length of current options < length of new enums, enumNames', () => {
+        it('add enums', () => {
+            cy.get(addEnumBtn3).click().then(() => {
+                cy.get(checkbox3).children().should('have.length', 3);
+                cy.get(checkbox3).children().each((option, index) => {
+                    if(index < 2) {
+                        expect(option.find('input').val()).to.be.eq(enums[index]);
+                        expect(option.find('span').text()).to.be.eq(`country${index + 1}`);
+                    } else {
+                        expect(option.find('input').val()).to.be.eq(enums[index]);
+                        expect(option.find('span').text()).to.be.eq(enums[index]);
+                    }
+                })
+            })
+        });
+
+        it('add enums Names', () => {
+            cy.get(addEnumNameBtn3).click().then(() => {
+                cy.get(checkbox3).children().should('have.length', 2);
+                cy.get(checkbox3).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(`${index + 1}`);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+
+        it('add both', () => {
+            cy.get(addBothBtn3).click().then(() => {
+                cy.get(checkbox3).children().should('have.length', 3);
+                cy.get(checkbox3).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+    });
+
+    describe('length of current options > length of new enums, enumNames', () => {
+        it('add enums', () => {
+            cy.get(addEnumBtn4).click().then(() => {
+                cy.get(checkbox4).children().should('have.length', 3);
+                cy.get(checkbox4).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(`country${index + 1}`);
+                })
+            })
+        });
+
+        it('add enums Names', () => {
+            cy.get(addEnumNameBtn4).click().then(() => {
+                cy.get(checkbox4).children().should('have.length', 4);
+                cy.get(checkbox4).children().each((option, index) => {
+                    if(index < 3) {
+                        expect(option.find('input').val()).to.be.eq(`${index + 1}`);
+                        expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                    } else {
+                        expect(option.find('input').val()).to.be.eq(`${index + 1}`);
+                        expect(option.find('span').text()).to.be.eq(`${index + 1}`);
+                    }
+
+                })
+            })
+        });
+
+        it('add both', () => {
+            cy.get(addBothBtn4).click().then(() => {
+                cy.get(checkbox4).children().should('have.length', 3);
+                cy.get(checkbox4).children().each((option, index) => {
+                    expect(option.find('input').val()).to.be.eq(enums[index]);
+                    expect(option.find('span').text()).to.be.eq(enumNames[index]);
+                })
+            })
+        });
+
+    });
+
+    describe('Clear all Checkbox options', () => {
+        it('check clear', () => {
+            cy.get(clearBtn).click().then(() => {
+                cy.get(checkbox4).children().should('have.length', 0); // only the blank option
+            })
+        });
+    });
+
+})
diff --git a/ui.tests/test-module/specs/dynamicOptionsv2.cy.js b/ui.tests/test-module/specs/dynamicOptionsv2.cy.js
new file mode 100644
index 0000000000..868271ea37
--- /dev/null
+++ b/ui.tests/test-module/specs/dynamicOptionsv2.cy.js
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright 2025 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.
+ ******************************************************************************/
+
+describe("Dynamic Options v2: Enum and EnumNames for CheckboxGroup v2 and RadioButton v2", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/dynamicenumenumnames/dynamicoptionsv2.html"
+    const selectors = {
+        checkboxgroupItem : '.cmp-adaptiveform-checkboxgroup-item',
+        checkboxgroupOptionLabel : '.cmp-adaptiveform-checkboxgroup__option-label',
+        radiobuttonOption : '.cmp-adaptiveform-radiobutton__option',
+        radiobuttonOptionLabel : '.cmp-adaptiveform-radiobutton__option-label',
+        dropdownOptionLabel : '.cmp-adaptiveform-dropdown__option',
+        checkboxgroupWidget : '.cmp-adaptiveform-checkboxgroup__option__widget',
+        radiobuttonWidget : '.cmp-adaptiveform-radiobutton__option__widget',
+        radiobuttonGroupWidget : '.cmp-adaptiveform-radiobutton__widget',
+        dropdownWidget : '.cmp-adaptiveform-dropdown__widget',
+    }
+
+    let formContainer = null
+    let componentIds = {}
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+            // Create name-to-ID mapping from form container model children
+            componentIds = {};
+            formContainer._model._children.forEach(child => {
+                if (child.name) {
+                    componentIds[child.name] = child.id;
+                }
+            });
+        })
+    });
+
+    it("should get model and view initialized properly for all components", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        expect(formContainer._model.items.length, "model and view elements match").to.equal(Object.keys(formContainer._fields).length);
+        Object.entries(formContainer._fields).forEach(([id, field]) => {
+            expect(field.getId()).to.equal(id)
+            expect(formContainer._model.getElement(id), `model and view are in sync`).to.equal(field.getModel())
+        });
+    })
+
+    it("should render dynamic options for checkboxgroup v2 components", () => {
+        // Test changeOptions checkboxgroup - should have 4 options (a, b, c, d)
+        const changeOptionsId = componentIds['changeOptions'];
+        cy.get(`#${changeOptionsId}`).find(selectors.checkboxgroupItem).should('have.length', 4);
+        cy.get(`#${changeOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('a');
+        cy.get(`#${changeOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('b');
+        cy.get(`#${changeOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('c');
+        cy.get(`#${changeOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('d');
+
+        // Test addOptions checkboxgroup - should have 4 options (a, b, c, d) and be readonly
+        const addOptionsId = componentIds['addOptions'];
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupItem).should('have.length', 4);
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupWidget).should('be.disabled');
+        cy.get(`#${addOptionsId}`).invoke('attr', 'data-cmp-readonly').should('eq', 'true');
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('a');
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('b');
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('c');
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupOptionLabel).contains('d');
+    })
+
+    it("should render dynamic options for dropdown components", () => {
+        // Test dynamicDropDown - should have 4 options (a, b, c, d) and be multi-select
+        const dynamicDropDownId = componentIds['dynamicDropDown'];
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownOptionLabel).should('have.length', 4);
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownWidget).should('have.attr', 'multiple');
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownOptionLabel).contains('a');
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownOptionLabel).contains('b');
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownOptionLabel).contains('c');
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownOptionLabel).contains('d');
+
+        // Test newdropdown - should be disabled and readonly
+        const newDropDownId = componentIds['newdropdown'];
+        cy.get(`#${newDropDownId}`).find(selectors.dropdownWidget).should('be.disabled');
+        cy.get(`#${newDropDownId}`).invoke('attr', 'data-cmp-readonly').should('eq', 'true');
+        
+        // Test newdropdown options
+        cy.get(`#${newDropDownId}`).find(selectors.dropdownOptionLabel).should('have.length', 4);
+        cy.get(`#${newDropDownId}`).find("option[value='a']").should('exist');
+        cy.get(`#${newDropDownId}`).find("option[value='b']").should('exist');
+        cy.get(`#${newDropDownId}`).find("option[value='c']").should('exist');
+        cy.get(`#${newDropDownId}`).find("option[value='d']").should('exist');
+    })
+
+    it("should render dynamic options for radiobutton v2 components", () => {
+        // Test dynamicRadio - should have 4 options (a, b, c, d)
+        const dynamicRadioId = componentIds['dynamicRadio'];
+        cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonOption).should('have.length', 4);
+        cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonOptionLabel).contains('a');
+        cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonOptionLabel).contains('b');
+        cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonOptionLabel).contains('c');
+        cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonOptionLabel).contains('d');
+
+        // Test newradio - should be disabled
+        const newRadioId = componentIds['newradio'];
+        cy.get(`#${newRadioId}`).find(selectors.radiobuttonWidget).should('be.disabled');
+        cy.get(`#${newRadioId}`).invoke('attr', 'data-cmp-enabled').should('eq', 'false');
+        cy.get(`#${newRadioId}`).find(selectors.radiobuttonOptionLabel).contains('a');
+        cy.get(`#${newRadioId}`).find(selectors.radiobuttonOptionLabel).contains('b');
+        cy.get(`#${newRadioId}`).find(selectors.radiobuttonOptionLabel).contains('c');
+        cy.get(`#${newRadioId}`).find(selectors.radiobuttonOptionLabel).contains('d');
+
+        // Test extraRadio - should have 2 options with different labels (Alpha, Beta)
+        const extraRadioId = componentIds['extraRadio'];
+        cy.get(`#${extraRadioId}`).find(selectors.radiobuttonOption).should('have.length', 2);
+        cy.get(`#${extraRadioId}`).find(selectors.radiobuttonOptionLabel).contains('Alpha');
+        cy.get(`#${extraRadioId}`).find(selectors.radiobuttonOptionLabel).contains('Beta');
+    })
+
+    it("should handle model changes and reflect in HTML for checkboxgroup v2", () => {
+        const changeOptionsId = componentIds['changeOptions'];
+        const model = formContainer._model.getElement(changeOptionsId);
+        
+        // Test selecting options
+        cy.get(`#${changeOptionsId}`).find(`${selectors.checkboxgroupWidget}[value='a']`).check().then(() => {
+            expect(model.getState().value).to.contain('a');
+        });
+        
+        cy.get(`#${changeOptionsId}`).find(`${selectors.checkboxgroupWidget}[value='c']`).check().then(() => {
+            expect(model.getState().value).to.contain('c');
+        });
+
+        // Test unchecking options
+        cy.get(`#${changeOptionsId}`).find(`${selectors.checkboxgroupWidget}[value='a']`).uncheck().then(() => {
+            expect(model.getState().value).to.not.contain('a');
+        });
+    })
+
+    it("should handle model changes and reflect in HTML for dropdown", () => {
+        const dynamicDropDownId = componentIds['dynamicDropDown'];
+        const model = formContainer._model.getElement(dynamicDropDownId);
+        
+        // Test selecting options in multi-select dropdown
+        cy.get(`#${dynamicDropDownId}`).find(selectors.dropdownWidget).select(["a", "c"]).then(() => {
+            expect(model.value).to.deep.equal(['a', 'c']);
+        });
+    })
+
+    it("should handle model changes and reflect in HTML for radiobutton v2", () => {
+        const dynamicRadioId = componentIds['dynamicRadio'];
+        const model = formContainer._model.getElement(dynamicRadioId);
+        
+        // Test selecting radio button
+        cy.get(`#${dynamicRadioId}`).find(`${selectors.radiobuttonWidget}[value='b']`).check().then(() => {
+            expect(model.getState().value).to.equal('b');
+        });
+        
+        cy.get(`#${dynamicRadioId}`).find(`${selectors.radiobuttonWidget}[value='d']`).check().then(() => {
+            expect(model.getState().value).to.equal('d');
+        });
+    })
+
+    it("should not have aria-disabled attribute when disabled", () => {
+        const addOptionsId = componentIds['addOptions'];
+        const newDropDownId = componentIds['newdropdown'];
+        const newRadioId = componentIds['newradio'];
+
+        cy.get(`#${addOptionsId}`).find(".cmp-adaptiveform-checkboxgroup__widget").should('not.have.attr', 'aria-disabled');
+        cy.get(`#${newDropDownId}`).find(selectors.dropdownWidget).should('not.have.attr', 'aria-disabled');
+        cy.get(`#${newRadioId}`).find(selectors.radiobuttonWidget).should('not.have.attr', 'aria-disabled');
+    })
+
+    it("should maintain proper data attributes for all components", () => {
+        const changeOptionsId = componentIds['changeOptions'];
+        const dynamicDropDownId = componentIds['dynamicDropDown'];
+        const dynamicRadioId = componentIds['dynamicRadio'];
+
+        // Test data-cmp-visible attribute
+        cy.get(`#${changeOptionsId}`).invoke('attr', 'data-cmp-visible').should('eq', 'true');
+        cy.get(`#${dynamicDropDownId}`).invoke('attr', 'data-cmp-visible').should('eq', 'true');
+        cy.get(`#${dynamicRadioId}`).invoke('attr', 'data-cmp-visible').should('eq', 'true');
+
+        // Test data-cmp-enabled attribute
+        cy.get(`#${changeOptionsId}`).invoke('attr', 'data-cmp-enabled').should('eq', 'true');
+        cy.get(`#${dynamicDropDownId}`).invoke('attr', 'data-cmp-enabled').should('eq', 'true');
+        cy.get(`#${dynamicRadioId}`).invoke('attr', 'data-cmp-enabled').should('eq', 'true');
+
+        // Test data-cmp-required attribute
+        cy.get(`#${changeOptionsId}`).invoke('attr', 'data-cmp-required').should('eq', 'false');
+        cy.get(`#${dynamicDropDownId}`).invoke('attr', 'data-cmp-required').should('eq', 'false');
+        cy.get(`#${dynamicRadioId}`).invoke('attr', 'data-cmp-required').should('eq', 'false');
+    })
+
+    it("should handle readonly state correctly", () => {
+        const addOptionsId = componentIds['addOptions'];
+        const newDropDownId = componentIds['newdropdown'];
+
+        // Test readonly checkboxgroup v2
+        cy.get(`#${addOptionsId}`).invoke('attr', 'data-cmp-readonly').should('eq', 'true');
+        cy.get(`#${addOptionsId}`).find("input").should('be.disabled');
+
+        // Test readonly dropdown
+        cy.get(`#${newDropDownId}`).invoke('attr', 'data-cmp-readonly').should('eq', 'true');
+        cy.get(`#${newDropDownId} select`).should('be.disabled');
+        cy.get(`#${newDropDownId} select`).should('have.attr', 'aria-readonly', 'true');
+    })
+
+    // it("should have proper role attributes for radiobutton v2 groups", () => {
+    //     const dynamicRadioId = componentIds['dynamicRadio'];
+    //     const newRadioId = componentIds['newradio'];
+    //     const extraRadioId = componentIds['extraRadio'];
+
+    //     // Test radiogroup role
+    //     cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonGroupWidget).should('have.attr', 'role', 'radiogroup');
+    //     cy.get(`#${newRadioId}`).find(selectors.radiobuttonGroupWidget).should('have.attr', 'role', 'radiogroup');
+    //     cy.get(`#${extraRadioId}`).find(selectors.radiobuttonGroupWidget).should('have.attr', 'role', 'radiogroup');
+    // })
+
+    it("should have proper tabindex attributes for interactive elements", () => {
+        const changeOptionsId = componentIds['changeOptions'];
+        const addOptionsId = componentIds['addOptions'];
+        const dynamicRadioId = componentIds['dynamicRadio'];
+
+        // Test checkboxgroup v2 tabindex
+        cy.get(`#${changeOptionsId}`).find(selectors.checkboxgroupWidget).should('have.attr', 'tabindex', '0');
+        cy.get(`#${addOptionsId}`).find(selectors.checkboxgroupWidget).should('have.attr', 'tabindex', '0');
+
+        // Test radiobutton v2 tabindex
+        cy.get(`#${dynamicRadioId}`).find(selectors.radiobuttonWidget).should('have.attr', 'tabindex', '0');
+    })
+
+    it("should add filled/empty class for checkboxgroup v2", () => {
+        const changeOptionsId = componentIds['changeOptions'];
+        
+        // Initially should be empty
+        cy.get(`#${changeOptionsId}`).should('have.class', 'cmp-adaptiveform-checkboxgroup--empty');
+        
+        // After selecting an option, should be filled
+        cy.get(`#${changeOptionsId}`).find(`${selectors.checkboxgroupWidget}[value='a']`).check().then(() => {
+            cy.get(`#${changeOptionsId}`).should('have.class', 'cmp-adaptiveform-checkboxgroup--filled');
+        });
+        
+        // After unchecking all, should be empty again
+        cy.get(`#${changeOptionsId}`).find(`${selectors.checkboxgroupWidget}[value='a']`).uncheck().then(() => {
+            cy.get(`#${changeOptionsId}`).should('have.class', 'cmp-adaptiveform-checkboxgroup--empty');
+        });
+    })
+
+    it("should add filled/empty class for radiobutton v2", () => {
+        const dynamicRadioId = componentIds['dynamicRadio'];
+        
+        // Initially should be empty
+        cy.get(`#${dynamicRadioId}`).should('have.class', 'cmp-adaptiveform-radiobutton--empty');
+        
+        // After selecting an option, should be filled
+        cy.get(`#${dynamicRadioId}`).find(`${selectors.radiobuttonWidget}[value='a']`).check().then(() => {
+            cy.get(`#${dynamicRadioId}`).should('have.class', 'cmp-adaptiveform-radiobutton--filled');
+        });
+    })
+
+    it("checkboxgroup v2 and radiobutton v2 should be wrapped in fieldset with legend", () => {
+        const changeOptionsId = componentIds['changeOptions'];
+        const dynamicRadioId = componentIds['dynamicRadio'];
+
+        // Test checkboxgroup v2 is wrapped in fieldset
+        cy.get(`#${changeOptionsId}`).then($el => {
+            expect($el.prop('tagName')).to.eq('FIELDSET');
+        });
+        cy.get(`#${changeOptionsId}`).find('legend').should('exist');
+
+        // Test radiobutton v2 is wrapped in fieldset
+        cy.get(`#${dynamicRadioId}`).then($el => {
+            expect($el.prop('tagName')).to.eq('FIELDSET');
+        });
+        cy.get(`#${dynamicRadioId}`).find('legend').should('exist');
+    })
+
+})