diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
index 01bbc23604..6ecdd327c3 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java
@@ -108,6 +108,9 @@ private FormConstants() {
 
     public static final String RT_FD_FRAGMENT_CONTAINER_V1 = RT_FD_FORM_PREFIX + "fragmentcontainer/v1/fragmentcontainer";
 
+    /** The resource type for terms and conditions v1 */
+    public static final String RT_FD_FORM_TERMS_AND_CONDITIONS_V1 = RT_FD_FORM_PREFIX + "termsandconditions/v1/termsandconditions";
+
     public static final String FORM_FIELD_TYPE = "form";
 
     public static final String REQ_ATTR_FORMCONTAINER_PATH = "formContainerPath";
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
new file mode 100644
index 0000000000..63a81cc98c
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImpl.java
@@ -0,0 +1,107 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Default;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.jetbrains.annotations.NotNull;
+
+import com.adobe.cq.export.json.ComponentExporter;
+import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.models.form.FieldType;
+import com.adobe.cq.forms.core.components.models.form.TermsAndConditions;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { TermsAndConditions.class,
+        ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_TERMS_AND_CONDITIONS_V1 })
+
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class TermsAndConditionsImpl extends PanelImpl implements TermsAndConditions {
+
+    private static final String CUSTOM_TNC_PROPERTY = "fd:tnc";
+
+    private static final String FIELD_TYPE = "fieldType";
+
+    @JsonIgnore
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Default(booleanValues = true)
+    private boolean showApprovalOption;
+
+    @JsonIgnore
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Default(booleanValues = false)
+    private boolean showLink;
+
+    @JsonIgnore
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Default(booleanValues = false)
+    private boolean showAsPopup;
+
+    @Override
+    public boolean isShowApprovalOption() {
+        return showApprovalOption;
+    }
+
+    @Override
+    public boolean isShowLink() {
+        return showLink;
+    }
+
+    @Override
+    public boolean isShowAsPopup() {
+        return showAsPopup;
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return super.getId();
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getProperties() {
+        Map<String, Object> properties = super.getProperties();
+        if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
+            properties.put(CUSTOM_TNC_PROPERTY, true);
+        }
+        return properties;
+    }
+
+    @Override
+    protected List<Resource> getFilteredChildrenResources() {
+        List<Resource> childResources = getFilteredChildrenResources(resource);
+        // the tnc component will either have links or consent text based upon showLink value
+        if (showLink) {
+            childResources.removeIf(child -> FieldType.PLAIN_TEXT.getValue().equals(child.getValueMap().get(FIELD_TYPE)));
+
+        } else {
+            childResources.removeIf(child -> FieldType.CHECKBOX_GROUP.getValue().equals(child.getValueMap().get(FIELD_TYPE)));
+        }
+        return childResources;
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TermsAndConditions.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TermsAndConditions.java
new file mode 100644
index 0000000000..e724791843
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/TermsAndConditions.java
@@ -0,0 +1,50 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+package com.adobe.cq.forms.core.components.models.form;
+
+import org.osgi.annotation.versioning.ConsumerType;
+
+/**
+ * Defines the form {@code TermsAndConditions} Sling Model used for the
+ * {@code /apps/core/fd/components/form/termsandconditions/v1/termsandconditions} component.
+ *
+ * @since com.adobe.cq.forms.core.components.models.form 4.5.0
+ */
+@ConsumerType
+public interface TermsAndConditions extends Container, ContainerConstraint {
+
+    String FD_TERMS_AND_CONDITIONS = "fd:tnc";
+
+    /**
+     *
+     * @return {@code true} if approval checkbox should be shown, otherwise {@code false}
+     */
+    boolean isShowApprovalOption();
+
+    /**
+     *
+     * @return {@code true} if links to external Terms & Conditions pages are to be shown, otherwise
+     *         {@code false if consent text is to be shown}
+     */
+    boolean isShowLink();
+
+    /**
+     *
+     * @return @return {@code true} if the content is to be shown as pop-up , otherwise {@code false}
+     */
+    boolean isShowAsPopup();
+}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
new file mode 100644
index 0000000000..57c936958b
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TermsAndConditionsImplTest.java
@@ -0,0 +1,126 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.apache.sling.api.resource.Resource;
+import org.junit.Assert;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+
+import com.adobe.cq.export.json.SlingModelFilter;
+import com.adobe.cq.forms.core.Utils;
+import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.models.form.TermsAndConditions;
+import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
+import com.day.cq.wcm.api.NameConstants;
+import com.day.cq.wcm.msm.api.MSMNameConstants;
+import io.wcm.testing.mock.aem.junit5.AemContext;
+import io.wcm.testing.mock.aem.junit5.AemContextExtension;
+
+import static org.junit.Assert.assertEquals;
+
+@ExtendWith(AemContextExtension.class)
+public class TermsAndConditionsImplTest {
+
+    private static final String BASE = "/form/termsandconditions";
+    private static final String CONTENT_ROOT = "/content";
+
+    private static final String PATH_TNC = CONTENT_ROOT + "/termsandconditions";
+
+    private static final String PATH_NOWRAP_TNC = CONTENT_ROOT + "/termsandconditionsNoWrapData";
+
+    private final AemContext context = FormsCoreComponentTestContext.newAemContext();
+
+    @BeforeEach
+    public void setUp() {
+        context.load().json(BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, CONTENT_ROOT);
+        context.registerService(SlingModelFilter.class, new SlingModelFilter() {
+
+            private final Set<String> IGNORED_NODE_NAMES = new HashSet<String>() {
+                {
+                    add(NameConstants.NN_RESPONSIVE_CONFIG);
+                    add(MSMNameConstants.NT_LIVE_SYNC_CONFIG);
+                    add("cq:annotations");
+                }
+            };
+
+            @Override
+            public Map<String, Object> filterProperties(Map<String, Object> map) {
+                return map;
+            }
+
+            @Override
+            public Iterable<Resource> filterChildResources(Iterable<Resource> childResources) {
+                return StreamSupport
+                    .stream(childResources.spliterator(), false)
+                    .filter(r -> !IGNORED_NODE_NAMES.contains(r.getName()))
+                    .collect(Collectors.toList());
+            }
+        });
+    }
+
+    @Test
+    void testExportedType() throws Exception {
+        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
+        assertEquals(FormConstants.RT_FD_FORM_TERMS_AND_CONDITIONS_V1, tnc.getExportedType());
+        TermsAndConditions tncMock = Mockito.mock(TermsAndConditions.class);
+        Mockito.when(tncMock.getExportedType()).thenCallRealMethod();
+        assertEquals("", tncMock.getExportedType());
+    }
+
+    @Test
+    public void testGetProperties() {
+        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
+        Assert.assertTrue(tnc.isShowApprovalOption());
+        Assert.assertTrue(tnc.isShowAsPopup());
+        Assert.assertFalse(tnc.isShowLink());
+    }
+
+    @Test
+    public void testCustomFDProperty() {
+        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
+        Map<String, Object> props = tnc.getProperties();
+        Assert.assertTrue(props.containsKey("fd:tnc"));
+        Assert.assertTrue((Boolean) props.get("fd:tnc"));
+
+    }
+
+    @Test
+    void testJSONExport() throws Exception {
+        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_TNC, TermsAndConditions.class, context);
+        Utils.testJSONExport(tnc, Utils.getTestExporterJSONPath(BASE, PATH_TNC));
+    }
+
+    @Test
+    void testJSONExport_showLink() throws Exception {
+        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_NOWRAP_TNC, TermsAndConditions.class, context);
+        Utils.testJSONExport(tnc, Utils.getTestExporterJSONPath(BASE, PATH_NOWRAP_TNC));
+    }
+
+    @Test
+    void testNoWrap() {
+        TermsAndConditions tnc = Utils.getComponentUnderTest(PATH_NOWRAP_TNC, TermsAndConditions.class, context);
+        Assert.assertNull(tnc.getType());
+    }
+}
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
new file mode 100644
index 0000000000..64ec40ecc3
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditions.json
@@ -0,0 +1,75 @@
+{
+  "id": "termsandconditions-dac51d5ed9",
+  "fieldType": "panel",
+  "name": "termsandconditions1694159302516",
+  "type": "object",
+  "properties": {
+    "fd:dor": {
+      "dorExclusion": false,
+      "dorExcludeTitle": false,
+      "dorExcludeDescription": false
+    },
+    "fd:path": "/content/termsandconditions",
+    "fd:tnc": true
+  },
+  "label": {
+    "value": "Terms And Conditions"
+  },
+  "events": {
+    "custom:setProperty": [
+      "$event.payload"
+    ]
+  },
+  ":itemsOrder": [
+    "text",
+    "approvalcheckbox"
+  ],
+  ":items": {
+    "text": {
+      "id": "text-37c101fc2b",
+      "fieldType": "plain-text",
+      "name": "consenttext",
+      "value": "Text related to the terms and conditions come here",
+      "richText": false,
+      "events": {
+        "custom:setProperty": [
+          "$event.payload"
+        ]
+      },
+      "properties": {
+        "fd:path": "/content/termsandconditions/text"
+      },
+      ":type": "core/fd/components/form/text/v1/text"
+    },
+    "approvalcheckbox": {
+      "id": "checkbox-150eb94d3e",
+      "fieldType": "checkbox",
+      "name": "approvalcheckbox",
+      "type": "string",
+      "enabled": false,
+      "enforceEnum": true,
+      "label": {
+        "value": "I agree to the terms & conditions"
+      },
+      "events": {
+        "custom:setProperty": [
+          "$event.payload"
+        ]
+      },
+      "properties": {
+        "afs:layout": {
+          "orientation": "horizontal"
+        },
+        "fd:dor": {
+          "dorExclusion": false
+        },
+        "fd:path": "/content/termsandconditions/approvalcheckbox"
+      },
+      "enum": [
+        "true"
+      ],
+      ":type": "core/fd/components/form/checkbox/v1/checkbox"
+    }
+  },
+  ":type": "core/fd/components/form/termsandconditions/v1/termsandconditions"
+}
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
new file mode 100644
index 0000000000..23f4a33d14
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/termsandconditions/exporter-termsandconditionsNoWrapData.json
@@ -0,0 +1,89 @@
+{
+  "id": "termsandconditions-5e021cc31d",
+  "fieldType": "panel",
+  "name": "termsandconditions1694159302516",
+  "properties": {
+    "fd:dor": {
+      "dorExclusion": false,
+      "dorExcludeTitle": false,
+      "dorExcludeDescription": false
+    },
+    "fd:path": "/content/termsandconditionsNoWrapData",
+    "fd:tnc": true
+  },
+  "label": {
+    "value": "Terms And Conditions"
+  },
+  "events": {
+    "custom:setProperty": [
+      "$event.payload"
+    ]
+  },
+  ":itemsOrder": [
+    "approvalcheckbox",
+    "link"
+  ],
+  ":type": "core/fd/components/form/termsandconditions/v1/termsandconditions",
+  ":items": {
+    "approvalcheckbox": {
+      "id": "checkbox-9d01a4893a",
+      "fieldType": "checkbox",
+      "name": "approvalcheckbox",
+      "type": "string",
+      "enabled": false,
+      "enforceEnum": true,
+      "label": {
+        "value": "I agree to the terms & conditions"
+      },
+      "events": {
+        "custom:setProperty": [
+          "$event.payload"
+        ]
+      },
+      "properties": {
+        "afs:layout": {
+          "orientation": "horizontal"
+        },
+        "fd:dor": {
+          "dorExclusion": false
+        },
+        "fd:path": "/content/termsandconditionsNoWrapData/approvalcheckbox"
+      },
+      "enum": [
+        "true"
+      ],
+      ":type": "core/fd/components/form/checkbox/v1/checkbox"
+    },
+    "link": {
+      "id": "checkboxgroup-577c0892d3",
+      "fieldType": "checkbox-group",
+      "name": "link1694159323342",
+      "type": "string",
+      "enforceEnum": true,
+      "enumNames": [
+        "label for the link"
+      ],
+      "label": {
+        "value": ""
+      },
+      "events": {
+        "custom:setProperty": [
+          "$event.payload"
+        ]
+      },
+      "properties": {
+        "afs:layout": {
+          "orientation": "vertical"
+        },
+        "fd:dor": {
+          "dorExclusion": false
+        },
+        "fd:path": "/content/termsandconditionsNoWrapData/link"
+      },
+      "enum": [
+        "yourlink"
+      ],
+      ":type": "core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+    }
+  }
+}
diff --git a/bundles/af-core/src/test/resources/form/termsandconditions/test-content.json b/bundles/af-core/src/test/resources/form/termsandconditions/test-content.json
new file mode 100644
index 0000000000..b7ef1cf3c5
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/termsandconditions/test-content.json
@@ -0,0 +1,89 @@
+{
+  "termsandconditions": {
+    "showApprovalOption": true,
+    "jcr:title": "Terms And Conditions",
+    "fd:tnc": true,
+    "showAsPopup": true,
+    "name": "termsandconditions1694159302516",
+    "sling:resourceType": "core/fd/components/form/termsandconditions/v1/termsandconditions",
+    "wrapData": true,
+    "fieldType": "panel",
+    "text": {
+      "jcr:primaryType": "nt:unstructured",
+      "jcr:title": "",
+      "name": "consenttext",
+      "value": "Text related to the terms and conditions come here",
+      "hideTitle": "true",
+      "sling:resourceType": "core/fd/components/form/text/v1/text",
+      "fieldType": "plain-text"
+    },
+    "approvalcheckbox": {
+      "jcr:primaryType": "nt:unstructured",
+      "jcr:title": "I agree to the terms & conditions",
+      "enabled": "false",
+      "name": "approvalcheckbox",
+      "checkedValue": "true",
+      "sling:resourceType": "core/fd/components/form/checkbox/v1/checkbox",
+      "fieldType": "checkbox"
+    },
+    "link": {
+      "jcr:primaryType": "nt:unstructured",
+      "jcr:title": "",
+      "orientation": "vertical",
+      "enum": [
+        "yourlink"
+      ],
+      "name": "link1694159323342",
+      "title": "I agree to the terms & conditions",
+      "enumNames": [
+        "label for the link"
+      ],
+      "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
+      "fieldType": "checkbox-group"
+    }
+  },
+  "termsandconditionsNoWrapData": {
+    "showApprovalOption": true,
+    "jcr:title": "Terms And Conditions",
+    "fd:tnc": true,
+    "showAsPopup": true,
+    "showLink": true,
+    "name": "termsandconditions1694159302516",
+    "sling:resourceType": "core/fd/components/form/termsandconditions/v1/termsandconditions",
+    "wrapData": false,
+    "fieldType": "panel",
+    "text": {
+      "jcr:primaryType": "nt:unstructured",
+      "jcr:title": "",
+      "name": "consenttext",
+      "value": "Text related to the terms and conditions come here",
+      "hideTitle": "true",
+      "sling:resourceType": "core/fd/components/form/text/v1/text",
+      "fieldType": "plain-text"
+    },
+    "approvalcheckbox": {
+      "jcr:primaryType": "nt:unstructured",
+      "jcr:title": "I agree to the terms & conditions",
+      "enabled": "false",
+      "name": "approvalcheckbox",
+      "checkedValue": "true",
+      "sling:resourceType": "core/fd/components/form/checkbox/v1/checkbox",
+      "fieldType": "checkbox"
+    },
+    "link": {
+      "jcr:primaryType": "nt:unstructured",
+      "jcr:title": "",
+      "orientation": "vertical",
+      "enum": [
+        "yourlink"
+      ],
+      "name": "link1694159323342",
+      "title": "I agree to the terms & conditions",
+      "enumNames": [
+        "label for the link"
+      ],
+      "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
+      "fieldType": "checkbox-group"
+    }
+  }
+}
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/.content.xml
new file mode 100644
index 0000000000..9390fcd533
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:description="Terms And Conditions."
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Terms And Conditions"
+    sling:resourceSuperType="core/fd/components/form/termsandconditions/v1/termsandconditions"
+    componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/_cq_template/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/_cq_template/.content.xml
new file mode 100644
index 0000000000..95a10387e4
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/termsandconditions/_cq_template/.content.xml
@@ -0,0 +1,42 @@
+<?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="nt:unstructured"
+  jcr:title="Terms And Conditions"
+  fieldType="panel"
+  fd:tnc="{Boolean}true"
+  wrapData="{Boolean}true">
+  <text
+    name="consenttext"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="\0"
+    sling:resourceType="core/fd/components/form/text/v1/text"
+    fieldType="plain-text"
+    hideTitle="true"
+    value="Text related to the terms and conditions come here"/>
+  <approvalcheckbox
+    name="approvalcheckbox"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="I agree to the terms &amp; conditions"
+    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
+    enabled="false"
+    checkedValue="true"
+    fieldType="checkbox">
+  </approvalcheckbox>
+  <link
+    jcr:primaryType="nt:unstructured"
+    jcr:title="\0"
+    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
+    orientation="vertical"
+    type="string[]"
+    enum="your-link-here"
+    enumNames="[label for the link]"
+    fieldType="checkbox-group"
+    title="I agree to the terms &amp; conditions">
+    <fd:rules
+      jcr:primaryType="nt:unstructured"
+      validationStatus="valid"/>
+    <fd:events
+      jcr:primaryType="nt:unstructured"
+      change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
+  </link>
+</jcr:root>
diff --git a/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/termsandconditions/.content.xml b/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/termsandconditions/.content.xml
new file mode 100644
index 0000000000..824a08cbbb
--- /dev/null
+++ b/examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/adaptive-form/termsandconditions/.content.xml
@@ -0,0 +1,165 @@
+<?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:lastModified="{Date}2022-09-01T13:25:39.732+02:00"
+        cq:lastModifiedBy="admin"
+        cq:tags="[]"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/content-page"
+        jcr:description="Terms and Conditions"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Terms and Conditions"
+        sling:resourceType="forms-components-examples/components/page">
+        <root
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/foundation/components/responsivegrid">
+            <responsivegrid
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="wcm/foundation/components/responsivegrid">
+                <text_1740702241
+                    cq:styleIds="[1644862132301]"
+                    jcr:lastModified="{Date}2019-02-15T19:09:39.787+01:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="core/wcm/components/text/v2/text"
+                    text="&lt;h1>Terms and Conditions&lt;sub>v1&lt;/sub>&lt;/h1>"
+                    textIsRich="true"/>
+                <text
+                    cq:styleIds="[1544762734201]"
+                    jcr:lastModified="{Date}2020-07-15T13:25:39.729+02:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="core/wcm/components/text/v2/text"
+                    text="&lt;p>Terms and Conditions.&lt;/p>"
+                    textIsRich="true"/>
+                <teaser
+                    cq:styleIds="[1550165685463]"
+                    jcr:description="&lt;p>GitHub&lt;/p>&#xd;&#xa;"
+                    jcr:lastModified="{Date}2019-02-14T16:49:57.290+01:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Technical Documentation"
+                    sling:resourceType="core-components-examples/components/teaser"
+                    actionsEnabled="false"
+                    descriptionFromPage="false"
+                    fileReference="/content/dam/core-components-examples/library/github-logo.svg"
+                    linkURL="https://github.com/adobe/aem-core-forms-components/tree/master/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions"
+                    textIsRich="true"
+                    titleFromPage="false"/>
+                <title_865328580
+                    cq:styleIds="[1544759664489]"
+                    jcr:lastModified="{Date}2018-12-06T19:23:25.116+01:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Examples"
+                    sling:resourceType="core/wcm/components/title/v2/title"
+                    type="h2"/>
+                <title_290384408
+                    cq:styleIds="[1544759676459]"
+                    jcr:lastModified="{Date}2019-05-22T11:01:40.926+03:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Standard"
+                    sling:resourceType="core/wcm/components/title/v2/title"
+                    type="h3"/>
+                <text_1337506761
+                    jcr:lastModified="{Date}2019-05-22T11:26:32.604+03:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="core/wcm/components/text/v2/text"
+                    text="&lt;p>Terms And Conditions Demo.&lt;/p>"
+                    textIsRich="true"/>
+                <demo
+                    jcr:lastModified="{Date}2018-12-07T12:55:03.496+01:00"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="forms-components-examples/components/demo">
+                    <component
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="forms-components-examples/components/demo/component">
+                        <guideContainer
+                            fd:version="2.1"
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="forms-components-examples/components/form/container"
+                            fieldType="form">
+                            <container
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="forms-components-examples/components/demo/component">
+                                <termsandconditions
+                                    fd:tnc="{Boolean}true"
+                                    jcr:created="{Date}2023-09-11T12:57:19.055+05:30"
+                                    jcr:createdBy="admin"
+                                    jcr:lastModified="{Date}2023-09-11T12:57:19.055+05:30"
+                                    jcr:lastModifiedBy="admin"
+                                    jcr:primaryType="nt:unstructured"
+                                    jcr:title="Terms And Conditions"
+                                    sling:resourceType="forms-components-examples/components/form/termsandconditions"
+                                    fieldType="panel"
+                                    name="termsandconditions1694417240084"
+                                    wrapData="{Boolean}true">
+                                    <text
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="\0"
+                                        sling:resourceType="core/fd/components/form/text/v1/text"
+                                        fieldType="plain-text"
+                                        hideTitle="true"
+                                        name="consenttext"
+                                        value="Text related to the terms and conditions come here"/>
+                                    <approvalcheckbox
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="I agree to the terms &amp; conditions"
+                                        sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
+                                        checkedValue="true"
+                                        enabled="false"
+                                        fieldType="checkbox"
+                                        name="approvalcheckbox">
+                                        <fd:events
+                                            jcr:primaryType="nt:unstructured"
+                                            custom_scrollDone="\{enabled: true()}"
+                                            custom_scrollInitialized="\{enabled: false()}"/>
+                                    </approvalcheckbox>
+                                    <link
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="\0"
+                                        sling:resourceType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+                                        enum="['yourlink']"
+                                        enumNames="[label for the link]"
+                                        fieldType="checkbox-group"
+                                        name="link1694418075696"
+                                        orientation="vertical"
+                                        title="I agree to the terms &amp; conditions">
+                                        <fd:rules
+                                            jcr:primaryType="nt:unstructured"
+                                            validationStatus="valid"/>
+                                        <fd:events
+                                            jcr:primaryType="nt:unstructured"
+                                            change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
+                                    </link>
+                                </termsandconditions>
+                            </container>
+                        </guideContainer>
+                    </component>
+                    <info
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="core-components-examples/components/tabs">
+                        <properties
+                            cq:panelTitle="Properties"
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="core-components-examples/components/demo/properties"
+                            reference="../../component/guideContainer/container"/>
+                        <markup
+                            cq:panelTitle="Markup"
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="core-components-examples/components/demo/markup"
+                            reference="../../component/guideContainer/container"/>
+                        <json
+                            cq:panelTitle="JSON"
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="core-components-examples/components/demo/json"
+                            reference="../../component/guideContainer/container"/>
+                    </info>
+                </demo>
+            </responsivegrid>
+        </root>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/.content.xml
new file mode 100755
index 0000000000..7256712059
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/.content.xml
@@ -0,0 +1,7 @@
+<?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"
+    lcFolder="{Long}0"
+    type="lcFolder"
+/>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/basic/.content.xml
new file mode 100755
index 0000000000..109206d96b
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/termsandconditions/basic/.content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="dam:Asset">
+    <jcr:content
+        jcr:lastModified="{Date}2021-12-02T15:12:59.947+05:30"
+        jcr:primaryType="dam:AssetContent"
+        sling:resourceType="fd/fm/af/render"
+        guide="1"
+        type="guide">
+        <metadata
+            fd:version="2.1"
+            jcr:primaryType="nt:unstructured"
+            allowedRenderFormat="HTML"
+            author="admin"
+            availableInMobileApp="{Boolean}false"
+            dorType="none"
+            formmodel="none"
+            hasCustomThumbnail="{Boolean}false"
+            title="Adaptive Form V2 (IT)"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/.content.xml
new file mode 100644
index 0000000000..3edadd6c63
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder"
+    hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
new file mode 100644
index 0000000000..fc040d93fc
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/termsandconditions/basic/.content.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2023-09-25T12:26:37.911+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="tncform"
+        sling:configRef="/conf/forms/core-components-it/samples/text/tncform/"
+        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="tncform">
+            <termsandconditions
+                fd:tnc="{Boolean}true"
+                jcr:created="{Date}2023-09-20T17:27:33.234+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-09-20T17:27:33.234+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Terms And Conditions"
+                sling:resourceType="forms-components-examples/components/form/termsandconditions"
+                fieldType="panel"
+                name="termsandconditions1695211053616"
+                wrapData="{Boolean}true">
+                <text
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="\0"
+                    sling:resourceType="core/fd/components/form/text/v1/text"
+                    fieldType="plain-text"
+                    hideTitle="true"
+                    name="consenttext"
+                    value="Text related to the terms and conditions come here"/>
+                <approvalcheckbox
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="I agree to the terms &amp; conditions"
+                    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
+                    checkedValue="true"
+                    enabled="false"
+                    fieldType="checkbox"
+                    name="approvalcheckbox">
+                    <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        custom_scrollDone="\{enabled: true()}"
+                        custom_scrollInitialized="\{enabled: false()}"/>
+                </approvalcheckbox>
+                <link
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="\0"
+                    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
+                    enum="your-link-here"
+                    enumNames="[label for the link]"
+                    fieldType="checkbox-group"
+                    orientation="vertical"
+                    title="I agree to the terms &amp; conditions"
+                    type="string[]">
+                    <fd:rules
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                    <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
+                </link>
+            </termsandconditions>
+            <termsandconditions_2127535044
+                fd:tnc="{Boolean}true"
+                jcr:created="{Date}2023-09-20T17:27:37.601+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-09-20T17:27:51.862+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Terms And Conditions With Links"
+                sling:resourceType="forms-components-examples/components/form/termsandconditions"
+                enabled="{Boolean}true"
+                fieldType="panel"
+                hideTitle="false"
+                name="termsandconditions_21275350441695211057886"
+                readOnly="{Boolean}false"
+                showApprovalOption="true"
+                showLink="{Boolean}true"
+                textIsRich="[true,true]"
+                visible="{Boolean}true"
+                wrapData="{Boolean}true">
+                <text
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="\0"
+                    sling:resourceType="core/fd/components/form/text/v1/text"
+                    fieldType="plain-text"
+                    hideTitle="true"
+                    name="consenttext"
+                    value="Text related to the terms and conditions come here"/>
+                <approvalcheckbox
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="I agree to the terms &amp; conditions"
+                    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
+                    checkedValue="true"
+                    enabled="false"
+                    fieldType="checkbox"
+                    name="approvalcheckbox">
+                    <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        custom_scrollDone="\{enabled: true()}"
+                        custom_scrollInitialized="\{enabled: false()}"/>
+                </approvalcheckbox>
+                <link
+                    jcr:lastModified="{Date}2023-09-20T17:28:00.048+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
+                    enabled="{Boolean}true"
+                    enum="http://localhost"
+                    enumNames="label for the link"
+                    fieldType="checkbox-group"
+                    hideTitle="false"
+                    name="link1695211072051"
+                    orientation="vertical"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true]"
+                    title="I agree to the terms &amp; conditions"
+                    type="string[]"
+                    unboundFormElement="{Boolean}false"
+                    visible="{Boolean}true">
+                    <fd:rules
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                    <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
+                </link>
+            </termsandconditions_2127535044>
+            <termsandconditions_143203533
+                fd:tnc="{Boolean}true"
+                jcr:created="{Date}2023-09-25T12:26:21.805+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2023-09-25T12:26:37.891+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Terms And Conditions With Popup"
+                sling:resourceType="forms-components-examples/components/form/termsandconditions"
+                enabled="{Boolean}true"
+                fieldType="panel"
+                hideTitle="false"
+                name="popuptnc"
+                readOnly="{Boolean}false"
+                showApprovalOption="true"
+                showAsPopup="true"
+                showLink="{Boolean}false"
+                textIsRich="[true,true]"
+                visible="{Boolean}true"
+                wrapData="{Boolean}true">
+                <text
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="\0"
+                    sling:resourceType="core/fd/components/form/text/v1/text"
+                    fieldType="plain-text"
+                    hideTitle="true"
+                    name="consenttext"
+                    value="Text related to the terms and conditions come here"/>
+                <approvalcheckbox
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="I agree to the terms &amp; conditions"
+                    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
+                    checkedValue="true"
+                    enabled="false"
+                    fieldType="checkbox"
+                    name="approvalcheckbox">
+                    <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        custom_scrollDone="\{enabled: true()}"
+                        custom_scrollInitialized="\{enabled: false()}"/>
+                </approvalcheckbox>
+                <link
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="\0"
+                    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
+                    enum="your-link-here"
+                    enumNames="[label for the link]"
+                    fieldType="checkbox-group"
+                    orientation="vertical"
+                    title="I agree to the terms &amp; conditions"
+                    type="string[]">
+                    <fd:rules
+                        jcr:primaryType="nt:unstructured"
+                        validationStatus="valid"/>
+                    <fd:events
+                        jcr:primaryType="nt:unstructured"
+                        change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
+                </link>
+            </termsandconditions_143203533>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
index d123445537..513006b23f 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[core.forms.components.runtime.all]"
-    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v1.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v1.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime]"/>
+    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v1.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v1.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.termsandconditions.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
index f1d41e9b97..3c524e065c 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/checkboxgroup.html
@@ -14,6 +14,7 @@
   ~ 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.shortDescription="${renderer.shortDescriptionPath}"
