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/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..8e32feeebc 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
@@ -3,7 +3,7 @@
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
-        cq:lastModified="{Date}2023-03-10T15:40:57.975+05:30"
+        cq:lastModified="{Date}2025-11-09T15:40:57.975+05:30"
         cq:lastModifiedBy="admin"
         cq:template="/conf/core-components-it/settings/wcm/templates/core-components-it-template"
         fd:translationIds="\{&quot;jcr:title&quot;:&quot;jcr:title##5619&quot;}"
@@ -21,7 +21,7 @@
             themeRef="/libs/fd/af/themes/canvas">
             <accordion
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##accordion##jcr:title##257&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:37:31.613+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:37:31.613+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Accordion"
@@ -30,7 +30,7 @@
                 name="accordion1678442852017"/>
             <button
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##button##jcr:title##7236&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:37:36.979+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:37:36.979+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Button"
@@ -40,11 +40,11 @@
                 name="button1678442857354"/>
             <checkboxgroup
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##checkboxgroup##jcr:title##3503&quot;,&quot;enumNames&quot;:&quot;guideContainer##checkboxgroup##enumNames##4110&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:37:45.920+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:37:45.920+05:30"
                 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"
@@ -52,7 +52,7 @@
                 type="number[]"/>
             <datepicker
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##datepicker##jcr:title##9506&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:37:55.176+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:37:55.176+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Date Input"
@@ -61,7 +61,7 @@
                 name="datepicker1678442875478"/>
             <dropdown
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##dropdown##jcr:title##4797&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:06.785+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:06.785+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Dropdown"
@@ -70,7 +70,7 @@
                 name="dropdown1678442886916"/>
             <emailinput
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##emailinput##jcr:title##7492&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:12.514+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:12.514+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Email Input"
@@ -79,7 +79,7 @@
                 name="emailinput1678442892736"/>
             <fileinput
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##fileinput##jcr:title##6496&quot;,&quot;buttonText&quot;:&quot;guideContainer##fileinput##buttonText##3328&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:14.840+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:14.840+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="File Attachment"
@@ -90,7 +90,7 @@
                 name="fileinput1678442895099"/>
             <tabsontop
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##tabsontop##jcr:title##9454&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:18.509+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:18.509+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Tabs on top"
@@ -99,7 +99,7 @@
                 name="tabsontop1678442898658"/>
             <image
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##image##jcr:title##3969&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:23.061+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:23.061+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Image"
@@ -108,7 +108,7 @@
                 name="image1678442903853"/>
             <numberinput
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##numberinput##jcr:title##9936&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:31.622+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:31.622+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Number Input"
@@ -117,7 +117,7 @@
                 name="numberinput1678442911773"/>
             <panelcontainer
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##panelcontainer##jcr:title##8236&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:37.624+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:37.624+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Panel"
@@ -126,7 +126,7 @@
                 name="panelcontainer1678442917986"/>
             <radiobutton
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##radiobutton##jcr:title##6191&quot;,&quot;enumNames&quot;:&quot;guideContainer##radiobutton##enumNames##1697&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:41.694+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:41.694+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Radio Button"
@@ -138,7 +138,7 @@
                 orientation="horizontal"/>
             <reset
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##reset##jcr:title##3395&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:46.678+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:46.678+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Reset"
@@ -156,7 +156,7 @@
             </reset>
             <submit
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##submit##jcr:title##4521&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:51.626+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:51.626+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Submit"
@@ -174,7 +174,7 @@
             </submit>
             <telephoneinput
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##telephoneinput##jcr:title##8743&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:54.904+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:54.904+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Telephone Input"
@@ -183,7 +183,7 @@
                 name="telephoneinput1678442935121"/>
             <text
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##text##jcr:title##9404&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:38:57.872+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:38:57.872+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Text"
@@ -192,7 +192,7 @@
                 name="text1678442937952"/>
             <textinput
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##textinput##jcr:title##6594&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:39:02.300+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:39:02.300+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Text Input"
@@ -201,7 +201,7 @@
                 name="textinput1678442942382"/>
             <title
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##title##jcr:title##8175&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:39:09.932+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:39:09.932+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Title"
@@ -209,7 +209,7 @@
                 sling:resourceType="forms-components-examples/components/form/title"/>
             <wizard
                 fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##wizard##jcr:title##299&quot;}"
-                jcr:lastModified="{Date}2023-03-10T15:39:45.951+05:30"
+                jcr:lastModified="{Date}2025-11-09T15:39:45.951+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="wizard"
@@ -218,13 +218,13 @@
                 name="wizard1678442986146"/>
             <checkboxgroup7
                     fd:translationIds="\{&quot;jcr:title&quot;:&quot;guideContainer##checkboxgroup7##jcr:title##3329&quot;,&quot;enumNames&quot;:&quot;guideContainer##checkboxgroup7##enumNames##7570&quot;}"