@@ -34,27 +35,10 @@
      data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
      data-sly-test.widgetId="${'{0}-{1}' @ format=[checkboxgroup.id, 'widget']}">
     <div class="cmp-adaptiveform-checkboxgroup__label-container">
-      <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, labelRichText=checkboxgroup.label.richText, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
-      <div data-sly-call="${questionMark.questionMark @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+        <div data-sly-call="${label.label @componentId=widgetId, labelValue=checkboxgroup.label.value, labelVisible=checkboxgroup.label.visible, labelRichText=checkboxgroup.label.richText, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
+        <div data-sly-call="${questionMark.questionMark @componentId=checkboxgroup.id, longDescription=checkboxgroup.description, bemBlock='cmp-adaptiveform-checkboxgroup'}" data-sly-unwrap></div>
     </div>
-
-    <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.enumNamesAsTextContent[itemList.index].value @ context = checkboxgroup.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}</span>
-                </label>
-            </div>
-        </div>
-    </div>
-
+    <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>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
new file mode 100644
index 0000000000..211de57194
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup/widget.html
@@ -0,0 +1,33 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.enumNamesAsTextContent[itemList.index].value @ context = checkboxgroup.enumNamesAsTextContent[itemList.index].richText ? 'html' : 'text'}</span>
+        </label>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/.content.xml
new file mode 100644
index 0000000000..5e25fbe65e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured">
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml
new file mode 100644
index 0000000000..b18110bf47
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/.content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2022 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<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="article"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Terms and Conditions"
+    jcr:primaryType="cq:Component"
+    jcr:title="Terms and Conditions (v1)"
+    sling:resourceSuperType="wcm/foundation/components/responsivegrid"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/README.md
new file mode 100644
index 0000000000..94fee3b1f4
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/README.md
@@ -0,0 +1,85 @@
+<!--
+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.
+-->
+Adaptive Form Terms and Conditions (v1)
+====
+Adaptive Form Terms and Components field component written in HTL.
+
+## Features
+
+* It is composed of Text Field, CheckBox and CheckBox Groups
+* Allows to author a Terms & Conditions component with either links or Texts.
+* Comes with some OOTB behaviour like
+  * Approval Checkbox is not enabled if the text-area is scrollable and user has not scrolled to the bottom
+  * Approval Checkbox is not enabled if TnC uses Links and user has not visited all the links
+
+### Use Object
+The Form Text component uses the `com.adobe.cq.forms.core.components.models.form.TermsAndConditions` Sling Model for its Use-object.
+
+### Edit Dialog Properties
+The following properties are written to JCR for this Form Text component and are expected to be available as `Resource` properties:
+
+1. `./jcr:title` - defines the label to use for this field
+2. `./hideTitle` - if set to `true`, the label of this field will be hidden
+3. `./name` - defines the name of the field, which will be submitted with the form data
+4. `./default` - defines the default value of the field
+5. `./description` - defines a help message that can be rendered in the field as a hint for the user
+6. `./required` - if set to `true`, this field will be marked as required, not allowing the form to be submitted until the field has a value
+7. `./requiredMessage` - defines the message displayed as tooltip when submitting the form if the value is left empty
+8. `./readOnly` - if set to `true`, the filed will be read only
+9. `./showApprovalOption` - whether to show the approval checkbox or not
+10. `./showLink` - whether to show links instead of Text Content
+11. `./showAsPopup` - whether to show the TNC content as a Modal
+
+## Client Libraries
+The component provides a `core.forms.components.termsandconditions.v1.runtime` client library category that contains the Javascript runtime for the component.
+It should be added to a relevant site client library using the `embed` property.
+
+It also provides a `core.forms.components.termsandconditions.v1.editor` editor client library category that includes
+JavaScript handling for dialog interaction. It is already included by its edit dialog.
+
+## BEM Description
+```
+BLOCK cmp-adaptiveform-termsandcondition
+    ELEMENT cmp-adaptiveform-termsandcondition__label-container
+    ELEMENT cmp-adaptiveform-termsandcondition__label
+    ELEMENT cmp-adaptiveform-termsandcondition__questionmark
+    ELEMENT cmp-adaptiveform-termsandcondition__content-container
+      MODIFIER cmp-adaptiveform-termsandcondition__content-container--modal
+    ELEMENT cmp-adaptiveform-termsandcondition__body
+    ELEMENT cmp-adaptiveform-termsandcondition__header
+    ELEMENT cmp-adaptiveform-termsandcondition__close-button
+    ELEMENT cmp-adaptiveform-termsandcondition__content
+    ELEMENT cmp-adaptiveform-termsandcondition__text
+    ELEMENT cmp-adaptiveform-termsandcondition__text .cmp-adaptiveform-text
+    ELEMENT cmp-adaptiveform-termsandcondition__text-intersect
+    ELEMENT cmp-adaptiveform-termsandcondition__link
+    ELEMENT cmp-adaptiveform-termsandcondition__link .cmp-adaptiveform-checkboxgroup 
+    ELEMENT cmp-adaptiveform-termsandcondition__approvalcheckbox
+    ELEMENT cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox
+    ELEMENT cmp-adaptiveform-termsandcondition__shortdescription
+    ELEMENT cmp-adaptiveform-termsandcondition__longdescription
+    ELEMENT cmp-adaptiveform-termsandcondition__errormessage
+```
+
+
+
+## JavaScript Data Attribute Bindings
+
+The following attributes must be added for the initialization of the text-input component in the form view:
+1. `data-cmp-is="adaptiveFormTermsAndConditions"`
+2. `data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"`
+3. `data-cmp-visible` having a boolean value to indicate whether the field is currently visible or not
+4. `data-cmp-enabled` having a boolean value to indicate whether the field is currently enabled or not
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..975ff9051f
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_dialog/.content.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2022 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root
+  xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+  xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+  xmlns:cq="http://www.day.com/jcr/cq/1.0"
+  xmlns:jcr="http://www.jcp.org/jcr/1.0"
+  xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+  jcr:primaryType="nt:unstructured"
+  jcr:title="Adaptive Form Terms and Conditions"
+  sling:resourceType="cq/gui/components/authoring/dialog"
+  helpPath="https://www.adobe.com/go/aem_af_cmp_termsandconditions_v1"
+  trackingFeature="core-components:adaptiveform-termsandconditions:v1"
+  extraClientlibs="[core.forms.components.termsandconditions.v1.editor]">
+    <content
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/container"
+      granite:class="cmp-adaptiveform-termsandconditions__editdialog">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="granite/ui/components/coral/foundation/tabs"
+              maximized="{Boolean}true"
+              granite:class="cmp-adaptiveform-base__editdialogbasic">
+                <items jcr:primaryType="nt:unstructured">
+                    <basic
+                      jcr:primaryType="nt:unstructured"
+                      jcr:title="Basic"
+                      sling:resourceType="granite/ui/components/coral/foundation/container"
+                      margin="{Boolean}true">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                              jcr:primaryType="nt:unstructured"
+                              sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                              margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                      jcr:primaryType="nt:unstructured"
+                                      sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <name
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/name"/>
+                                            <title
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/title"/>
+                                            <showApprovalOption
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                              name="./showApprovalOption"
+                                              value="true"
+                                              text="Show approval options"
+                                              checked="{Boolean}true"
+                                              uncheckedValue="{Boolean}false"
+                                              granite:class="cmp-adaptiveform-termsandconditions__showapprovaloption" />
+                                            <showAsPopUp
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                              name="./showAsPopup"
+                                              value="true"
+                                              text="Show as a pop-up"
+                                              granite:class="cmp-adaptiveform-termsandconditions__showaspopup" />
+                                            <showAsLink
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/switch"
+                                              wrapperClass="cmp-adaptiveform-termsandconditions__showAsLink"
+                                              name="./showLink"
+                                              fieldLabel="Show Links and Hide Text Content"
+                                              fieldDescription="If unchecked, the default rendition will be text content."
+                                              uncheckedValue="false"
+                                              value="true">
+                                            </showAsLink>
+                                            <showAsLink-typehint
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                              name="./showLink@TypeHint"
+                                              value="Boolean"/>
+                                            <hideTitle
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/hideTitle"/>
+                                            <wrapData
+                                              granite:class="cmp-adaptiveform-panel__wrapData"
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                              name="./wrapData"
+                                              text="Group child components' data on form submission"
+                                              uncheckedValue="false"
+                                              value="true"/>
+                                            <wrapData-typehint
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                              name="./wrapData@TypeHint"
+                                              value="Boolean"/>
+                                            <bindref
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/bindref"/>
+                                            <visible
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/visible"/>
+                                            <visible-typehint
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/visible-typehint"/>
+                                            <enabled
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/enabled"/>
+                                            <enabled-typehint
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/enabled-typehint"/>
+                                            <readonly
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/readonly"/>
+                                            <readonly-typehint
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/include"
+                                              path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/basic/items/columns/items/column/items/readonly-typehint"/>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </basic>
+                    <help
+                      jcr:primaryType="nt:unstructured"
+                      sling:resourceType="granite/ui/components/coral/foundation/include"
+                      path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/help"/>
+                    <accessibility
+                      jcr:primaryType="nt:unstructured"
+                      sling:resourceType="granite/ui/components/coral/foundation/include"
+                      path="core/fd/components/form/panelcontainer/v1/panelcontainer/cq:dialog/content/items/tabs/items/accessibility"/>
+                    <dor
+                      jcr:primaryType="nt:unstructured"
+                      sling:resourceType="granite/ui/components/coral/foundation/include"
+                      path="core/fd/components/form/base/v1/base/cq:dialog/content/items/tabs/items/dor"/>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_editConfig.xml
new file mode 100755
index 0000000000..5eb7044978
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_editConfig.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
+      jcr:primaryType="cq:EditConfig"
+      cq:actions="[edit,-,copymove,delete,-,insert,-]"
+      cq:dialogMode="floating"
+      cq:layout="editbar"
+      cq:disableTargeting="{Boolean}true">
+    <cq:listeners
+        jcr:primaryType="cq:EditListenersConfig"
+        afterchildinsert="function(editable){Granite.author.responsive.EditableActions.REFRESH.execute(editable)}"/>
+    <cq:actionConfigs jcr:primaryType="nt:unstructured">
+        <editexpression
+                jcr:primaryType="nt:unstructured"
+                handler="CQ.FormsCoreComponents.editorhooks.openRuleEditor"
+                order="after CONFIGURE"
+                icon="bidRule"
+                text="Edit Rules"/>
+        <replace
+                jcr:primaryType="nt:unstructured"
+                handler="CQ.FormsCoreComponents.editorhooks.replace"
+                icon="shuffle"
+                text="Replace"/>
+    </cq:actionConfigs>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_template.xml
new file mode 100644
index 0000000000..95a10387e4
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/_cq_template.xml
@@ -0,0 +1,42 @@
+<?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="nt:unstructured"
+  jcr:title="Terms And Conditions"
+  fieldType="panel"
+  fd:tnc="{Boolean}true"
+  wrapData="{Boolean}true">
+  <text
+    name="consenttext"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="\0"
+    sling:resourceType="core/fd/components/form/text/v1/text"
+    fieldType="plain-text"
+    hideTitle="true"
+    value="Text related to the terms and conditions come here"/>
+  <approvalcheckbox
+    name="approvalcheckbox"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="I agree to the terms &amp; conditions"
+    sling:resourceType="core/fd/components/form/checkbox/v1/checkbox"
+    enabled="false"
+    checkedValue="true"
+    fieldType="checkbox">
+  </approvalcheckbox>
+  <link
+    jcr:primaryType="nt:unstructured"
+    jcr:title="\0"
+    sling:resourceType="core/fd/components/form/toggleablelink/v1/toggleablelink"
+    orientation="vertical"
+    type="string[]"
+    enum="your-link-here"
+    enumNames="[label for the link]"
+    fieldType="checkbox-group"
+    title="I agree to the terms &amp; conditions">
+    <fd:rules
+      jcr:primaryType="nt:unstructured"
+      validationStatus="valid"/>
+    <fd:events
+      jcr:primaryType="nt:unstructured"
+      change="[if(length($field.$value) == length($field.$enum)\, dispatchEvent($parent.approvalcheckbox\, 'custom:setProperty'\, {enabled : true()})\, {})]"/>
+  </link>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/.content.xml
new file mode 100644
index 0000000000..491392d539
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/.content.xml
new file mode 100644
index 0000000000..0c6786f297
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[core.forms.components.termsandconditions.v1.editor]"
+    dependencies="[core.forms.components.base.v1.editor, core.forms.components.commons.v1.editor.utils]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css.txt
new file mode 100644
index 0000000000..e31d85b9c6
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#base=css
+termsandconditions.css
\ No newline at end of file
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css/termsandconditions.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css/termsandconditions.css
new file mode 100644
index 0000000000..84f90bfe93
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/css/termsandconditions.css
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+
+.coral-Form-fieldwrapper.cmp-adaptiveform-termsandconditions__showAsLink {
+  display: flex;
+}
+.coral-Form-fieldwrapper.cmp-adaptiveform-termsandconditions__showAsLink label {
+  padding-right: 10px;
+}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js.txt
new file mode 100644
index 0000000000..f135f85471
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#base=js
+termsandconditions.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js/termsandconditions.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js/termsandconditions.js
new file mode 100644
index 0000000000..861011b7d1
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/editor/js/termsandconditions.js
@@ -0,0 +1,57 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+/* global jQuery */
+(function($) {
+    "use strict";
+
+    const Utils = window.CQ.FormsCoreComponents.Utils.v1,
+        EDIT_DIALOG = ".cmp-adaptiveform-termsandconditions__editdialog";
+
+    function handleToggleOfApprovalOptions(dialog) {
+        const approvalOption = dialog.find('.cmp-adaptiveform-termsandconditions__showapprovaloption[name="./showApprovalOption"]')[0];
+        const showAsPopupWidget = dialog.find('.cmp-adaptiveform-termsandconditions__showaspopup[name="./showAsPopup"]')[0];
+        let showAsPopup = dialog.find('.cmp-adaptiveform-termsandconditions__showaspopup[name="./showAsPopup"]')[0]['checked'];
+        function toggleApprovalOption(show) {
+            if (show) {
+                approvalOption.readOnly=false;
+                approvalOption.style.opacity = "1";
+            } else {
+                approvalOption.readOnly=true;
+                approvalOption.style.opacity = "0.5"
+            }
+        }
+        if (showAsPopup) {
+            if (!approvalOption.checked) {
+                approvalOption['checked']=true;
+            }
+            toggleApprovalOption(false);
+        }
+        showAsPopupWidget.addEventListener('click', function() {
+            showAsPopup = !showAsPopup;
+            if (showAsPopup) {
+                if (!approvalOption.checked) {
+                    approvalOption.click();
+                }
+                toggleApprovalOption(false);
+            } else {
+                toggleApprovalOption(true);
+            }
+        })
+    }
+
+    Utils.initializeEditDialog(EDIT_DIALOG)(handleToggleOfApprovalOptions);
+
+})(jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/.content.xml
new file mode 100644
index 0000000000..124dfb0e20
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[core.forms.components.termsandconditions.v1.runtime]"
+    dependencies="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css.txt
new file mode 100644
index 0000000000..468a1dcd56
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#base=css
+termsandconditions.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css/termsandconditions.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css/termsandconditions.css
new file mode 100644
index 0000000000..6cde69339f
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/css/termsandconditions.css
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+
+.cmp-adaptiveform-termsandcondition{
+
+}
+
+.cmp-adaptiveform-termsandcondition__label {
+
+}
+
+.cmp-adaptiveform-termsandcondition__content-container {
+
+}
+
+.cmp-adaptiveform-termsandcondition__content-container--modal {
+
+}
+.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__body{
+
+}
+.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__header{
+
+}
+.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__header h3{
+
+}
+
+
+.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__close-button {
+
+}
+
+.cmp-adaptiveform-termsandcondition__content-container--modal .cmp-adaptiveform-termsandcondition__content {
+
+}
+
+.cmp-adaptiveform-termsandcondition__text {
+
+}
+
+.cmp-adaptiveform-termsandcondition__link {
+
+}
+
+.cmp-adaptiveform-termsandcondition__approvalcheckbox .cmp-adaptiveform-checkbox__label{
+  cursor:pointer;
+}
+
+.cmp-adaptiveform-termsandcondition__approvalcheckbox {
+
+}
+
+
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js.txt
new file mode 100644
index 0000000000..6aa7350c9e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# 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.
+###############################################################################
+
+#base=js
+termsandconditionsview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js/termsandconditionsview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js/termsandconditionsview.js
new file mode 100644
index 0000000000..632f5c6aeb
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/clientlibs/runtime/js/termsandconditionsview.js
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+
+(function () {
+
+    class TermsAndConditions extends FormView.FormPanel {
+        static NS = FormView.Constants.NS;
+        static IS = "adaptiveFormTermsAndConditions";
+        static bemBlock = 'cmp-adaptiveform-termsandcondition';
+        static selectors = {
+            self: "[data-" + this.NS + '-is="' + this.IS + '"]',
+            label: `.${TermsAndConditions.bemBlock}__label`,
+            description: `.${TermsAndConditions.bemBlock}__longdescription`,
+            qm: `.${TermsAndConditions.bemBlock}__questionmark`,
+            tooltipDiv: `.${TermsAndConditions.bemBlock}__shortdescription`,
+            tncContentWrapper: `.${TermsAndConditions.bemBlock}__content-container`,
+            closePopupButton: `.${TermsAndConditions.bemBlock}__close-button`
+        };
+
+        constructor(params) {
+            super(params);
+            this.#handleScroll()
+        }
+
+        addChild(childView) {
+            super.addChild(childView);
+            if (childView.getModel()._jsonModel.fieldType === 'checkbox-group') {
+                this.#addLinkClickListener(childView);
+            }
+            if (childView.getModel()._jsonModel.fieldType === 'checkbox') {
+                this.#handlePopup(childView);
+            }
+        }
+
+        #addLinkClickListener(childView) {
+            childView.getWidgets().querySelectorAll('label').forEach((item) => {
+                const checkboxInput = item.querySelector('input');
+                item.querySelector('a').addEventListener('click', (e) => {
+                    checkboxInput.click();
+                })
+            })
+        }
+
+        #handleScroll() {
+            const intersection = this.element.querySelector('.cmp-adaptiveform-termsandcondition__text-intersect');
+            if (intersection) {
+                const self = this;
+                const io = new IntersectionObserver(onIntersection, {
+                    threshold: [1],
+                })
+                function onIntersection ([{isIntersecting}]) {
+                    if (isIntersecting) {
+                        self.children.filter(c => c.getModel()._jsonModel.fieldType === 'checkbox').forEach(cb => cb.updateEnabled(true))
+                        io.unobserve(intersection);
+                    }
+                }
+                io.observe(intersection)
+            }
+        }
+
+        #handlePopup(approvalCheckbox) {
+            const closePopUpBtn = this.getClosePopupButton();
+            if (closePopUpBtn) {
+                closePopUpBtn.addEventListener('click', () => {
+                    this.toggleAttribute(this.getContentDivWrapper(), false, 'data-cmp-visible', false);
+                })
+
+                approvalCheckbox.label.addEventListener('click', () => {
+                    const contentDiv = this.getContentDivWrapper();
+                    if (contentDiv) {
+                        this.toggleAttribute(this.getContentDivWrapper(), true, 'data-cmp-visible', false);
+                    }
+                })
+            }
+        }
+
+        getContentDivWrapper() {
+            return this.element.querySelector(TermsAndConditions.selectors.tncContentWrapper);
+        }
+
+        getClosePopupButton() {
+            return this.element.querySelector(TermsAndConditions.selectors.closePopupButton);
+        }
+
+        getWidget() {
+            return null;
+        }
+
+        getDescription() {
+            return this.element.querySelector(TermsAndConditions.selectors.description);
+        }
+
+        getLabel() {
+            return null;
+        }
+
+        getErrorDiv() {
+            return null;
+        }
+
+        getTooltipDiv() {
+            return this.element.querySelector(TermsAndConditions.selectors.tooltipDiv);
+        }
+
+        getQuestionMarkDiv() {
+            return this.element.querySelector(TermsAndConditions.selectors.qm);
+        }
+    }
+
+    FormView.Utils.setupField(({element, formContainer}) => {
+        return new TermsAndConditions({element, formContainer})
+    }, TermsAndConditions.selectors.self);
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
new file mode 100644
index 0000000000..df60f8e039
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.html
@@ -0,0 +1,60 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+
+<sly data-sly-use.tnc="com.adobe.cq.forms.core.components.models.form.TermsAndConditions"
+     data-sly-use.renderer="${'termsandconditions.js'}"
+     data-sly-use.label="${renderer.labelPath}"
+     data-sly-use.shortDescription="${renderer.shortDescriptionPath}"
+     data-sly-use.longDescription="${renderer.longDescriptionPath}"
+     data-sly-use.questionMark="${renderer.questionMarkPath}"
+     data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}">
+</sly>
+
+<div class="cmp-adaptiveform-termsandcondition"
+     data-cmp-is="adaptiveFormTermsAndConditions"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
+     id="${tnc.id}"
+     title="${tnc.tooltipVisible ? '' : tnc.tooltipText}"
+     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
+    <div class="cmp-adaptiveform-termsandcondition__label-container">
+        <div data-sly-call="${label.label @componentId=tnc.id, labelValue=tnc.label.value, labelVisible=tnc.label.visible, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
+        <div data-sly-call="${questionMark.questionMark @componentId=tnc.id, longDescription=tnc.description, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
+    </div>
+    <div class="cmp-adaptiveform-termsandcondition__content-container ${!wcmmode.edit && tnc.showAsPopup ? 'cmp-adaptiveform-termsandcondition__content-container--modal' : ''}"
+         data-cmp-visible="${tnc.showAsPopup ? 'false' : 'true'}">
+        <div class="cmp-adaptiveform-termsandcondition__body">
+            <div class="cmp-adaptiveform-termsandcondition__header" data-sly-test="${tnc.showAsPopup && !wcmmode.edit}">
+                <button type="button" class="cmp-adaptiveform-termsandcondition__close-button" >
+                    X
+                </button>
+                <h3>
+                    ${"Please review the terms and conditions" @ i18n, context='html'}
+                </h3>
+            </div>
+            <div class="cmp-adaptiveform-termsandcondition__content">
+                <div data-sly-test="${!tnc.showLink}" class="cmp-adaptiveform-termsandcondition__text">
+                    <div  data-sly-resource="${'text'}"></div>
+                    <div class="cmp-adaptiveform-termsandcondition__text-intersect"></div>
+                </div>
+                <div class="cmp-adaptiveform-termsandcondition__link" data-sly-test="${tnc.showLink}" data-sly-resource="${'link'}"></div>
+            </div>
+        </div>
+    </div>
+    <div class="cmp-adaptiveform-termsandcondition__approvalcheckbox"  data-sly-test="${tnc.showApprovalOption}"  data-sly-resource="${'approvalcheckbox'}"></div>
+    <div data-sly-call="${shortDescription.shortDescription @componentId=tnc.id, shortDescriptionVisible=tnc.tooltipVisible, shortDescription=tnc.tooltip, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
+    <div data-sly-call="${longDescription.longDescription @componentId=tnc.id, longDescription=tnc.description, bemBlock='cmp-adaptiveform-termsandcondition'}" data-sly-unwrap></div>
+</div>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.js
new file mode 100644
index 0000000000..e7bcebd928
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/termsandconditions/v1/termsandconditions/termsandconditions.js
@@ -0,0 +1,29 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+use(function () {
+
+  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";
+  return {
+    labelPath: labelPath,
+    shortDescriptionPath: shortDescriptionPath,
+    longDescriptionPath: longDescriptionPath,
+    questionMarkPath: questionMarkPath
+  }
+});
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/.content.xml
new file mode 100644
index 0000000000..3977155bee
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/.content.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2022 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="sling:Folder"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/.content.xml
new file mode 100644
index 0000000000..69774ca1cc
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/.content.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<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">
+    <toggleablelink/>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml
new file mode 100644
index 0000000000..0d0d725d7c
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<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="panel"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Toggleable Links"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Toggleable Link (v1)"
+    sling:resourceSuperType="core/fd/components/form/checkboxgroup/v1/checkboxgroup"
+    componentGroup=".hidden"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..9bbce859e2
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_dialog/.content.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Adaptive Form Toggleable Link field"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[core.forms.components.checkboxgroup.v1.editor]">
+    <content
+        granite:class="cmp-adaptiveform-checkboxgroup__editdialog"
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs jcr:primaryType="nt:unstructured"
+              sling:resourceType="granite/ui/components/coral/foundation/tabs"
+              maximized="{Boolean}true">
+                <items jcr:primaryType="nt:unstructured">
+                    <basic
+                      jcr:primaryType="nt:unstructured"
+                      jcr:title="Basic"
+                      sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <columns
+                              jcr:primaryType="nt:unstructured"
+                              sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns"
+                              margin="{Boolean}true">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <column
+                                      jcr:primaryType="nt:unstructured"
+                                      sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <placeholder
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:hideResource="{Boolean}true" />
+                                            <type
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:hideResource="{Boolean}true" />
+                                            <value
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:hideResource="{Boolean}true" />
+                                            <alignment
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:hideResource="{Boolean}true" />
+                                            <enums jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/container">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <enumOptions jcr:primaryType="nt:unstructured"
+                                                      sling:orderBefore="bindref"
+                                                      sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                                      fieldDescription="Enter the display text with link."
+                                                      fieldLabel="Links">
+                                                        <field jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/container"
+                                                          name="./enum">
+                                                            <items jcr:primaryType="nt:unstructured">
+                                                                <enum jcr:primaryType="nt:unstructured"
+                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                                  granite:class="cmp-adaptiveform-base__enum"
+                                                                  name="./enum"
+                                                                  fieldLabel="Link"
+                                                                  fieldDescription="Enter the link."
+                                                                  required="{Boolean}true"/>
+                                                                <enumNames
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                                  granite:class="cmp-adaptiveform-base__enumNames"
+                                                                  name="./enumNames"
+                                                                  fieldLabel="Display text"
+                                                                  fieldDescription="Specify the content to display in the adaptive form."
+                                                                  required="{Boolean}false"/>
+                                                            </items>
+                                                        </field>
+                                                    </enumOptions>
+                                                    <enumNames jcr:primaryType="nt:unstructured"
+                                                      sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                                      granite:hidden="true">
+                                                        <field jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                          name="./enumNames"
+                                                          granite:class="cmp-adaptiveform-base__enumNamesHidden"
+                                                          granite:hidden="true"/>
+                                                    </enumNames>
+                                                </items>
+                                            </enums>
+                                        </items>
+                                    </column>
+                                </items>
+                            </columns>
+                        </items>
+                    </basic>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_template.xml
new file mode 100644
index 0000000000..dbdb9ae264
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/_cq_template.xml
@@ -0,0 +1,8 @@
+<?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"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Adaptive Form Toggleable Link (v1)"
+    fieldType="checkbox-group"
+    type="string[]"
+    enum="[link]"
+    enumNames="[Your Link]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
new file mode 100644
index 0000000000..6fb3fca969
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/toggleablelink/v1/toggleablelink/widget.html
@@ -0,0 +1,34 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ 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"
+                 style="display: none;"
+                 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' : ''}"/>
+          <a class="cmp-adaptiveform-checkboxgroup__links" title="${checkboxgroup.enumNames[itemList.index]}" href="${checkboxgroup.enums[itemList.index].toString@context='uri'}" target="_blank">${checkboxgroup.enumNames[itemList.index]}</a>
+        </label>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/ui.frontend/src/index.js b/ui.frontend/src/index.js
index 99eed1aac0..5adb293738 100644
--- a/ui.frontend/src/index.js
+++ b/ui.frontend/src/index.js
@@ -15,7 +15,7 @@
  ******************************************************************************/
 import Utils from "./utils.js";
 import LanguageUtils from "./LanguageUtils.js";
-import {createFormInstance, FileObject, extractFileInfo, Click, Change, Submit, Blur, AddItem, RemoveItem} from "@aemforms/af-core";
+import {createFormInstance, FileObject, extractFileInfo, Click, Change, Submit, Blur, AddItem, RemoveItem, CustomEvent} from "@aemforms/af-core";
 import {FormField, FormContainer, FormFieldBase, FormPanel, FormTabs} from "./view/index.js";
 import {Constants} from "./constants.js";
 import GuideBridge from "./GuideBridge.js";
@@ -47,7 +47,7 @@ window.guideBridge = new GuideBridge();
  * @property {string} RemoveItem - The action for removing an item.
  */
 const Actions = {
-    Click, Change, Submit, Blur, AddItem, RemoveItem
+    Click, Change, Submit, Blur, AddItem, RemoveItem, CustomEvent
 }
 
 /**
diff --git a/ui.tests/test-module/libs/commons/formsConstants.js b/ui.tests/test-module/libs/commons/formsConstants.js
index a54b572f16..b5f6c015bf 100644
--- a/ui.tests/test-module/libs/commons/formsConstants.js
+++ b/ui.tests/test-module/libs/commons/formsConstants.js
@@ -46,6 +46,7 @@ var formsConstants = {
                 "checkbox": "/apps/forms-components-examples/components/form/checkbox",
                 "fragment": "/apps/forms-components-examples/components/form/fragment",
                 "fragmentcontainer": "/apps/forms-components-examples/components/form/fragmentcontainer",
+                "termsandconditions": "/apps/forms-components-examples/components/form/termsandconditions"
             }
         },
         resourceType : {
diff --git a/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js b/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
new file mode 100644
index 0000000000..b61902f585
--- /dev/null
+++ b/ui.tests/test-module/specs/termsandconditions/tnc.authoring.spec.js
@@ -0,0 +1,113 @@
+/*
+ *  Copyright 2022 Adobe Systems Incorporated
+ *
+ *  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.
+ */
+
+
+const sitesSelectors = require('../../libs/commons/sitesSelectors'),
+    afConstants = require('../../libs/commons/formsConstants');
+
+/**
+ * Testing Terms and Conditions with Sites Editor
+ */
+describe('Page - Authoring', function () {
+
+
+  const dropTnCInSites = function() {
+    const dataPath = "/content/core-components-examples/library/adaptive-form/termsandconditions/jcr:content/root/responsivegrid/demo/component/guideContainer/*",
+        responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
+    cy.selectLayer("Edit");
+    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Terms And Conditions", afConstants.components.forms.resourceType.termsandconditions);
+    cy.get('body').click( 0,0);
+  };
+
+  const dropTncInContainer = function() {
+    const dataPath = "/content/forms/af/core-components-it/blank/jcr:content/guideContainer/*",
+        responsiveGridDropZoneSelector = sitesSelectors.overlays.overlay.component + "[data-path='" + dataPath + "']";
+    cy.selectLayer("Edit");
+    cy.insertComponent(responsiveGridDropZoneSelector, "Adaptive Form Terms And Conditions", afConstants.components.forms.resourceType.termsandconditions);
+    cy.get('body').click(0, 0);
+  }
+
+  const testTncBehaviour = function (tncEditPathSelector, tncDrop, isSites) {
+    if (isSites) {
+      dropTnCInSites();
+    } else {
+      dropTncInContainer();
+    }
+    cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + tncEditPathSelector);
+    cy.invokeEditableAction("[data-action='CONFIGURE']"); // this line is causing frame busting which is causing cypress to fail
+    cy.get("[name='./name']")
+    .should("exist");
+
+    cy.get("coral-checkbox[name='./showApprovalOption']")
+      .should('have.attr', 'checked');
+
+    cy.get("input[name='./showApprovalOption']")
+      .click().then(e => {
+      cy.get("input[name='./showAsPopup']").click()
+        .then(e => {
+          cy.get("coral-checkbox[name='./showApprovalOption']")
+          .should('have.attr', 'checked');
+        })
+    })
+
+    cy.get('.cq-dialog-cancel').click();
+    cy.deleteComponentByPath(tncDrop);
+  }
+
+  // ***** //
+
+  context('Open Forms Editor', function() {
+    const pagePath = "/content/forms/af/core-components-it/blank",
+        tncEditPath = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/termsandconditions",
+        tncEditPathSelector = "[data-path='" + tncEditPath + "']",
+        tncDrop = pagePath + afConstants.FORM_EDITOR_FORM_CONTAINER_SUFFIX + "/" + afConstants.components.forms.resourceType.termsandconditions.split("/").pop();
+
+    beforeEach(function () {
+      // this is done since cypress session results in 403 sometimes
+      cy.openAuthoring(pagePath);
+    });
+
+    it('insert TnC in form container', function () {
+      dropTncInContainer();
+      cy.deleteComponentByPath(tncDrop);
+    });
+
+    it('Test TnC authoring behaviour', function() {
+      testTncBehaviour(tncEditPathSelector, tncDrop, false);
+    });
+  })
+
+  context('Open Sites Editor', function() {
+    const pagePath = "/content/core-components-examples/library/adaptive-form/termsandconditions",
+        tncEditPath = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + "/guideContainer/termsandconditions",
+        tncDrop = pagePath + afConstants.RESPONSIVE_GRID_DEMO_SUFFIX + '/guideContainer/' + afConstants.components.forms.resourceType.termsandconditions.split("/").pop(),
+        tncEditPathSelector = "[data-path='" + tncEditPath + "']";
+
+    beforeEach(function () {
+      // this is done since cypress session results in 403 sometimes
+      cy.openAuthoring(pagePath);
+    });
+
+    it('insert aem forms TnC', function () {
+      dropTnCInSites();
+      cy.deleteComponentByPath(tncDrop);
+    });
+
+    it('Test TnC authoring behaviour', function() {
+      testTncBehaviour(tncEditPathSelector, tncDrop, true);
+    });
+  })
+});
diff --git a/ui.tests/test-module/specs/termsandconditions/tnc.runtime.spec.js b/ui.tests/test-module/specs/termsandconditions/tnc.runtime.spec.js
new file mode 100644
index 0000000000..017b060a3f
--- /dev/null
+++ b/ui.tests/test-module/specs/termsandconditions/tnc.runtime.spec.js
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright 2022 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+describe("Form Runtime with Terms and Conditions", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/termsandconditions/basic.html",
+        externalPagePathSubmit="content/forms/af/core-components-it/samples/termsandconditions/submissiontest.html"
+    const bemBlock = 'cmp-adaptiveform-termsandcondition'
+    const IS = "adaptiveFormTermsAndConditions"
+    const selectors = {
+        tnc : `[data-cmp-is="${IS}"]`
+    }
+
+    let formContainer = null
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        })
+    });
+
+    const checkHTML = (id, state, view, count) => {
+        const visible = state.visible;
+        const passVisibleCheck = `${visible === true ? "" : "not."}be.visible`;
+        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());
+        expect(state.items.length, "model has children equal to count").to.equal(2);
+        expect(view.children.length, "tab has children equal to count").to.equal(2); // this is because at any given point, either links are shown or text content is shown
+        return cy.get(`#${id}`);
+    };
+
+    it(" should get model and view initialized properly and parent child relationship is set ", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+        const fields = formContainer.getAllFields();
+        Object.entries(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 tncId = formContainer._model.items[0].id
+        const model = formContainer._model.getElement(tncId)
+        const tabView = formContainer.getAllFields()[tncId];
+        const count = 2;
+        checkHTML(model.id, model.getState(), tabView, count).then(() => {
+            model.visible = false;
+            return checkHTML(model.id, model.getState(), tabView, count);
+        }).then(() => {
+            model.enable = false;
+            return checkHTML(model.id, model.getState(), tabView, count);
+        });
+    });
+
+
+    it("OOTB behaviour -> should enable approval checkbox only if links visited", () => {
+        const tncWithLinksID = formContainer._model.items[1].id;
+        const model = formContainer._model.getElement(tncWithLinksID)
+        expect(model.getState().items[0].enabled).to.equal(false);
+        cy.get(`#${tncWithLinksID}`).get('a').click()
+        .then(() => {
+            expect(model.getState().items[0].enabled).to.equal(true);
+        })
+
+    });
+
+    it("OOTB behaviour -> should have show popup", () => {
+        const tncWithPopup = formContainer._model.items[2].id;
+        const model = formContainer._model.getElement(tncWithPopup)
+        cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
+        .should('have.class', 'cmp-adaptiveform-termsandcondition__content-container--modal')
+        .invoke('attr', 'data-cmp-visible').should('eq', 'false')
+        expect(model.getState().items[1].enabled).to.equal(false);
+        cy.get(`#${tncWithPopup} .cmp-adaptiveform-checkbox__widget-container label`).click()
+        .then(() => {
+            // this test will also verify scrollDone scenario
+            cy.get(`#${tncWithPopup} .cmp-adaptiveform-checkbox`).invoke('attr', 'data-cmp-enabled')
+            .should('eq', 'true')
+
+            cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
+            .invoke('attr', 'data-cmp-visible').should('not.exist');
+            cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__close-button`).click()
+            .then(() => {
+                cy.get(`#${tncWithPopup} .cmp-adaptiveform-termsandcondition__content-container`)
+                .invoke('attr', 'data-cmp-visible').should('eq', 'false', );
+            })
+        })
+    });
+})
+