-                    jcr:created="{Date}2023-10-06T11:32:51.920+05:30"
+                    jcr:created="{Date}2025-11-09T11:32:51.920+05:30"
                     jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-06T11:33:40.225+05:30"
+                    jcr:lastModified="{Date}2025-11-09T11: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"
+                    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 100644
index 0000000000..bbf62ed22c
--- /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:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    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 95%
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..bf851cc858 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
@@ -3,7 +3,7 @@
           jcr:primaryType="cq:Page">
     <jcr:content
             cq:deviceGroups="[mobile/groups/responsive]"
-            cq:lastModified="{Date}2023-05-03T11:33:58.406+05:30"
+            cq:lastModified="{Date}2025-11-09T11:33:58.406+05:30"
             cq:lastModifiedBy="admin"
             cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
             jcr:language="en"
@@ -16,7 +16,7 @@
                 sling:resourceType="forms-components-examples/components/form/container"
                 fieldType="form">
             <checkboxgroup1
-                    jcr:lastModified="{Date}2023-01-23T12:23:13.884+05:30"
+                    jcr:lastModified="{Date}2025-11-09T12:23:13.884+05:30"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 1"
@@ -33,7 +33,7 @@
                     type="string[]"
                     visible="{Boolean}true"/>
             <checkboxgroup2
-                    jcr:lastModified="{Date}2022-09-10T23:45:20.572+05:30"
+                    jcr:lastModified="{Date}2025-11-09T23:45:20.572+05:30"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 2"
@@ -59,11 +59,11 @@
                         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}2022-12-24T11:19:33.329+05:30"
+                    jcr:lastModified="{Date}2025-11-09T11: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"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1]"
                     enumNames="[Item 1, Item 2]"
@@ -83,7 +83,7 @@
                         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}2022-12-24T11:19:11.733+05:30"
+                    jcr:lastModified="{Date}2025-11-09T11:19:11.733+05:30"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Check Box Group 4"
@@ -114,11 +114,11 @@
                         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}2023-01-13T11:49:37.118+05:30"
+                    jcr:lastModified="{Date}2025-11-09T11: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"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1]"
                     enumNames="[Item 1, Item 2]"
@@ -137,11 +137,11 @@
                 <fd:events jcr:primaryType="nt:unstructured"/>
             </checkboxgroup5>
             <checkboxgroup
-                    jcr:lastModified="{Date}2023-05-03T11:33:58.397+05:30"
+                    jcr:lastModified="{Date}2025-11-09T11: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"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     enabled="{Boolean}true"
                     enum="[0,1,0]"
                     enumNames="[Item 1, Item 2,Item 3]"
@@ -154,13 +154,13 @@
                     type="number[]"
                     visible="{Boolean}true"/>
             <checkboxgroup7
-                    jcr:created="{Date}2023-10-06T11:32:51.920+05:30"
+                    jcr:created="{Date}2025-11-09T11:32:51.920+05:30"
                     jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-10-06T11:33:40.225+05:30"
+                    jcr:lastModified="{Date}2025-11-09T11: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"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
                     areOptionsRichText="true"
                     enabled="{Boolean}true"
                     enum="[0,1]"
@@ -176,9 +176,9 @@
                     unboundFormElement="{Boolean}false"
                     visible="{Boolean}true"/>
             <resetbutton
-                    jcr:created="{Date}2024-11-14T18:03:13.181+05:30"
+                    jcr:created="{Date}2025-11-09T18:03:13.181+05:30"
                     jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2024-11-14T18:03:13.181+05:30"
+                    jcr:lastModified="{Date}2025-11-09T18:03:13.181+05:30"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Reset"
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/checkboxgroupv1/focustest/.content.xml
similarity index 90%
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/checkboxgroupv1/focustest/.content.xml
index b0028863ee..92d87b8977 100644
--- 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/checkboxgroupv1/focustest/.content.xml
@@ -3,13 +3,13 @@
     jcr:primaryType="cq:Page">
     <jcr:content
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
-        cq:lastModified="{Date}2023-10-19T13:14:31.885+05:30"
+        cq:lastModified="{Date}2025-11-09T13: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:configRef="/conf/forms/core-components-it/samples/checkboxgroup/checkboxgroupv1/focustest/"
         sling:resourceType="forms-components-examples/components/page">
         <guideContainer
             fd:version="2.1"
@@ -21,9 +21,9 @@
             themeRef="/libs/fd/af/themes/canvas"
             title="focustest">
             <button
-                jcr:created="{Date}2023-10-19T13:13:52.618+05:30"
+                jcr:created="{Date}2025-11-09T13:13:52.618+05:30"
                 jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-19T13:13:52.618+05:30"
+                jcr:lastModified="{Date}2025-11-09T13:13:52.618+05:30"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Button"
@@ -40,13 +40,13 @@
                     click="[setFocus(checkboxgroup1697701437345)]"/>
             </button>
             <checkboxgroup
-                jcr:created="{Date}2023-10-19T13:13:56.745+05:30"
+                jcr:created="{Date}2025-11-09T13:13:56.745+05:30"
                 jcr:createdBy="admin"
-                jcr:lastModified="{Date}2023-10-19T13:13:56.745+05:30"
+                jcr:lastModified="{Date}2025-11-09T13:13:56.745+05:30"
                 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"
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 100644
index 0000000000..bbf62ed22c
--- /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:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    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 100644
index 0000000000..376ce0f258
--- /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-09T11: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-09T12:23:13.884+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 1"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T23:45:20.572+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 2"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T11:19:33.329+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 3"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T11:19:11.733+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 4"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T11:49:37.118+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 5"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T11:33:58.397+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Check Box Group 6"
+                    sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T11:32:51.920+05:30"
+                    jcr:createdBy="admin"
+                    jcr:lastModified="{Date}2025-11-09T11: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="core/fd/components/form/checkboxgroup/v2/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-09T18:03:13.181+05:30"
+                    jcr:createdBy="admin"
+                    jcr:lastModified="{Date}2025-11-09T18: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/checkboxgroupv2/focustest/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/focustest/.content.xml
new file mode 100644
index 0000000000..cf61e3d7b5
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/checkboxgroup/checkboxgroupv2/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}2025-11-09T13: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/checkboxgroupv2/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}2025-11-09T13:13:52.618+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T13: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}2025-11-09T13:13:56.745+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T13:13:56.745+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Check Box Group"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/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/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 100644
index 0000000000..34ca8bbf20
--- /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-09T12: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-checkboxv2/"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            jcr:lastModified="{Date}2025-11-09T12: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-09T12:54:23.313+05:30"       
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12:07:10.887+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="checkbox with no options"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:54:23.313+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12:07:00.456+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="len(current options) = len(enums/enumNames)"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:54:23.313+05:30"   
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12:07:26.444+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="len(current options) &lt; len(enums/enumNames)"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:54:23.313+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12:06:48.542+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="len(current options) > len(enums/enumNames)"
+                sling:resourceType="core/fd/components/form/checkboxgroup/v2/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-09T12:55:50.856+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:55:15.325+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T12:56:12.080+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T12: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-09T11:18:43.310+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2025-11-09T11: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/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/legend.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/legend.html
new file mode 100644
index 0000000000..7bc52cd25b
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/legend.html
@@ -0,0 +1,7 @@
+  <template data-sly-template.legend="${@ componentId, labelValue, labelVisible, labelRichText, bemBlock}">
+      <span class="${bemBlock}__label"
+            data-sly-test="${labelValue && (labelVisible == null || labelVisible == true)}"
+            data-richtext="${labelRichText}">
+        ${labelValue @ context = labelRichText ? 'html' : 'text'}
+      </span>
+    </template>
\ No newline at end of file
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..d379307fb4
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v2/.content.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<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">
+    <checkboxgroup/>
+</jcr:root>
\ 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/.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..029f676d3b
--- /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"/>
\ 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.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/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..9192f84216
--- /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' : ''}"/>
+            <span>${checkboxgroup.enumNames[itemList.index] @ context = 'html'}</span>
+          </label>
+        </div>
+      </div>
+    </div>
+  </template>
+  
\ No newline at end of file
diff --git a/ui.frontend/src/view/FormFieldBase.js b/ui.frontend/src/view/FormFieldBase.js
index 876441501a..6d117c14ca 100644
--- a/ui.frontend/src/view/FormFieldBase.js
+++ b/ui.frontend/src/view/FormFieldBase.js
@@ -166,8 +166,11 @@ class FormFieldBase extends FormField {
      */
     #syncLabel() {
         let labelElement = typeof this.getLabel === 'function' ? this.getLabel() : null;
-        if (labelElement) {
+        if (labelElement && labelElement.tagName?.toUpperCase() === 'LABEL') {
             labelElement.setAttribute('for', this.getWidgetId());
+        } else if (labelElement) {
+            //remove the 'for' attribute if it exists on non-label
+            labelElement.removeAttribute('for');
         }
     }
 
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..f88f168e29
--- /dev/null
+++ b/ui.tests/test-module/specs/checkboxgroup/checkboxgroupv2.runtime.cy.js
@@ -0,0 +1,273 @@
+/*******************************************************************************
+ * 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("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');
+        });
+    })
+})
+
+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..095f6d3a4a
--- /dev/null
+++ b/ui.tests/test-module/specs/customfunctions/checkboxv2.enum.enumName.cy.js
@@ -0,0 +1,205 @@
+/*
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2025 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
+            })
+        });
+    });
+
+})