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 5d7c410231..86b1df5de4 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
@@ -146,4 +146,13 @@ private FormConstants() {
     /** The resource type for date time input field v1 */
     public static final String RT_FD_FORM_DATETIME_V1 = RT_FD_FORM_PREFIX + "datetime/v1/datetime";
 
+    /** The resource type for signature step v1 */
+    public static final String RT_FD_FORM_SIGNATURE_STEP_V1 = RT_FD_FORM_PREFIX + "signaturestep/v1/signaturestep";
+
+    /** The resource type for summary step v1 */
+    public static final String RT_FD_FORM_SUMMARY_STEP_V1 = RT_FD_FORM_PREFIX + "summarystep/v1/summarystep";
+
+    /** The resource type for Adobe Sign block v1 */
+    public static final String RT_FD_FORM_ADOBE_SIGN_BLOCK_V1 = RT_FD_FORM_PREFIX + "adobesignblock/v1/adobesignblock";
+
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SignatureStepImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SignatureStepImpl.java
new file mode 100644
index 0000000000..0a11b38956
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SignatureStepImpl.java
@@ -0,0 +1,111 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+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 org.jetbrains.annotations.Nullable;
+
+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.SignatureStep;
+import com.adobe.cq.forms.core.components.util.AbstractBaseImpl;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { SignatureStep.class, ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_SIGNATURE_STEP_V1 })
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class SignatureStepImpl extends AbstractBaseImpl implements SignatureStep {
+
+    static final String PROP_SIGNING_SERVICE = "signingService";
+    static final String PROP_CLOUD_SERVICE_CONFIG = "cq:cloudserviceconfigs";
+    static final String PROP_DISPLAY_MSG = "displayMsg";
+    static final String PROP_TARGET_VERSION = "fd:targetVersion";
+
+    static final String DEFAULT_SIGNING_SERVICE = "echosign";
+    static final String DEFAULT_DISPLAY_MSG = "";
+    static final String DEFAULT_TARGET_VERSION = "";
+
+    static final String VIEW_TYPE_SIGNATURE_STEP = "signature-step";
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PROP_SIGNING_SERVICE)
+    @Default(values = DEFAULT_SIGNING_SERVICE)
+    private String signingService;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PROP_CLOUD_SERVICE_CONFIG)
+    @Nullable
+    private String cloudServiceConfig;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PROP_DISPLAY_MSG)
+    @Nullable
+    private String displayMsg;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PROP_TARGET_VERSION)
+    @Nullable
+    private String targetVersion;
+
+    @Override
+    public String getSigningService() {
+        return signingService;
+    }
+
+    @Override
+    public String getCloudServiceConfig() {
+        return cloudServiceConfig != null ? cloudServiceConfig : "";
+    }
+
+    @Override
+    public String getDisplayMsg() {
+        return displayMsg;
+    }
+
+    @Override
+    public String getTargetVersion() {
+        return targetVersion;
+    }
+
+    @Override
+    public String getFieldType() {
+        return super.getFieldType(FieldType.PLAIN_TEXT);
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getProperties() {
+        Map<String, Object> properties = super.getProperties();
+        properties.put("fd:signingService", getSigningService());
+        if (!getCloudServiceConfig().isEmpty()) {
+            properties.put("fd:cloudServiceConfig", getCloudServiceConfig());
+        }
+        if (getDisplayMsg() != null) {
+            properties.put("fd:displayMsg", getDisplayMsg());
+        }
+        if (getTargetVersion() != null && !getTargetVersion().isEmpty()) {
+            properties.put("fd:targetVersion", getTargetVersion());
+        }
+        return properties;
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SummaryStepImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SummaryStepImpl.java
new file mode 100644
index 0000000000..8cd1d1274e
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SummaryStepImpl.java
@@ -0,0 +1,81 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+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 org.jetbrains.annotations.Nullable;
+
+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.SummaryStep;
+import com.adobe.cq.forms.core.components.util.AbstractBaseImpl;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { SummaryStep.class, ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_SUMMARY_STEP_V1 })
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class SummaryStepImpl extends AbstractBaseImpl implements SummaryStep {
+
+    static final String PROP_DISPLAY_MSG = "displayMsg";
+    static final String PROP_AUTO_SUBMIT = "autoSubmit";
+
+    static final String VIEW_TYPE_SUMMARY_STEP = "summary-step";
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PROP_DISPLAY_MSG)
+    @Nullable
+    private String displayMsg;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PROP_AUTO_SUBMIT)
+    @Default(booleanValues = true)
+    private boolean autoSubmit;
+
+    @Override
+    public String getDisplayMsg() {
+        return displayMsg;
+    }
+
+    @Override
+    public boolean isAutoSubmit() {
+        return autoSubmit;
+    }
+
+    @Override
+    public String getFieldType() {
+        return super.getFieldType(FieldType.PLAIN_TEXT);
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getProperties() {
+        Map<String, Object> properties = super.getProperties();
+        if (getDisplayMsg() != null) {
+            properties.put("fd:displayMsg", getDisplayMsg());
+        }
+        properties.put("fd:autoSubmit", isAutoSubmit());
+        return properties;
+    }
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TextImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TextImpl.java
index de6d93342a..16bcf358e6 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TextImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/TextImpl.java
@@ -15,6 +15,7 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.models.v1.form;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Default;
@@ -37,20 +38,31 @@
     adaptables = { SlingHttpServletRequest.class, Resource.class },
     adapters = { Text.class,
         ComponentExporter.class },
-    resourceType = { FormConstants.RT_FD_FORM_TEXT_DRAW_V1 })
+    resourceType = {
+        FormConstants.RT_FD_FORM_TEXT_DRAW_V1,
+        FormConstants.RT_FD_FORM_ADOBE_SIGN_BLOCK_V1 })
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public class TextImpl extends AbstractFormComponentImpl implements Text {
 
+    private static final String PN_LEGACY_VALUE = "_value";
+
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_TEXT_IS_RICH)
     @Default(booleanValues = false)
     private boolean textIsRich;
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_LEGACY_VALUE)
+    private String legacyValue;
+
     @SlingObject
     private Resource resource;
 
     @Override
     public String getValue() {
-        return translate("value", value);
+        String resolvedValue = translate("value", value);
+        if (StringUtils.isBlank(resolvedValue) && StringUtils.isNotBlank(legacyValue)) {
+            return legacyValue;
+        }
+        return resolvedValue;
     }
 
     @Override
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
index ee8580198c..e6194a39c6 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
@@ -15,6 +15,7 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.models.v2.form;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -88,6 +89,30 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     private static final String FD_DATA_URL = "fd:dataUrl";
     private static final String FD_VIEW_PRINT_PATH = "fd:view/print";
     private static final String EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden";
+    private static final String PN_USE_SIGNED_PDF = "_useSignedPdf";
+    private static final String PN_SIGNER_INFO = "signerInfo";
+    private static final String PN_FIRST_SIGNER_FORM_FILLER = "firstSignerFormFiller";
+    private static final String PN_SIGN_CONFIG_PATH = "signConfigPath";
+    private static final String PN_WORKFLOW_TYPE = "workflowType";
+    private static final String PN_DAYS_UNTIL_SIGNING_DEADLINE = "daysUntilSigningDeadline";
+    private static final String PN_SIGNERS = "signers";
+    private static final String PN_SIGNER_TITLE = "signerTitle";
+    private static final String PN_IS_FORM_FILLER = "isFormFiller";
+    private static final String PN_SIGNER_EMAIL_TYPE = "signerEmailType";
+    private static final String PN_SIGNER_EMAIL_REF = "signerEmailRef";
+    private static final String PN_SIGNER_EMAIL = "signerEmail";
+    private static final String PN_AUTHENTICATION_METHOD = "authenticationMethod";
+    private static final String PN_COUNTRY_CODE_SOURCE = "countryCodeSource";
+    private static final String PN_COUNTRY_CODE = "countryCode";
+    private static final String PN_PHONE_SOURCE = "phoneSource";
+    private static final String PN_PHONE = "phone";
+    private static final String PN_SIGNATURE_TYPE = "signatureType";
+    private static final String FD_USE_SIGNED_PDF = "fd:useSignedPdf";
+    private static final String FD_IS_FORM_FILLER_FIRST_SIGNER = "fd:isFormFillerFirstSigner";
+    private static final String FD_SIGNING_CLOUD_SERVICE = "fd:signingCloudService";
+    private static final String FD_WORKFLOW_TYPE = "fd:workflowType";
+    private static final String FD_DAYS_UNTIL_SIGNING_DEADLINE = "fd:daysUntilSigningDeadline";
+    private static final String FD_SIGNERS = "fd:signers";
 
     /** Constant representing email submit action type */
     private static final String SS_EMAIL = "email";
@@ -159,6 +184,16 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     @Self(injectionStrategy = InjectionStrategy.OPTIONAL)
     private AutoSaveConfiguration autoSaveConfig;
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_USE_SIGNED_PDF)
+    @Default(booleanValues = false)
+    private boolean useSignedPdf;
+
+    private boolean formFillerFirstSigner = false;
+    private String signingCloudService = null;
+    private String workflowType = "SEQUENTIAL";
+    private int daysUntilSigningDeadline = 1;
+    private List<Map<String, Object>> signers = new ArrayList<>();
+
     @Inject
     private ResourceResolver resourceResolver;
 
@@ -199,6 +234,52 @@ private void initExcludeFromDoRIfHidden() {
         }
     }
 
+    @PostConstruct
+    private void initSignerInfo() {
+        Resource signerInfoResource = resource.getChild(PN_SIGNER_INFO);
+        if (signerInfoResource != null) {
+            ValueMap vm = signerInfoResource.getValueMap();
+            formFillerFirstSigner = vm.get(PN_FIRST_SIGNER_FORM_FILLER, false);
+            signingCloudService = vm.get(PN_SIGN_CONFIG_PATH, String.class);
+            workflowType = vm.get(PN_WORKFLOW_TYPE, "SEQUENTIAL");
+            daysUntilSigningDeadline = vm.get(PN_DAYS_UNTIL_SIGNING_DEADLINE, 1);
+            Resource signersResource = signerInfoResource.getChild(PN_SIGNERS);
+            if (signersResource != null) {
+                for (Resource signerItem : signersResource.getChildren()) {
+                    ValueMap signerVm = signerItem.getValueMap();
+                    Map<String, Object> signerMap = new LinkedHashMap<>();
+
+                    String title = signerVm.get(PN_SIGNER_TITLE, String.class);
+                    String isFormFillerVal = signerVm.get(PN_IS_FORM_FILLER, "true");
+                    String emailType = signerVm.get(PN_SIGNER_EMAIL_TYPE, "fromForm");
+                    String emailRef = signerVm.get(PN_SIGNER_EMAIL_REF, String.class);
+                    String signerEmail = signerVm.get(PN_SIGNER_EMAIL, String.class);
+                    String authMethod = signerVm.get(PN_AUTHENTICATION_METHOD, "NONE");
+                    String countryCodeSource = signerVm.get(PN_COUNTRY_CODE_SOURCE, "form");
+                    String countryCode = signerVm.get(PN_COUNTRY_CODE, String.class);
+                    String phoneSource = signerVm.get(PN_PHONE_SOURCE, "form");
+                    String phone = signerVm.get(PN_PHONE, String.class);
+                    String sigType = signerVm.get(PN_SIGNATURE_TYPE, "ESIGN");
+
+                    if (title != null) signerMap.put(PN_SIGNER_TITLE, title);
+                    signerMap.put(PN_IS_FORM_FILLER, Boolean.parseBoolean(isFormFillerVal));
+                    signerMap.put(PN_SIGNER_EMAIL_TYPE, emailType);
+                    if (emailRef != null) signerMap.put(PN_SIGNER_EMAIL_REF, emailRef);
+                    if (signerEmail != null) signerMap.put(PN_SIGNER_EMAIL, signerEmail);
+                    signerMap.put(PN_AUTHENTICATION_METHOD, authMethod);
+                    if ("PHONE".equals(authMethod)) {
+                        signerMap.put(PN_COUNTRY_CODE_SOURCE, countryCodeSource);
+                        if (countryCode != null) signerMap.put(PN_COUNTRY_CODE, countryCode);
+                        signerMap.put(PN_PHONE_SOURCE, phoneSource);
+                        if (phone != null) signerMap.put(PN_PHONE, phone);
+                    }
+                    signerMap.put(PN_SIGNATURE_TYPE, sigType);
+                    signers.add(signerMap);
+                }
+            }
+        }
+    }
+
     @Override
     public void setContextPath(String contextPath) {
         this.contextPath = contextPath;
@@ -420,6 +501,18 @@ public String getLanguageDirection() {
         if (submitProperties != null && !submitProperties.isEmpty()) {
             properties.put(ReservedProperties.FD_SUBMIT_PROPERTIES, submitProperties);
         }
+        if (isAdobeSignEnabled()) {
+            properties.put(FD_USE_SIGNED_PDF, true);
+            properties.put(FD_IS_FORM_FILLER_FIRST_SIGNER, isFormFillerFirstSigner());
+            if (signingCloudService != null) {
+                properties.put(FD_SIGNING_CLOUD_SERVICE, signingCloudService);
+            }
+            properties.put(FD_WORKFLOW_TYPE, workflowType);
+            properties.put(FD_DAYS_UNTIL_SIGNING_DEADLINE, daysUntilSigningDeadline);
+            if (!signers.isEmpty()) {
+                properties.put(FD_SIGNERS, signers);
+            }
+        }
         return properties;
     }
 
@@ -488,6 +581,18 @@ public AutoSaveConfiguration getAutoSaveConfig() {
         return autoSaveConfig;
     }
 
+    @JsonIgnore
+    @Override
+    public boolean isAdobeSignEnabled() {
+        return useSignedPdf;
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean isFormFillerFirstSigner() {
+        return formFillerFirstSigner;
+    }
+
     private Map<String, Object> getSubmitProperties() {
 
         Map<String, Object> submitProps = null;
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java
index a617157c7b..20396013f5 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java
@@ -402,4 +402,28 @@ default AutoSaveConfiguration getAutoSaveConfig() {
         return null;
     }
 
+    /**
+     * Returns whether Adobe Sign (echosign) is enabled for this form.
+     * Reads the {@code _useSignedPdf} JCR property on the form container node.
+     *
+     * @return {@code true} if Adobe Sign is enabled, {@code false} otherwise
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.5
+     */
+    @JsonIgnore
+    default boolean isAdobeSignEnabled() {
+        return false;
+    }
+
+    /**
+     * Returns whether the form filler is the first signer in the Adobe Sign workflow.
+     * Reads the {@code firstSignerFormFiller} property from the {@code signerInfo} child resource.
+     *
+     * @return {@code true} if the form filler is the first signer, {@code false} otherwise
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.5
+     */
+    @JsonIgnore
+    default boolean isFormFillerFirstSigner() {
+        return false;
+    }
+
 }
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/SignatureStep.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/SignatureStep.java
new file mode 100644
index 0000000000..b4267e1445
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/SignatureStep.java
@@ -0,0 +1,66 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.models.form;
+
+import org.osgi.annotation.versioning.ConsumerType;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Defines the {@code SignatureStep} Sling Model used for the
+ * {@code /apps/core/fd/components/form/signaturestep} component.
+ *
+ * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+ */
+@ConsumerType
+public interface SignatureStep extends Base {
+
+    /**
+     * Returns the signing service configured for this step (e.g. "echosign" for Adobe Sign).
+     *
+     * @return the signing service identifier
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+     */
+    @JsonIgnore
+    String getSigningService();
+
+    /**
+     * Returns the Adobe Sign cloud service configuration path.
+     *
+     * @return cloud service config path, or empty string if not configured
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+     */
+    @JsonIgnore
+    String getCloudServiceConfig();
+
+    /**
+     * Returns the template message displayed inside the signing area.
+     *
+     * @return display message, or {@code null} if not set
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+     */
+    @JsonIgnore
+    String getDisplayMsg();
+
+    /**
+     * Returns the Adobe Sign agreement target version.
+     *
+     * @return target version string, or {@code null} if not set
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+     */
+    @JsonIgnore
+    String getTargetVersion();
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/SummaryStep.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/SummaryStep.java
new file mode 100644
index 0000000000..bd16ac34b7
--- /dev/null
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/SummaryStep.java
@@ -0,0 +1,48 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.models.form;
+
+import org.osgi.annotation.versioning.ConsumerType;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Defines the {@code SummaryStep} Sling Model used for the
+ * {@code /apps/core/fd/components/form/summarystep} component.
+ *
+ * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+ */
+@ConsumerType
+public interface SummaryStep extends Base {
+
+    /**
+     * Returns the rich-text summary message displayed after form submission.
+     *
+     * @return HTML display message, or {@code null} if not set
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+     */
+    @JsonIgnore
+    String getDisplayMsg();
+
+    /**
+     * Returns whether the form should be auto-submitted when this step is reached.
+     *
+     * @return {@code true} if auto-submit is enabled
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.4
+     */
+    @JsonIgnore
+    boolean isAutoSubmit();
+}
diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
index 28bc21d5c0..f2979e29a1 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java
@@ -35,7 +35,7 @@
  * </p>
  */
 
-@Version("5.12.3")
+@Version("5.12.5")
 package com.adobe.cq.forms.core.components.models.form;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SignatureStepImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SignatureStepImplTest.java
new file mode 100644
index 0000000000..bebd1f8e0b
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SignatureStepImplTest.java
@@ -0,0 +1,136 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import com.adobe.cq.forms.core.Utils;
+import com.adobe.cq.forms.core.components.models.form.FieldType;
+import com.adobe.cq.forms.core.components.models.form.SignatureStep;
+import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
+import io.wcm.testing.mock.aem.junit5.AemContext;
+import io.wcm.testing.mock.aem.junit5.AemContextExtension;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(AemContextExtension.class)
+public class SignatureStepImplTest {
+
+    private static final String TEST_BASE = "/form/signaturestep";
+    private static final String APPS_ROOT = "/apps";
+    private static final String PATH_SIGNATURE_STEP = APPS_ROOT + "/signaturestep";
+    private static final String PATH_SIGNATURE_STEP_DEFAULTS = APPS_ROOT + "/signaturestep-defaults";
+
+    private final AemContext context = FormsCoreComponentTestContext.newAemContext();
+
+    @BeforeEach
+    void setUp() {
+        context.load().json(TEST_BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, APPS_ROOT);
+    }
+
+    @Test
+    void testGetFieldType() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        assertEquals(FieldType.PLAIN_TEXT.getValue(), signatureStep.getFieldType());
+    }
+
+    @Test
+    void testGetFieldTypeOnNewInstance() {
+        SignatureStep signatureStep = new SignatureStepImpl();
+        assertEquals(FieldType.PLAIN_TEXT.getValue(), signatureStep.getFieldType());
+    }
+
+    @Test
+    void testGetSigningService() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        assertEquals("echosign", signatureStep.getSigningService());
+    }
+
+    @Test
+    void testGetSigningServiceDefault() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP_DEFAULTS, SignatureStepImpl.class, context);
+        assertEquals(SignatureStepImpl.DEFAULT_SIGNING_SERVICE, signatureStep.getSigningService());
+    }
+
+    @Test
+    void testGetDisplayMsg() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        assertEquals("Please sign the document", signatureStep.getDisplayMsg());
+    }
+
+    @Test
+    void testGetDisplayMsgDefault() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP_DEFAULTS, SignatureStepImpl.class, context);
+        assertNull(signatureStep.getDisplayMsg());
+    }
+
+    @Test
+    void testGetCloudServiceConfig() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        assertEquals("/etc/cloudservices/echosign/myConfig", signatureStep.getCloudServiceConfig());
+    }
+
+    @Test
+    void testGetCloudServiceConfigDefault() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP_DEFAULTS, SignatureStepImpl.class, context);
+        assertEquals("", signatureStep.getCloudServiceConfig());
+    }
+
+    @Test
+    void testGetTargetVersion() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        assertEquals("1.0", signatureStep.getTargetVersion());
+    }
+
+    @Test
+    void testGetTargetVersionDefault() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP_DEFAULTS, SignatureStepImpl.class, context);
+        assertNull(signatureStep.getTargetVersion());
+    }
+
+    @Test
+    void testGetProperties() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        Map<String, Object> properties = signatureStep.getProperties();
+        assertNotNull(properties);
+        assertEquals("echosign", properties.get("fd:signingService"));
+        assertEquals("/etc/cloudservices/echosign/myConfig", properties.get("fd:cloudServiceConfig"));
+        assertEquals("Please sign the document", properties.get("fd:displayMsg"));
+        assertEquals("1.0", properties.get("fd:targetVersion"));
+        assertEquals(APPS_ROOT + "/signaturestep", properties.get("fd:path"));
+    }
+
+    @Test
+    void testGetPropertiesDefaults() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP_DEFAULTS, SignatureStepImpl.class, context);
+        Map<String, Object> properties = signatureStep.getProperties();
+        assertNotNull(properties);
+        assertEquals(SignatureStepImpl.DEFAULT_SIGNING_SERVICE, properties.get("fd:signingService"));
+        assertFalse(properties.containsKey("fd:cloudServiceConfig"));
+        assertFalse(properties.containsKey("fd:displayMsg"));
+        assertFalse(properties.containsKey("fd:targetVersion"));
+    }
+
+    @Test
+    void testGetExportedType() {
+        SignatureStep signatureStep = Utils.getComponentUnderTest(PATH_SIGNATURE_STEP, SignatureStepImpl.class, context);
+        assertEquals("core/fd/components/form/signaturestep/v1/signaturestep", signatureStep.getExportedType());
+    }
+}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SummaryStepImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SummaryStepImplTest.java
new file mode 100644
index 0000000000..39ad8eaa0d
--- /dev/null
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/SummaryStepImplTest.java
@@ -0,0 +1,108 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import com.adobe.cq.forms.core.Utils;
+import com.adobe.cq.forms.core.components.models.form.FieldType;
+import com.adobe.cq.forms.core.components.models.form.SummaryStep;
+import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
+import io.wcm.testing.mock.aem.junit5.AemContext;
+import io.wcm.testing.mock.aem.junit5.AemContextExtension;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(AemContextExtension.class)
+public class SummaryStepImplTest {
+
+    private static final String TEST_BASE = "/form/summarystep";
+    private static final String APPS_ROOT = "/apps";
+    private static final String PATH_SUMMARY_STEP = APPS_ROOT + "/summarystep";
+    private static final String PATH_SUMMARY_STEP_DEFAULTS = APPS_ROOT + "/summarystep-defaults";
+
+    private final AemContext context = FormsCoreComponentTestContext.newAemContext();
+
+    @BeforeEach
+    void setUp() {
+        context.load().json(TEST_BASE + FormsCoreComponentTestContext.TEST_CONTENT_JSON, APPS_ROOT);
+    }
+
+    @Test
+    void testGetFieldType() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP, SummaryStepImpl.class, context);
+        assertEquals(FieldType.PLAIN_TEXT.getValue(), summaryStep.getFieldType());
+    }
+
+    @Test
+    void testGetFieldTypeOnNewInstance() {
+        SummaryStep summaryStep = new SummaryStepImpl();
+        assertEquals(FieldType.PLAIN_TEXT.getValue(), summaryStep.getFieldType());
+    }
+
+    @Test
+    void testGetDisplayMsg() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP, SummaryStepImpl.class, context);
+        assertEquals("<p>Thank you for submitting the form.</p>", summaryStep.getDisplayMsg());
+    }
+
+    @Test
+    void testGetDisplayMsgDefault() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP_DEFAULTS, SummaryStepImpl.class, context);
+        assertNull(summaryStep.getDisplayMsg());
+    }
+
+    @Test
+    void testIsAutoSubmit() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP, SummaryStepImpl.class, context);
+        assertTrue(summaryStep.isAutoSubmit());
+    }
+
+    @Test
+    void testIsAutoSubmitDefault() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP_DEFAULTS, SummaryStepImpl.class, context);
+        assertTrue(summaryStep.isAutoSubmit());
+    }
+
+    @Test
+    void testGetProperties() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP, SummaryStepImpl.class, context);
+        Map<String, Object> properties = summaryStep.getProperties();
+        assertNotNull(properties);
+        assertEquals("<p>Thank you for submitting the form.</p>", properties.get("fd:displayMsg"));
+        assertEquals(true, properties.get("fd:autoSubmit"));
+        assertEquals(APPS_ROOT + "/summarystep", properties.get("fd:path"));
+    }
+
+    @Test
+    void testGetPropertiesDefaults() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP_DEFAULTS, SummaryStepImpl.class, context);
+        Map<String, Object> properties = summaryStep.getProperties();
+        assertNotNull(properties);
+        assertFalse(properties.containsKey("fd:displayMsg"));
+        assertEquals(true, properties.get("fd:autoSubmit"));
+    }
+
+    @Test
+    void testGetExportedType() {
+        SummaryStep summaryStep = Utils.getComponentUnderTest(PATH_SUMMARY_STEP, SummaryStepImpl.class, context);
+        assertEquals("core/fd/components/form/summarystep/v1/summarystep", summaryStep.getExportedType());
+    }
+}
diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
index 43b2d53428..ca68999abb 100644
--- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
+++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java
@@ -117,6 +117,8 @@ public class FormContainerImplTest {
     private static final String SS_SPREADSHEET = "spreadsheet";
 
     private static final String PATH_FORM_EXCLUDE_FROM_DOR_IF_HIDDEN = "/content/forms/af/demo/jcr:content/formcontainerv2-excludeFromDoRIfHidden";
+    private static final String PATH_FORM_WITH_ADOBE_SIGN = CONTENT_ROOT + "/formcontainerv2WithAdobeSign";
+    private static final String PATH_FORM_WITH_ADOBE_SIGN_NO_FIRST_SIGNER = CONTENT_ROOT + "/formcontainerv2WithAdobeSignNoFirstSigner";
 
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
@@ -917,4 +919,53 @@ void testSetLang() throws Exception {
         formContainer.setLang(null);
         assertEquals(formContainer.getLang(), "en");
     }
+
+    @Test
+    void testIsAdobeSignEnabled() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_WITH_ADOBE_SIGN, FormContainer.class, context);
+        assertTrue(formContainer.isAdobeSignEnabled());
+    }
+
+    @Test
+    void testIsAdobeSignEnabledDefault() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        assertFalse(formContainer.isAdobeSignEnabled());
+    }
+
+    @Test
+    void testIsFormFillerFirstSigner() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_WITH_ADOBE_SIGN, FormContainer.class, context);
+        assertTrue(formContainer.isFormFillerFirstSigner());
+    }
+
+    @Test
+    void testIsFormFillerFirstSignerDefault() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        assertFalse(formContainer.isFormFillerFirstSigner());
+    }
+
+    @Test
+    void testIsFormFillerFirstSignerWhenFalse() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_WITH_ADOBE_SIGN_NO_FIRST_SIGNER, FormContainer.class, context);
+        assertTrue(formContainer.isAdobeSignEnabled());
+        assertFalse(formContainer.isFormFillerFirstSigner());
+    }
+
+    @Test
+    void testGetPropertiesWithAdobeSign() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_WITH_ADOBE_SIGN, FormContainer.class, context);
+        Map<String, Object> properties = formContainer.getProperties();
+        assertNotNull(properties);
+        assertTrue((Boolean) properties.get("fd:useSignedPdf"));
+        assertTrue((Boolean) properties.get("fd:isFormFillerFirstSigner"));
+    }
+
+    @Test
+    void testGetPropertiesWithoutAdobeSign() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        Map<String, Object> properties = formContainer.getProperties();
+        assertNotNull(properties);
+        assertFalse(properties.containsKey("fd:useSignedPdf"));
+        assertFalse(properties.containsKey("fd:isFormFillerFirstSigner"));
+    }
 }
diff --git a/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json b/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json
index 7a9ca98bf2..5bcfc1612b 100644
--- a/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json
+++ b/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json
@@ -210,6 +210,26 @@
         "visible": false
       },
       "actionType": "fd/af/components/guidesubmittype/rest"
+    },
+    "formcontainerv2WithAdobeSign": {
+      "jcr:primaryType": "nt:unstructured",
+      "sling:resourceType": "core/fd/components/form/container/v2/container",
+      "fieldType": "form",
+      "_useSignedPdf": true,
+      "signerInfo": {
+        "jcr:primaryType": "nt:unstructured",
+        "firstSignerFormFiller": true
+      }
+    },
+    "formcontainerv2WithAdobeSignNoFirstSigner": {
+      "jcr:primaryType": "nt:unstructured",
+      "sling:resourceType": "core/fd/components/form/container/v2/container",
+      "fieldType": "form",
+      "_useSignedPdf": true,
+      "signerInfo": {
+        "jcr:primaryType": "nt:unstructured",
+        "firstSignerFormFiller": false
+      }
     }
   }
 }
diff --git a/bundles/af-core/src/test/resources/form/signaturestep/test-content.json b/bundles/af-core/src/test/resources/form/signaturestep/test-content.json
new file mode 100644
index 0000000000..e16ef24ee7
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/signaturestep/test-content.json
@@ -0,0 +1,22 @@
+{
+  "signaturestep": {
+    "jcr:primaryType": "nt:unstructured",
+    "jcr:title": "Signature Step",
+    "id": "signaturestep-test",
+    "name": "signaturestep1",
+    "fieldType": "plain-text",
+    "signingService": "echosign",
+    "displayMsg": "Please sign the document",
+    "cq:cloudserviceconfigs": "/etc/cloudservices/echosign/myConfig",
+    "fd:targetVersion": "1.0",
+    "sling:resourceType": "core/fd/components/form/signaturestep/v1/signaturestep"
+  },
+  "signaturestep-defaults": {
+    "jcr:primaryType": "nt:unstructured",
+    "jcr:title": "Signature Step Defaults",
+    "id": "signaturestep-defaults-test",
+    "name": "signaturestepDefaults",
+    "fieldType": "plain-text",
+    "sling:resourceType": "core/fd/components/form/signaturestep/v1/signaturestep"
+  }
+}
diff --git a/bundles/af-core/src/test/resources/form/summarystep/test-content.json b/bundles/af-core/src/test/resources/form/summarystep/test-content.json
new file mode 100644
index 0000000000..e53063e967
--- /dev/null
+++ b/bundles/af-core/src/test/resources/form/summarystep/test-content.json
@@ -0,0 +1,20 @@
+{
+  "summarystep": {
+    "jcr:primaryType": "nt:unstructured",
+    "jcr:title": "Summary Step",
+    "id": "summarystep-test",
+    "name": "summarystep1",
+    "fieldType": "plain-text",
+    "displayMsg": "<p>Thank you for submitting the form.</p>",
+    "autoSubmit": true,
+    "sling:resourceType": "core/fd/components/form/summarystep/v1/summarystep"
+  },
+  "summarystep-defaults": {
+    "jcr:primaryType": "nt:unstructured",
+    "jcr:title": "Summary Step Defaults",
+    "id": "summarystep-defaults-test",
+    "name": "summarystepDefaults",
+    "fieldType": "plain-text",
+    "sling:resourceType": "core/fd/components/form/summarystep/v1/summarystep"
+  }
+}
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/signaturestep/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/signaturestep/.content.xml
new file mode 100644
index 0000000000..3014749074
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/signaturestep/.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:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+  jcr:primaryType="cq:Component"
+  jcr:title="Adaptive Form Signature Step"
+  jcr:description="Embeds an Adobe Sign signing experience as a step in a multi-step form."
+  sling:resourceSuperType="core/fd/components/form/signaturestep/v1/signaturestep"
+  componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/signaturestep/_cq_template.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/signaturestep/_cq_template.xml
new file mode 100644
index 0000000000..45edf9ec5f
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/signaturestep/_cq_template.xml
@@ -0,0 +1,9 @@
+<?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:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Signature Step"
+    fieldType="plain-text"
+    signingService="echosign"
+    displayMsg="Loading document..."
+    fd:targetVersion="1.1"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/summarystep/.content.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/summarystep/.content.xml
new file mode 100644
index 0000000000..ccfce437c5
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/summarystep/.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:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+  jcr:primaryType="cq:Component"
+  jcr:title="Adaptive Form Summary Step"
+  jcr:description="Displays a summary message at the end of a multi-step form."
+  sling:resourceSuperType="core/fd/components/form/summarystep/v1/summarystep"
+  componentGroup="Core Components Examples - Adaptive Form"/>
diff --git a/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/summarystep/_cq_template.xml b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/summarystep/_cq_template.xml
new file mode 100644
index 0000000000..2bb7f769e9
--- /dev/null
+++ b/examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/summarystep/_cq_template.xml
@@ -0,0 +1,7 @@
+<?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="Summary Step"
+    fieldType="plain-text"
+    autoSubmit="{Boolean}false"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/signaturestep/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/signaturestep/.content.xml
new file mode 100644
index 0000000000..bbf62ed22c
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/signaturestep/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder"
+    hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/signaturestep/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/signaturestep/basic/.content.xml
new file mode 100644
index 0000000000..5e45573d67
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/signaturestep/basic/.content.xml
@@ -0,0 +1,95 @@
+<?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}2024-11-01T10:00:00.000+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="signature step form"
+        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"
+            schemaType="none"
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="Signature Step Form">
+            <wizard
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Multi-step Form"
+                sling:resourceType="forms-components-examples/components/form/tabsontop"
+                enabled="{Boolean}true"
+                fieldType="panel"
+                hideTitle="false"
+                name="wizard1730000010000"
+                id="wizard_signaturestep_id"
+                readOnly="{Boolean}false"
+                repeatable="false"
+                textIsRich="[true,true]"
+                visible="{Boolean}true"
+                wrapData="{Boolean}false">
+                <details_panel
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Details"
+                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
+                    enabled="{Boolean}true"
+                    fieldType="panel"
+                    hideTitle="false"
+                    name="panelcontainer1730000010001"
+                    id="details_panel_sign_id"
+                    readOnly="{Boolean}false"
+                    repeatable="false"
+                    textIsRich="[true,true,true]"
+                    visible="{Boolean}true"
+                    wrapData="{Boolean}false">
+                    <textinput
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Full Name"
+                        sling:resourceType="forms-components-examples/components/form/textinput"
+                        enabled="{Boolean}true"
+                        fieldType="text-input"
+                        hideTitle="false"
+                        name="textinput1730000010002"
+                        id="fullname_sign_id"
+                        readOnly="{Boolean}false"
+                        required="true"
+                        textIsRich="[true,true,true]"
+                        unboundFormElement="{Boolean}false"
+                        visible="{Boolean}true"/>
+                </details_panel>
+                <signature_panel
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Sign Document"
+                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
+                    enabled="{Boolean}true"
+                    fieldType="panel"
+                    hideTitle="false"
+                    name="panelcontainer1730000010003"
+                    id="signature_panel_id"
+                    readOnly="{Boolean}false"
+                    repeatable="false"
+                    textIsRich="[true,true,true]"
+                    visible="{Boolean}true"
+                    wrapData="{Boolean}false">
+                    <signaturestep
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Signature Step"
+                        sling:resourceType="forms-components-examples/components/form/signaturestep"
+                        signingService="echosign"
+                        displayMsg="Loading document..."
+                        fd:targetVersion="1.1"
+                        fieldType="plain-text"
+                        name="signaturestep1730000010004"
+                        id="signaturestep_id"
+                        visible="{Boolean}true"/>
+                </signature_panel>
+            </wizard>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/summarystep/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/summarystep/.content.xml
new file mode 100644
index 0000000000..bbf62ed22c
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/summarystep/.content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder"
+    hidden="true"/>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/summarystep/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/summarystep/basic/.content.xml
new file mode 100644
index 0000000000..03795673c8
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/summarystep/basic/.content.xml
@@ -0,0 +1,94 @@
+<?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}2024-11-01T10:00:00.000+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="summary step form"
+        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"
+            schemaType="none"
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="Summary Step Form">
+            <wizard
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Multi-step Form"
+                sling:resourceType="forms-components-examples/components/form/tabsontop"
+                enabled="{Boolean}true"
+                fieldType="panel"
+                hideTitle="false"
+                name="wizard1730000000000"
+                id="wizard_summarystep_id"
+                readOnly="{Boolean}false"
+                repeatable="false"
+                textIsRich="[true,true]"
+                visible="{Boolean}true"
+                wrapData="{Boolean}false">
+                <details_panel
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Details"
+                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
+                    enabled="{Boolean}true"
+                    fieldType="panel"
+                    hideTitle="false"
+                    name="panelcontainer1730000000001"
+                    id="details_panel_id"
+                    readOnly="{Boolean}false"
+                    repeatable="false"
+                    textIsRich="[true,true,true]"
+                    visible="{Boolean}true"
+                    wrapData="{Boolean}false">
+                    <textinput
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Full Name"
+                        sling:resourceType="forms-components-examples/components/form/textinput"
+                        enabled="{Boolean}true"
+                        fieldType="text-input"
+                        hideTitle="false"
+                        name="textinput1730000000002"
+                        id="fullname_id"
+                        readOnly="{Boolean}false"
+                        required="true"
+                        textIsRich="[true,true,true]"
+                        unboundFormElement="{Boolean}false"
+                        visible="{Boolean}true"/>
+                </details_panel>
+                <summary_panel
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Confirmation"
+                    sling:resourceType="forms-components-examples/components/form/panelcontainer"
+                    enabled="{Boolean}true"
+                    fieldType="panel"
+                    hideTitle="false"
+                    name="panelcontainer1730000000003"
+                    id="summary_panel_id"
+                    readOnly="{Boolean}false"
+                    repeatable="false"
+                    textIsRich="[true,true,true]"
+                    visible="{Boolean}true"
+                    wrapData="{Boolean}false">
+                    <summarystep
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Summary Step"
+                        sling:resourceType="forms-components-examples/components/form/summarystep"
+                        displayMsg="&lt;p&gt;Thank you! Your form has been submitted successfully.&lt;/p&gt;"
+                        fieldType="plain-text"
+                        autoSubmit="{Boolean}false"
+                        name="summarystep1730000000004"
+                        id="summarystep_id"
+                        visible="{Boolean}true"/>
+                </summary_panel>
+            </wizard>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml
index 5436f5c38f..9fb109c9b6 100644
--- a/ui.af.apps/pom.xml
+++ b/ui.af.apps/pom.xml
@@ -335,6 +335,12 @@
                                         <replace file="target/jcr_root/libs/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/fileinput/v4/fileinput/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                         <replace file="target/jcr_root/libs/core/fd/components/form/datetime/v1/datetime/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/signaturestep/v1/signaturestep/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/signaturestep/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/summarystep/v1/summarystep/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/summarystep/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/adobesignblock/v1/adobesignblock/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
+                                        <replace file="target/jcr_root/libs/core/fd/components/form/adobesignblock/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
                                     </target>
                                 </configuration>
                                 <goals>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
index c484806166..3387c0d9f6 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/.content.xml
@@ -5,4 +5,4 @@
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:none]"
     categories="[core.forms.components.runtime.all]"
-    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v4.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime,core.forms.components.review.v1.runtime,core.forms.components.scribble.v1.runtime,core.forms.components.datetime.v1.runtime]"/>
+    embed="[core.forms.components.runtime.base,core.forms.components.container.v2.runtime,core.forms.components.datePicker.v1.runtime,core.forms.components.textinput.v1.runtime,core.forms.components.numberinput.v1.runtime,core.forms.components.panelcontainer.v1.runtime,core.forms.components.radiobutton.v2.runtime,core.forms.components.text.v1.runtime,core.forms.components.checkboxgroup.v1.runtime,core.forms.components.button.v1.runtime,core.forms.components.image.v1.runtime,core.forms.components.dropdown.v1.runtime,core.forms.components.fileinput.v4.runtime,core.forms.components.accordion.v1.runtime,core.forms.components.tabs.v1.runtime,core.forms.components.wizard.v1.runtime,core.forms.components.verticaltabs.v1.runtime,core.forms.components.recaptcha.v1.runtime,core.forms.components.checkbox.v1.runtime,core.forms.components.fragment.v1.runtime,core.forms.components.switch.v1.runtime,core.forms.components.termsandconditions.v1.runtime,core.forms.components.review.v1.runtime,core.forms.components.scribble.v1.runtime,core.forms.components.datetime.v1.runtime,core.forms.components.summarystep.v1.runtime,core.forms.components.signaturestep.v1.runtime,core.forms.components.adobesignblock.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/.content.xml
new file mode 100644
index 0000000000..9c42191786
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/.content.xml
@@ -0,0 +1,4 @@
+<?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="[cq.authoring.editor.forms.v2.hook,cq.authoring.editor.forms.hook]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/js.txt
new file mode 100644
index 0000000000..585d717a0f
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/js.txt
@@ -0,0 +1,2 @@
+#base=js
+signingComponentInsertHook.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/js/signingComponentInsertHook.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/js/signingComponentInsertHook.js
new file mode 100644
index 0000000000..06bccab4ea
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/signing-component-authoring-hook/js/signingComponentInsertHook.js
@@ -0,0 +1,383 @@
+/*******************************************************************************
+ * Copyright 2026 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function (window, $) {
+    "use strict";
+
+    const author = (window.Granite && window.Granite.author) ? window.Granite.author : null;
+    const FORM_CONTAINER_SELECTOR = "[data-cmp-is='adaptiveFormContainer']";
+
+    const FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES = {
+        "fd/afaddon/components/esign": "core/fd/components/form/signaturestep/v1/signaturestep",
+        "fd/afaddon/components/summary": "core/fd/components/form/summarystep/v1/summarystep",
+        "fd/afaddon/components/adobeSignBlock": "core/fd/components/form/adobesignblock/v1/adobesignblock"
+    };
+
+    const CORE_FORM_CONTAINER_RESOURCE_TYPES = [
+        "core/fd/components/form/container/v2/container",
+        "core/fd/components/form/container/v1/container"
+    ];
+
+    function isFoundationSigningResourceType(resourceType) {
+        return !!resourceType && Object.prototype.hasOwnProperty.call(
+            FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES,
+            resourceType
+        );
+    }
+
+    function toCoreSigningResourceType(resourceType) {
+        if (!resourceType) {
+            return resourceType;
+        }
+        return FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES[resourceType] || resourceType;
+    }
+
+    window.CQ = window.CQ || {};
+    window.CQ.FormsCoreComponents = window.CQ.FormsCoreComponents || {};
+    window.CQ.FormsCoreComponents.editorhooks = window.CQ.FormsCoreComponents.editorhooks || {};
+    window.CQ.FormsCoreComponents.editorhooks.toCoreSigningResourceType = toCoreSigningResourceType;
+
+    function hasCoreFormContainerInContentFrame(doc) {
+        if (!doc) {
+            return false;
+        }
+        const $doc = $(doc);
+        return $doc.find(FORM_CONTAINER_SELECTOR).length > 0
+            || $doc.find("[data-cmp-is='formcontainer']").length > 0
+            || $doc.find("[data-cmp-adaptiveformcontainer-path]").length > 0;
+    }
+
+    function hasCoreFormContainerEditable() {
+        if (!author || !author.editables || typeof author.editables.find !== "function") {
+            return false;
+        }
+
+        return CORE_FORM_CONTAINER_RESOURCE_TYPES.some(function (resourceType) {
+            const matches = author.editables.find({ resourceType: resourceType });
+            return matches && matches.length > 0;
+        });
+    }
+
+    function isCoreComponentsBasedForm() {
+        if (window.guidelib && window.guidelib.touchlib && window.guidelib.touchlib.utils
+            && typeof window.guidelib.touchlib.utils.checkIfCoreComponentsBasedForm === "function"
+            && window.guidelib.touchlib.utils.checkIfCoreComponentsBasedForm()) {
+            return true;
+        }
+        if (author && author.afUtils && typeof author.afUtils.checkIfCoreComponentsBasedForm === "function"
+            && author.afUtils.checkIfCoreComponentsBasedForm()) {
+            return true;
+        }
+
+        if (author && author.ContentFrame && author.ContentFrame.getDocument) {
+            const contentFrameDocument = author.ContentFrame.getDocument();
+            if (contentFrameDocument && contentFrameDocument.length > 0
+                && hasCoreFormContainerInContentFrame(contentFrameDocument[0])) {
+                return true;
+            }
+        }
+
+        if (window._afAuthorHook && typeof window._afAuthorHook._getAfWindow === "function") {
+            const afWindow = window._afAuthorHook._getAfWindow();
+            if (afWindow && afWindow.document && hasCoreFormContainerInContentFrame(afWindow.document)) {
+                return true;
+            }
+        }
+
+        return hasCoreFormContainerEditable();
+    }
+
+    function remapSigningPath(path) {
+        if (!path || typeof path !== "string") {
+            return path;
+        }
+        let remapped = path;
+        Object.keys(FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES).forEach(function (foundationRt) {
+            if (remapped.indexOf(foundationRt) !== -1) {
+                remapped = remapped.split(foundationRt).join(FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES[foundationRt]);
+            }
+        });
+        return remapped;
+    }
+
+    function remapSigningContentPayload(content) {
+        if (!content || typeof content !== "object") {
+            return;
+        }
+
+        delete content.guideNodeClass;
+
+        if (content._value !== undefined && content.value === undefined) {
+            content.value = content._value;
+            delete content._value;
+        }
+    }
+
+    function remapSigningContentTree(content) {
+        if (!content || typeof content !== "object") {
+            return false;
+        }
+
+        let changed = false;
+
+        if (isFoundationSigningResourceType(content["sling:resourceType"])) {
+            content["sling:resourceType"] = toCoreSigningResourceType(content["sling:resourceType"]);
+            remapSigningContentPayload(content);
+            changed = true;
+        }
+
+        if (content.items && typeof content.items === "object") {
+            Object.keys(content.items).forEach(function (key) {
+                if (remapSigningContentTree(content.items[key])) {
+                    changed = true;
+                }
+            });
+        }
+
+        return changed;
+    }
+
+    window.CQ.FormsCoreComponents.editorhooks.remapSigningContentPayload = remapSigningContentPayload;
+
+    function remapPostParamValue(name, value) {
+        if (value === undefined || value === null) {
+            return value;
+        }
+
+        if (name === "./sling:resourceType" || name === "sling:resourceType") {
+            return isFoundationSigningResourceType(value) ? toCoreSigningResourceType(value) : value;
+        }
+
+        if ((name === "./@CopyFrom" || name.indexOf("@CopyFrom") !== -1) && typeof value === "string") {
+            return remapSigningPath(value);
+        }
+
+        if (name === ":content" && typeof value === "string") {
+            try {
+                const content = JSON.parse(value);
+                if (remapSigningContentTree(content)) {
+                    return JSON.stringify(content);
+                }
+            } catch (e) {
+                // Not JSON content.
+            }
+        }
+
+        return value;
+    }
+
+    function remapPostParams(params) {
+        if (!params || !isCoreComponentsBasedForm()) {
+            return;
+        }
+
+        Object.keys(params).forEach(function (name) {
+            params[name] = remapPostParamValue(name, params[name]);
+        });
+    }
+
+    if (!author || !author.persistence || !author.persistence.PostRequest) {
+        return;
+    }
+
+    const PostRequest = author.persistence.PostRequest;
+
+    if (PostRequest.prototype) {
+        const _superSetParam = PostRequest.prototype.setParam;
+        const _superSetParams = PostRequest.prototype.setParams;
+        const _superSend = PostRequest.prototype.send;
+
+        PostRequest.prototype.setParam = function (name, value) {
+            if (isCoreComponentsBasedForm()) {
+                value = remapPostParamValue(name, value);
+            }
+            return _superSetParam.call(this, name, value);
+        };
+
+        PostRequest.prototype.setParams = function (params) {
+            if (isCoreComponentsBasedForm() && params) {
+                remapPostParams(params);
+            }
+            return _superSetParams.call(this, params);
+        };
+
+        PostRequest.prototype.send = function () {
+            if (isCoreComponentsBasedForm() && this.params) {
+                remapPostParams(this.params);
+            }
+            return _superSend.apply(this, arguments);
+        };
+
+        if (typeof PostRequest.prototype.prepareCreateParagraph === "function") {
+            const _superPrepareCreateParagraph = PostRequest.prototype.prepareCreateParagraph;
+            PostRequest.prototype.prepareCreateParagraph = function (config) {
+                if (isCoreComponentsBasedForm() && config && isFoundationSigningResourceType(config.resourceType)) {
+                    config.resourceType = toCoreSigningResourceType(config.resourceType);
+                    if (config.templatePath) {
+                        config.templatePath = remapSigningPath(config.templatePath);
+                    }
+                }
+                return _superPrepareCreateParagraph.call(this, config);
+            };
+        }
+
+        if (typeof PostRequest.prototype.prepareCopyParagraph === "function") {
+            const _superPrepareCopyParagraph = PostRequest.prototype.prepareCopyParagraph;
+            PostRequest.prototype.prepareCopyParagraph = function (config) {
+                const request = _superPrepareCopyParagraph.apply(this, arguments);
+
+                if (!isCoreComponentsBasedForm() || !config || !config.path) {
+                    return request;
+                }
+
+                try {
+                    const nodeData = window.CQ && window.CQ.shared && window.CQ.shared.HTTP
+                        ? window.CQ.shared.HTTP.eval(config.path + ".infinity.json")
+                        : null;
+                    const resourceType = nodeData && nodeData["sling:resourceType"];
+
+                    if (isFoundationSigningResourceType(resourceType)) {
+                        this.setParam("./sling:resourceType", toCoreSigningResourceType(resourceType));
+
+                        if (nodeData._value !== undefined && nodeData.value === undefined) {
+                            this.setParam("./value", nodeData._value);
+                            this.setParam("./_value@Delete", "deleted value");
+                        }
+                        if (nodeData.guideNodeClass !== undefined) {
+                            this.setParam("./guideNodeClass@Delete", "deleted value");
+                        }
+                    }
+                } catch (e) {
+                    // Keep default copy behavior when source lookup fails.
+                }
+
+                return request;
+            };
+        }
+    }
+
+    function remapInsertComponentArgument(value) {
+        if (typeof value !== "string") {
+            return value;
+        }
+
+        if (isFoundationSigningResourceType(value)) {
+            return toCoreSigningResourceType(value);
+        }
+
+        return remapSigningPath(value);
+    }
+
+    function wrapInsertExecute(insertAction) {
+        if (!insertAction || typeof insertAction.execute !== "function" || insertAction._coreSigningInsertHooked) {
+            return;
+        }
+
+        const originalExecute = insertAction.execute;
+
+        insertAction.execute = function () {
+            if (isCoreComponentsBasedForm()) {
+                for (let i = 0; i < arguments.length; i++) {
+                    arguments[i] = remapInsertComponentArgument(arguments[i]);
+                }
+            }
+            return originalExecute.apply(this, arguments);
+        };
+
+        insertAction._coreSigningInsertHooked = true;
+    }
+
+    function installInsertHooks() {
+        if (author && author.edit) {
+            wrapInsertExecute(author.edit.EditableActions && author.edit.EditableActions.INSERT);
+            wrapInsertExecute(author.edit.ToolbarActions && author.edit.ToolbarActions.INSERT);
+        }
+    }
+
+    function remapAjaxData(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (typeof data === "string") {
+            let remapped = data;
+            Object.keys(FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES).forEach(function (foundationRt) {
+                const coreRt = FOUNDATION_TO_CORE_SIGNING_RESOURCE_TYPES[foundationRt];
+                remapped = remapped.split(encodeURIComponent(foundationRt)).join(encodeURIComponent(coreRt));
+                remapped = remapped.split(foundationRt).join(coreRt);
+            });
+            return remapped;
+        }
+
+        if (typeof data === "object") {
+            remapPostParams(data);
+        }
+
+        return data;
+    }
+
+    $(document).ajaxSend(function (event, jqXHR, settings) {
+        if (!isCoreComponentsBasedForm() || !settings) {
+            return;
+        }
+
+        const requestType = (settings.type || "GET").toUpperCase();
+        if (requestType !== "POST") {
+            return;
+        }
+
+        settings.data = remapAjaxData(settings.data);
+    });
+
+    function installDataDropHook() {
+        const dataObjects = window.guidelib
+            && window.guidelib.touchlib
+            && window.guidelib.touchlib.editLayer
+            && window.guidelib.touchlib.editLayer.editLayerDataObjects;
+
+        if (!dataObjects || typeof dataObjects.handleDataDrop !== "function"
+            || dataObjects._coreSigningDataDropHooked) {
+            return;
+        }
+
+        const originalHandleDataDrop = dataObjects.handleDataDrop;
+
+        dataObjects.handleDataDrop = function (event) {
+            if (isCoreComponentsBasedForm() && event && event.dragTarget && event.dragTarget.dataset
+                && event.dragTarget.dataset.xpathtype) {
+                const sourceContent = this.getXpathJson(event.dragTarget.dataset.xpathtype.substring(1));
+                if (sourceContent) {
+                    remapSigningContentTree(sourceContent);
+                }
+            }
+            return originalHandleDataDrop.apply(this, arguments);
+        };
+
+        dataObjects._coreSigningDataDropHooked = true;
+    }
+
+    function installHooks() {
+        installInsertHooks();
+        installDataDropHook();
+    }
+
+    $(document).on("cq-layer-activated", installHooks);
+    $(document).ready(installHooks);
+
+    if (author && typeof author.on === "function") {
+        author.on("cq-editor-loaded", installHooks);
+    }
+
+})(window, jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/.content.xml
new file mode 100644
index 0000000000..17c81f5cd6
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/.content.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:cq="http://www.day.com/jcr/cq/1.0"
+    xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Adobe Sign Block"
+    jcr:description="Add a block of text with placeholders for fields to be filled while signing using Adobe Sign."
+    sling:resourceSuperType="core/fd/components/form/adobesignblock/v1/adobesignblock"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/.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/adobesignblock/v1/.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/adobesignblock/v1/adobesignblock/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/.content.xml
new file mode 100644
index 0000000000..4100518cfc
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/.content.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:cq="http://www.day.com/jcr/cq/1.0"
+    xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="signature"
+    jcr:description="Add a block of text with placeholders for fields to be filled while signing using Adobe Sign."
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Adobe Sign Block"
+    sling:resourceSuperType="core/fd/components/form/text/v1/text"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..5e35193f60
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/_cq_dialog/.content.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns: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 Adobe Sign Block Component"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[core.forms.components.adobesignblock.v1.editor]"
+    helpPath="https://www.adobe.com/go/aem_af_cmp_adobesignblock_v1"
+    trackingFeature="core-components:adaptiveform-adobesignblock:v1">
+  <content
+      granite:class="cmp-adaptiveform-adobesignblock__editdialog"
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/container">
+    <items jcr:primaryType="nt:unstructured">
+      <accordion
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/accordion"
+          sling:hideResource="true"/>
+      <tabs
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/tabs"
+          granite:class="cmp-adaptiveform-base__editdialogbasic"
+          maximized="{Boolean}true">
+        <items jcr:primaryType="nt:unstructured"
+            sling:hideChildren="[validation,patterns]">
+          <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"/>
+                      <richTextTitle
+                          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/richTextTitle"/>
+                      <isTitleRichText
+                          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/isTitleRichText"/>
+                      <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"/>
+                      <value
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="cq/gui/components/authoring/dialog/richtext"
+                          fieldLabel="Text"
+                          fieldDescription="Rich text content with Adobe Sign placeholders."
+                          name="./value"
+                          useFixedInlineToolbar="{Boolean}true"/>
+                      <textIsRich
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                          name="./textIsRich"
+                          text="Allow Rich Text"
+                          checked="{Boolean}true"
+                          uncheckedValue="false"
+                          value="true"/>
+                      <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/base/v1/base/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"/>
+          <advanced
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="granite/ui/components/coral/foundation/include"
+              path="/mnt/overlay/fd/af/authoring/dialog/customProperties/cq:dialog/advanced"/>
+        </items>
+      </tabs>
+    </items>
+  </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/_cq_template.xml
new file mode 100644
index 0000000000..f8d6a8742d
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/_cq_template.xml
@@ -0,0 +1,9 @@
+<?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="Adobe Sign Block"
+    fieldType="plain-text"
+    textIsRich="{Boolean}true"
+    value="&lt;p>Signature: &amp;nbsp;&lt;span data-adobesigntype=&quot;signature&quot;>{{sampleField_es_:signer1:signature}}&lt;/span>&amp;nbsp;&lt;/p>"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/adobesignblock.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/adobesignblock.html
new file mode 100644
index 0000000000..4d2ee10022
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/adobesignblock.html
@@ -0,0 +1,30 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<div data-sly-use.textModel="com.adobe.cq.forms.core.components.models.form.Text"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     data-sly-use.templates="core/wcm/components/commons/v1/templates.html"
+     data-cmp-is="adaptiveFormAdobeSignBlock"
+     id="${textModel.id}"
+     data-cmp-data-layer="${textModel.data.json}"
+     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}"
+     data-cmp-visible="${textModel.visible}"
+     class="cmp-adaptiveform-adobesignblock cmp-adaptiveform-text adobeSignBlockText"
+     data-richtext>
+    <div data-sly-test.text="${textModel.value}">
+        <div data-sly-unwrap="${textModel.isRichText}">${text @ context = textModel.isRichText ? 'html' : 'text'}</div>
+    </div>
+</div>
+<sly data-sly-call="${templates.placeholder @ isEmpty = !text, classAppend='cmp-adaptiveform-adobesignblock'}"></sly>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/.content.xml
new file mode 100644
index 0000000000..295eb8dcaa
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?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"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/.content.xml
new file mode 100644
index 0000000000..8432f275ce
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/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.adobesignblock.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/adobesignblock/v1/adobesignblock/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/js.txt
new file mode 100644
index 0000000000..b052954804
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/js.txt
@@ -0,0 +1,2 @@
+#base=js
+adobesignblock.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/js/adobesignblock.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/js/adobesignblock.js
new file mode 100644
index 0000000000..d85f27e347
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/editor/js/adobesignblock.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function($) {
+    "use strict";
+
+    const Utils = window.CQ.FormsCoreComponents.Utils.v1,
+        EDIT_DIALOG = ".cmp-adaptiveform-adobesignblock__editdialog";
+
+    Utils.initializeEditDialog(EDIT_DIALOG)();
+})(jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..1f39269f89
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/adobesignblock/v1/adobesignblock/clientlibs/site/.content.xml
@@ -0,0 +1,4 @@
+<?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.adobesignblock.v1.runtime]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml
index 0f41726075..fdb3c4e35b 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml
@@ -18,7 +18,7 @@
   jcr:primaryType="nt:unstructured"
   jcr:title="Adaptive Form Container"
   sling:resourceType="cq/gui/components/authoring/dialog"
-  extraClientlibs="[core.forms.components.container.v1.editor]"
+  extraClientlibs="[core.forms.components.container.v1.editor,core.forms.components.container.v2.editor]"
   helpPath="https://www.adobe.com/go/aem_af_cmp_container_v2"
   trackingFeature="core-components:adaptiveform-container:v2">
     <content
@@ -359,6 +359,253 @@
                             </columns>
                         </items>
                     </submitActions>
+                    <signature
+                      jcr:primaryType="nt:unstructured"
+                      jcr:title="Electronic Signature"
+                      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/container">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <enableAdobeSign
+                                      jcr:primaryType="nt:unstructured"
+                                      sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                      name="./_useSignedPdf"
+                                      text="Enable Adobe Sign"
+                                      value="{Boolean}true"/>
+                                    <adobeSignFields
+                                      jcr:primaryType="nt:unstructured"
+                                      granite:class="cmp-adobesign-fields"
+                                      sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <signConfigPath
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                              fieldLabel="Adobe Sign Cloud Service"
+                                              emptyText="Select"
+                                              required="{Boolean}true"
+                                              name="./signerInfo/signConfigPath">
+                                                <datasource
+                                                  jcr:primaryType="nt:unstructured"
+                                                  sling:resourceType="fd/af/components/commons/datasources/propertyprovider"
+                                                  rootPath="/etc/cloudservices/echosign"
+                                                  type="esignCloudServiceConfiguration"/>
+                                            </signConfigPath>
+                                            <workflowType
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                              fieldLabel="Signers can sign"
+                                              required="{Boolean}true"
+                                              name="./signerInfo/workflowType">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <sequential
+                                                      jcr:primaryType="nt:unstructured"
+                                                      text="Sequentially – in the defined order"
+                                                      value="SEQUENTIAL"
+                                                      selected="{Boolean}true"/>
+                                                    <simultaneous
+                                                      jcr:primaryType="nt:unstructured"
+                                                      text="Simultaneously - in any order"
+                                                      value="PARALLEL"/>
+                                                </items>
+                                            </workflowType>
+                                            <daysUntilSigningDeadline
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
+                                              fieldLabel="Document Expiration (Days)"
+                                              fieldDescription="Expiration can be set up to 180 days. If left blank, agreements automatically expires after 365 days."
+                                              name="./signerInfo/daysUntilSigningDeadline"
+                                              min="1"
+                                              max="180"
+                                              value="1"/>
+                                            <signers
+                                              jcr:primaryType="nt:unstructured"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                              fieldLabel="Signers"
+                                              composite="{Boolean}true"
+                                              addButtonTitle="Add Signer"
+                                              name="./signerInfo/signers">
+                                                <field
+                                                  jcr:primaryType="nt:unstructured"
+                                                  sling:resourceType="granite/ui/components/coral/foundation/container">
+                                                    <items jcr:primaryType="nt:unstructured">
+                                                        <signerTitle
+                                                          jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                          fieldLabel="Title"
+                                                          name="./signerTitle"
+                                                          required="{Boolean}true"/>
+                                                        <isFormFiller
+                                                          jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/radiogroup"
+                                                          fieldLabel="Is the signer and the person filling the form same?"
+                                                          name="./isFormFiller"
+                                                          vertical="{Boolean}true">
+                                                            <items jcr:primaryType="nt:unstructured">
+                                                                <yes
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Yes"
+                                                                  value="true"
+                                                                  checked="{Boolean}true"/>
+                                                                <no
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="No"
+                                                                  value="false"/>
+                                                            </items>
+                                                        </isFormFiller>
+                                                        <signerEmailType
+                                                          jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                          fieldLabel="Signer Email Address"
+                                                          fieldDescription="Source for the signer's email address."
+                                                          name="./signerEmailType">
+                                                            <items jcr:primaryType="nt:unstructured">
+                                                                <fromForm
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Use email address provided in the form"
+                                                                  value="fromForm"
+                                                                  selected="{Boolean}true"/>
+                                                                <userProfile
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Use email address of logged in user"
+                                                                  value="userProfile"/>
+                                                                <typed
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Type an email address"
+                                                                  value="typed"/>
+                                                            </items>
+                                                        </signerEmailType>
+                                                        <signerEmailRef
+                                                          jcr:primaryType="nt:unstructured"
+                                                          wrapperClass="cmp-signer-email-ref"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                          emptyText="Select a form field marked for email address"
+                                                          name="./signerEmailRef">
+                                                            <datasource
+                                                              jcr:primaryType="nt:unstructured"
+                                                              sling:resourceType="fd/af/components/commons/datasources/propertyprovider"
+                                                              type="emailField"/>
+                                                        </signerEmailRef>
+                                                        <signerEmail
+                                                          jcr:primaryType="nt:unstructured"
+                                                          wrapperClass="cmp-signer-email-input"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                          fieldLabel=""
+                                                          emptyText="example@example.com"
+                                                          name="./signerEmail"/>
+                                                        <securityOption
+                                                          jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                          fieldLabel="Signer Authentication Method"
+                                                          name="./authenticationMethod">
+                                                            <items jcr:primaryType="nt:unstructured">
+                                                                <none
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="None"
+                                                                  value="NONE"
+                                                                  selected="{Boolean}true"/>
+                                                                <phone
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Phone based authentication"
+                                                                  value="PHONE"/>
+                                                                <kba
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Knowledge Base based Authentication"
+                                                                  value="KBA"/>
+                                                                <social
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Social Identity based authentication"
+                                                                  value="WEB_IDENTITY"/>
+                                                            </items>
+                                                        </securityOption>
+<!--                                                        <signerPhoneAuthFields-->
+<!--                                                          jcr:primaryType="nt:unstructured"-->
+<!--                                                          granite:class="cmp-signer-phone-auth-fields"-->
+<!--                                                          sling:resourceType="granite/ui/components/coral/foundation/container">-->
+<!--                                                            <items jcr:primaryType="nt:unstructured">-->
+<!--                                                                <countryCodeSource-->
+<!--                                                                  jcr:primaryType="nt:unstructured"-->
+<!--                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/select"-->
+<!--                                                                  fieldLabel="Country Code Source"-->
+<!--                                                                  name="./countryCodeSource">-->
+<!--                                                                    <items jcr:primaryType="nt:unstructured">-->
+<!--                                                                        <form-->
+<!--                                                                          jcr:primaryType="nt:unstructured"-->
+<!--                                                                          text="Use country code provided in the form"-->
+<!--                                                                          value="form"-->
+<!--                                                                          selected="{Boolean}true"/>-->
+<!--                                                                        <typed-->
+<!--                                                                          jcr:primaryType="nt:unstructured"-->
+<!--                                                                          text="Type Country Code"-->
+<!--                                                                          value="typed"/>-->
+<!--                                                                    </items>-->
+<!--                                                                </countryCodeSource>-->
+<!--                                                                <countryCode-->
+<!--                                                                  jcr:primaryType="nt:unstructured"-->
+<!--                                                                  wrapperClass="cmp-signer-country-typed"-->
+<!--                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/textfield"-->
+<!--                                                                  fieldLabel=""-->
+<!--                                                                  emptyText="Country Code"-->
+<!--                                                                  name="./countryCode"/>-->
+<!--                                                                <phoneSource-->
+<!--                                                                  jcr:primaryType="nt:unstructured"-->
+<!--                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/select"-->
+<!--                                                                  fieldLabel="Phone Source"-->
+<!--                                                                  name="./phoneSource">-->
+<!--                                                                    <items jcr:primaryType="nt:unstructured">-->
+<!--                                                                        <form-->
+<!--                                                                          jcr:primaryType="nt:unstructured"-->
+<!--                                                                          text="Use phone number provided in the form"-->
+<!--                                                                          value="form"-->
+<!--                                                                          selected="{Boolean}true"/>-->
+<!--                                                                        <typed-->
+<!--                                                                          jcr:primaryType="nt:unstructured"-->
+<!--                                                                          text="Type Phone Number"-->
+<!--                                                                          value="typed"/>-->
+<!--                                                                    </items>-->
+<!--                                                                </phoneSource>-->
+<!--                                                                <phone-->
+<!--                                                                  jcr:primaryType="nt:unstructured"-->
+<!--                                                                  wrapperClass="cmp-signer-phone-typed"-->
+<!--                                                                  sling:resourceType="granite/ui/components/coral/foundation/form/textfield"-->
+<!--                                                                  fieldLabel=""-->
+<!--                                                                  emptyText="Phone Number"-->
+<!--                                                                  name="./phone"/>-->
+<!--                                                            </items>-->
+<!--                                                        </signerPhoneAuthFields>-->
+                                                        <signatureType
+                                                          jcr:primaryType="nt:unstructured"
+                                                          sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                          fieldLabel="Adobe Sign fields to fill or sign"
+                                                          fieldDescription="An adaptive form can have multiple Adobe Sign fields. You can associate specific fields for a signer."
+                                                          emptyText="Select"
+                                                          name="./signatureType">
+                                                            <items jcr:primaryType="nt:unstructured">
+                                                                <eSign
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="e-Signature"
+                                                                  value="ESIGN"
+                                                                  selected="{Boolean}true"/>
+                                                                <written
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Written Signature"
+                                                                  value="WRITTEN"/>
+                                                                <digital
+                                                                  jcr:primaryType="nt:unstructured"
+                                                                  text="Digital Signature"
+                                                                  value="DIGITAL"/>
+                                                            </items>
+                                                        </signatureType>
+                                                    </items>
+                                                </field>
+                                            </signers>
+                                        </items>
+                                    </adobeSignFields>
+                                </items>
+                            </columns>
+                        </items>
+                    </signature>
                     <advanced
                             jcr:primaryType="nt:unstructured"
                             sling:resourceType="granite/ui/components/coral/foundation/include"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/css.txt
new file mode 100644
index 0000000000..c2fe35e911
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/css.txt
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright 2022 Adobe
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
+
+#base=css
+editDialog.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/css/editDialog.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/css/editDialog.css
new file mode 100644
index 0000000000..1c17eafcf0
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/css/editDialog.css
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+
+/* Compact signer title row — matches foundation's "Signer One [pencil]" row */
+.cmp-signer-title-row {
+    display: flex !important;
+    align-items: center;
+    gap: 8px;
+}
+
+.cmp-signer-title-row > label {
+    /* Hide the "Title" label in collapsed view; visible when fields expand */
+    display: none;
+}
+
+.cmp-signer-title-row > input,
+.cmp-signer-title-row > coral-textfield {
+    flex: 1;
+    min-width: 0;
+}
+
+/* Push the toggle button to the right, matching foundation's pencil alignment */
+.cmp-signer-toggle-btn {
+    flex-shrink: 0;
+    margin-left: auto;
+}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/js/editDialog.js
index 2991e6074f..49101f7ac5 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/js/editDialog.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editor/js/editDialog.js
@@ -13,7 +13,232 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-(function($, channel, Coral) {
+(function($, Granite, channel, Coral) {
     "use strict";
 
-})(jQuery, jQuery(document), Coral);
\ No newline at end of file
+    var EDIT_DIALOG_FORM    = ".cmp-adaptiveform-formcontainer__editdialog",
+        ADOBE_SIGN_CHECKBOX = "coral-checkbox[name='./_useSignedPdf']",
+        ADOBE_SIGN_FIELDS   = ".cmp-adobesign-fields",
+        SIGNERS_MULTIFIELD  = "coral-multifield[name='./signerInfo/signers']",
+        SIGNER_TITLE_INPUT  = "input[name='./signerTitle']",
+        DEFAULT_SIGNER      = "Signer One",
+
+        Utils = window.CQ.FormsCoreComponents.Utils.v1;
+
+    /**
+     * Reads the current value from a Coral 3 coral-select. The component
+     * exposes the selection through selectedItem; .value alone is not reliable
+     * when the dialog loads or after programmatic updates (same pattern as other
+     * core component edit dialogs, e.g. dropdown, checkbox).
+     */
+    function getCoralSelectValue(selectEl) {
+        if (!selectEl) {
+            return "";
+        }
+        if (selectEl.selectedItem && selectEl.selectedItem.value !== undefined &&
+                selectEl.selectedItem.value !== null) {
+            return String(selectEl.selectedItem.value);
+        }
+        return selectEl.value ? String(selectEl.value) : "";
+    }
+
+    function onCoralSelectChange($select, handler) {
+        if (!$select.length) {
+            return;
+        }
+        var el = $select[0];
+        Coral.commons.ready(el, function() {
+            handler();
+        });
+        $select.off("change.cmpSigner coral-select:change.cmpSigner");
+        $select.on("change.cmpSigner coral-select:change.cmpSigner", handler);
+    }
+
+    // ---------------------------------------------------------------------------
+    // Conditionals within a single expanded signer item
+    // ---------------------------------------------------------------------------
+
+    function applySignerConditionals($item) {
+        if ($item.data("cmp-signer-conditionals-bound")) {
+            var refresh = $item.data("cmp-signer-conditionals-refresh");
+            if (typeof refresh === "function") {
+                refresh();
+            }
+            return;
+        }
+        $item.data("cmp-signer-conditionals-bound", true);
+
+        // --- Email source toggle ---
+        var $emailTypeSelect  = $item.find("coral-select[name='./signerEmailType']");
+        var $emailRef         = $item.find(".cmp-signer-email-ref");
+        var $emailInput       = $item.find(".cmp-signer-email-input");
+
+        function toggleEmail() {
+            var val = getCoralSelectValue($emailTypeSelect[0]) || "fromForm";
+            // fromForm → show ref selector; typed → show text input; userProfile → hide both
+            $emailRef.toggle(val === "fromForm");
+            $emailInput.toggle(val === "typed");
+        }
+        onCoralSelectChange($emailTypeSelect, toggleEmail);
+
+        // --- Auth method toggle (phone block + typed-only inputs) ---
+        var $authSelect       = $item.find("coral-select[name='./authenticationMethod']");
+        var $phoneAuthBlock   = $item.find(".cmp-signer-phone-auth-fields");
+        var $countryTyped     = $item.find(".cmp-signer-country-typed");
+        var $phoneTyped       = $item.find(".cmp-signer-phone-typed");
+        var $countrySource    = $item.find("coral-select[name='./countryCodeSource']");
+        var $phoneSource      = $item.find("coral-select[name='./phoneSource']");
+
+        function togglePhone() {
+            var auth = getCoralSelectValue($authSelect[0]) || "NONE";
+            var showPhone = auth === "PHONE";
+            if ($phoneAuthBlock.length) {
+                $phoneAuthBlock.toggle(showPhone);
+            } else {
+                // Legacy dialog markup (per-field wrapperClass only)
+                $item.find(".cmp-signer-phone-field").toggle(showPhone);
+            }
+            if (showPhone) {
+                applyCountryTyped();
+                applyPhoneTyped();
+            } else {
+                $countryTyped.hide();
+                $phoneTyped.hide();
+            }
+        }
+
+        function applyCountryTyped() {
+            var auth = getCoralSelectValue($authSelect[0]) || "NONE";
+            if (auth !== "PHONE") {
+                return;
+            }
+            var src = getCoralSelectValue($countrySource[0]) || "form";
+            $countryTyped.toggle(src === "typed");
+        }
+
+        function applyPhoneTyped() {
+            var auth = getCoralSelectValue($authSelect[0]) || "NONE";
+            if (auth !== "PHONE") {
+                return;
+            }
+            var src = getCoralSelectValue($phoneSource[0]) || "form";
+            $phoneTyped.toggle(src === "typed");
+        }
+
+        function refreshSignerConditionals() {
+            toggleEmail();
+            togglePhone();
+        }
+        $item.data("cmp-signer-conditionals-refresh", refreshSignerConditionals);
+
+        onCoralSelectChange($authSelect, togglePhone);
+        onCoralSelectChange($countrySource, function() {
+            applyCountryTyped();
+        });
+        onCoralSelectChange($phoneSource, function() {
+            applyPhoneTyped();
+        });
+
+        refreshSignerConditionals();
+    }
+
+    // ---------------------------------------------------------------------------
+    // Signer rows — compact "title + edit icon" collapsed view inside the
+    // coral-multifield, matching the foundation form's signer table appearance.
+    // ---------------------------------------------------------------------------
+
+    function transformSignerItem($item, startExpanded) {
+        Coral.commons.ready($item[0], function() {
+            var $content = $item.find("coral-multifield-item-content");
+            if (!$content.length) $content = $item;
+
+            var $wrappers = $content.children();
+            if ($wrappers.length < 2) {
+                // Collapse UI expects title row + detail rows; composite items often render
+                // as a single wrapper — still wire email/auth visibility.
+                applySignerConditionals($item);
+                return;
+            }
+
+            if ($item.data("cmp-signer-decorated")) return;
+            $item.data("cmp-signer-decorated", true);
+
+            var $titleWrapper   = $wrappers.first();
+            var $detailWrappers = $wrappers.slice(1);
+
+            var $toggle = $('<button type="button" is="coral-button" variant="quiet"' +
+                ' class="cmp-signer-toggle-btn">' +
+                '<coral-icon icon="edit" size="S"></coral-icon>' +
+                '</button>');
+
+            var expanded = !!startExpanded;
+
+            function applyState() {
+                $detailWrappers.toggle(expanded);
+                $toggle.find("coral-icon").attr("icon", expanded ? "chevronUp" : "edit");
+                if (expanded) {
+                    applySignerConditionals($item);
+                }
+            }
+
+            $toggle.on("click", function(e) {
+                e.stopPropagation();
+                expanded = !expanded;
+                applyState();
+            });
+
+            $titleWrapper.addClass("cmp-signer-title-row");
+            $titleWrapper.append($toggle);
+
+            applyState();
+        });
+    }
+
+    function initSignerRows(dialog) {
+        var multifield = dialog.find(SIGNERS_MULTIFIELD)[0];
+        if (!multifield) return;
+
+        Coral.commons.ready(multifield, function() {
+            var $multifield = $(multifield);
+
+            if (multifield.items.length === 0) {
+                var item = multifield.items.add({});
+                Coral.commons.ready(item, function() {
+                    var titleInput = item.querySelector(SIGNER_TITLE_INPUT);
+                    if (titleInput) titleInput.value = DEFAULT_SIGNER;
+                    transformSignerItem($(item), false);
+                });
+            } else {
+                $multifield.find("coral-multifield-item").each(function() {
+                    transformSignerItem($(this), false);
+                });
+            }
+
+            // Items added via "Add Signer" start expanded so author can fill them in
+            $multifield.on("coral-multifield:itemadded", function(e) {
+                transformSignerItem($(e.detail.item), true);
+            });
+        });
+    }
+
+    // ---------------------------------------------------------------------------
+    // Adobe Sign tab — show / hide all fields except the checkbox
+    // ---------------------------------------------------------------------------
+
+    function initAdobeSign(dialog) {
+        var $checkbox = dialog.find(ADOBE_SIGN_CHECKBOX);
+        var $fields   = dialog.find(ADOBE_SIGN_FIELDS);
+
+        function toggleFields() {
+            $fields.toggle($checkbox.length > 0 && $checkbox[0].checked);
+        }
+
+        toggleFields();
+        $checkbox.on("change", toggleFields);
+
+        initSignerRows(dialog);
+    }
+
+    Utils.initializeEditDialog(EDIT_DIALOG_FORM)(initAdobeSign);
+
+})(jQuery, Granite, jQuery(document), Coral);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/.content.xml
index a669a393cf..5bc1892ac0 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/.content.xml
@@ -1,4 +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.container.editor.hook.v2,cq.authoring.editor.hook]"/>
+    categories="[core.forms.components.container.editor.hook.v2,cq.authoring.editor.hook]"
+    dependencies="[guides.touchAuthoringCommon]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/componentutils.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/componentutils.js
index 7350a1cd49..088d0377d1 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/componentutils.js
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/componentutils.js
@@ -82,7 +82,13 @@
                 }
             }
 
-            comData["sling:resourceType"] = config.resourceType;
+            const resourceType = window.CQ.FormsCoreComponents.editorhooks.toCoreSigningResourceType
+                ? window.CQ.FormsCoreComponents.editorhooks.toCoreSigningResourceType(config.resourceType)
+                : config.resourceType;
+            comData["sling:resourceType"] = resourceType;
+            if (window.CQ.FormsCoreComponents.editorhooks.remapSigningContentPayload) {
+                window.CQ.FormsCoreComponents.editorhooks.remapSigningContentPayload(comData);
+            }
             updatedProps = {...comData, ...updatedProps};
             this.setParam(":content", JSON.stringify(updatedProps));    // write component properties
         }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/.content.xml
new file mode 100644
index 0000000000..e868fd238f
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Signature Step"
+    jcr:description="A signature step that integrates with Adobe Sign (echosign) for document signing."
+    sling:resourceSuperType="core/fd/components/form/signaturestep/v1/signaturestep"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/.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/signaturestep/v1/.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/signaturestep/v1/signaturestep/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/.content.xml
new file mode 100644
index 0000000000..8790abd717
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/.content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="signature"
+    jcr:description="A signature step that integrates with Adobe Sign (echosign) for document signing."
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Signature Step (v1)"
+    sling:resourceSuperType="core/fd/components/form/base/v1/base"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..e9a8c2621e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/_cq_dialog/.content.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns: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 Signature Step Component"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[core.forms.components.signaturestep.v1.editor]"
+    helpPath="https://www.adobe.com/go/aem_af_cmp_signaturestep_v1"
+    trackingFeature="core-components:adaptiveform-signaturestep:v1">
+  <content
+      granite:class="cmp-adaptiveform-signaturestep__editdialog"
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/container">
+    <items jcr:primaryType="nt:unstructured">
+      <accordion
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/accordion"
+          sling:hideResource="true"/>
+      <tabs
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/tabs"
+          granite:class="cmp-adaptiveform-base__editdialogbasic"
+          maximized="{Boolean}true">
+        <items jcr:primaryType="nt:unstructured"
+            sling:hideChildren="[validation,patterns]">
+          <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"/>
+                      <richTextTitle
+                          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/richTextTitle"/>
+                      <isTitleRichText
+                          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/isTitleRichText"/>
+                      <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"/>
+                      <signingService
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                          fieldLabel="Signing Service"
+                          fieldDescription="Service to use for collecting the signature."
+                          name="./signingService">
+                        <items jcr:primaryType="nt:unstructured">
+                          <echosign
+                              jcr:primaryType="nt:unstructured"
+                              text="Adobe Sign"
+                              value="echosign"
+                              selected="{Boolean}true"/>
+                          <scribble
+                              jcr:primaryType="nt:unstructured"
+                              text="Scribble Signature"
+                              value="scribble"/>
+                        </items>
+                      </signingService>
+                      <configuration
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                          fieldLabel="Adobe Sign Cloud Configuration"
+                          fieldDescription="Select the Adobe Sign cloud service configuration."
+                          name="./cq:cloudserviceconfigs"
+                          emptyText="Select configuration">
+                        <datasource
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="fd/af/components/commons/datasources/propertyprovider"
+                            rootPath="/etc/cloudservices/echosign"
+                            type="esignCloudServiceConfiguration"/>
+                      </configuration>
+                      <displayMsg
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/textarea"
+                          fieldLabel="Template Message"
+                          fieldDescription="Message shown while the document is loading."
+                          name="./displayMsg"/>
+                      <targetVersion
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                          fieldLabel="Target Version"
+                          fieldDescription="Adobe Sign target version (e.g. 1.1 for multi-user signing)."
+                          name="./fd:targetVersion"/>
+                      <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/base/v1/base/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"/>
+          <advanced
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="granite/ui/components/coral/foundation/include"
+              path="/mnt/overlay/fd/af/authoring/dialog/customProperties/cq:dialog/advanced"/>
+        </items>
+      </tabs>
+    </items>
+  </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/_cq_template.xml
new file mode 100644
index 0000000000..45edf9ec5f
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/_cq_template.xml
@@ -0,0 +1,9 @@
+<?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:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Signature Step"
+    fieldType="plain-text"
+    signingService="echosign"
+    displayMsg="Loading document..."
+    fd:targetVersion="1.1"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/.content.xml
new file mode 100644
index 0000000000..e97a72c7e1
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?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="nt:unstructured"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/.content.xml
new file mode 100644
index 0000000000..b4e403e0c3
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/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.signaturestep.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/signaturestep/v1/signaturestep/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/js.txt
new file mode 100644
index 0000000000..57f9775ff8
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/js.txt
@@ -0,0 +1,2 @@
+#base=js
+signaturestep.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/js/signaturestep.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/js/signaturestep.js
new file mode 100644
index 0000000000..ad0dcfecfe
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/editor/js/signaturestep.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function($) {
+    "use strict";
+
+    const Utils = window.CQ.FormsCoreComponents.Utils.v1,
+        EDIT_DIALOG = ".cmp-adaptiveform-signaturestep__editdialog";
+
+    Utils.initializeEditDialog(EDIT_DIALOG)();
+})(jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..e8b435d7fe
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="[core.forms.components.signaturestep.v1.runtime]"
+    dependencies="[core.forms.components.runtime.base]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/css.txt
new file mode 100644
index 0000000000..2edfd10bde
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/css.txt
@@ -0,0 +1,2 @@
+#base=css
+signaturestepview.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/css/signaturestepview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/css/signaturestepview.css
new file mode 100644
index 0000000000..0ed4c0a5f5
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/css/signaturestepview.css
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+.cmp-adaptiveform-signaturestep {
+    display: block;
+    position: relative;
+    box-sizing: border-box;
+    overflow: auto;
+    max-width: 100%;
+}
+
+.cmp-adaptiveform-signaturestep__header {
+}
+
+.cmp-adaptiveform-signaturestep__title {
+    display: block;
+}
+
+.cmp-adaptiveform-signaturestep__body {
+    width: 100%;
+    overflow: auto;
+    box-sizing: border-box;
+}
+
+.cmp-adaptiveform-signaturestep__template-message {
+    overflow: auto;
+    box-sizing: border-box;
+}
+
+/* iframe: inline style controls show/hide */
+.cmp-adaptiveform-signaturestep__iframe {
+    width: 100%;
+    border: none;
+}
+
+.cmp-adaptiveform-signaturestep__error {
+}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/js.txt
new file mode 100644
index 0000000000..256c4d98f7
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/js.txt
@@ -0,0 +1,2 @@
+#base=js
+signaturestepview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/js/signaturestepview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/js/signaturestepview.js
new file mode 100644
index 0000000000..5ced397730
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/clientlibs/site/js/signaturestepview.js
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+(function () {
+    "use strict";
+
+    class SignatureStep extends FormView.FormFieldBase {
+
+        static NS = FormView.Constants.NS;
+        static IS = "adaptiveFormSignatureStep";
+        static bemBlock = 'cmp-adaptiveform-signaturestep';
+        static selectors = {
+            self: `[data-${this.NS}-is="${this.IS}"]`,
+            header: `.${this.bemBlock}__header`,
+            body: `.${this.bemBlock}__body`,
+            iframe: `.${this.bemBlock}__iframe`,
+            templateMessage: `.${this.bemBlock}__template-message`,
+            errorDiv: `.${this.bemBlock}__error`,
+        };
+
+        // Target version that indicates multi-user Adobe Sign agreement flow
+        static ADOBE_SIGN_MULTI_USER_VERSION = "1.1";
+
+        constructor(params) {
+            super(params);
+            this._messageHandler = this.#onIframeMessage.bind(this);
+        }
+
+        getClass() { return SignatureStep.IS; }
+
+        getWidget() { return null; }
+        getLabel() { return null; }
+        getErrorDiv() { return null; }
+        getTooltipDiv() { return null; }
+        getQuestionMarkDiv() { return null; }
+
+        setModel(model) {
+            super.setModel(model);
+        }
+
+        // Called when the component visibility changes.
+        // Initialize the signing flow when the step first becomes visible.
+        updateVisible(visible, payload) {
+            super.updateVisible(visible, payload);
+            if (visible && !this._signingInitialized) {
+                this._signingInitialized = true;
+                this.#initializeSigning();
+            }
+        }
+
+        // Determine the signing flow from model properties and begin it.
+        #initializeSigning() {
+            const props = this.getModel().properties;
+            const signingService = props["fd:signingService"];
+            const targetVersion = props["fd:targetVersion"];
+            const cloudServiceConfig = props["fd:cloudServiceConfig"] || "";
+
+            if (signingService === "echosign" && targetVersion === SignatureStep.ADOBE_SIGN_MULTI_USER_VERSION) {
+                // Modern multi-user Adobe Sign flow: submit as agreement to get signing URL
+                this.#initAgreementFlow(cloudServiceConfig);
+            }
+            // Scribble and legacy echosign flows are handled by the AF Runtime submit pipeline.
+        }
+
+        // Post the form as an agreement to obtain the Adobe Sign signing URL,
+        // then load that URL inside the iframe.
+        #initAgreementFlow(cloudServiceConfig) {
+            const formContainer = this.formContainer;
+            const action = formContainer.getModel().action;
+
+            if (!action) {
+                this.#showError("Form action URL is not configured.");
+                return;
+            }
+
+            const body = new URLSearchParams({
+                submissionSelector: 'agreement',
+                cloudService: cloudServiceConfig
+            });
+
+            fetch(action, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: body.toString()
+            })
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error(`Server returned ${response.status}`);
+                }
+                return response.json();
+            })
+            .then(data => {
+                if (data && data.signingURL) {
+                    this.#loadSigningIframe(data.signingURL);
+                } else {
+                    this.#showError("Failed to retrieve signing URL from Adobe Sign.");
+                }
+            })
+            .catch(err => {
+                this.#showError("Adobe Sign initialization failed: " + err.message);
+            });
+        }
+
+        // Show the Adobe Sign iframe with the given signing URL and register
+        // the cross-origin message listener for the ESIGN completion event.
+        #loadSigningIframe(signingURL) {
+            const iframe = this.element.querySelector(SignatureStep.selectors.iframe);
+            const templateMsg = this.element.querySelector(SignatureStep.selectors.templateMessage);
+
+            if (templateMsg) templateMsg.style.display = 'none';
+            if (iframe) {
+                iframe.style.display = 'block';
+                iframe.src = signingURL;
+            }
+
+            // Listen for the ESIGN message posted by the Adobe Sign iframe on completion.
+            window.addEventListener('message', this._messageHandler, false);
+        }
+
+        // Handle postMessage events from the Adobe Sign iframe.
+        // Adobe Sign sends { type: 'ESIGN' } when the user completes signing.
+        #onIframeMessage(event) {
+            try {
+                const data = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
+                if (data && data.type === 'ESIGN') {
+                    window.removeEventListener('message', this._messageHandler, false);
+                    this.#onSigningComplete();
+                }
+            } catch (e) {
+                // Ignore messages from other origins that are not JSON
+            }
+        }
+
+        // Signing is complete — navigate to the next step in the wizard.
+        #onSigningComplete() {
+            try {
+                const formModel = this.formContainer.getModel();
+                if (formModel && typeof formModel.setFocus === 'function') {
+                    formModel.setFocus(null);
+                }
+            } catch (e) {
+                // Guard — do not crash if navigation is unavailable
+            }
+        }
+
+        #showError(message) {
+            const errorDiv = this.element.querySelector(SignatureStep.selectors.errorDiv);
+            const templateMsg = this.element.querySelector(SignatureStep.selectors.templateMessage);
+            if (templateMsg) templateMsg.style.display = 'none';
+            if (errorDiv) {
+                errorDiv.textContent = message;
+                errorDiv.style.display = 'block';
+            }
+        }
+    }
+
+    FormView.Utils.setupField(({ element, formContainer }) => {
+        return new SignatureStep({ element, formContainer });
+    }, SignatureStep.selectors.self);
+
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/signaturestep.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/signaturestep.html
new file mode 100644
index 0000000000..594b26150d
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/signaturestep.html
@@ -0,0 +1,54 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+
+<sly data-sly-use.signaturestep="com.adobe.cq.forms.core.components.models.form.SignatureStep"
+     data-sly-use.renderer="${'signaturestep.js'}"
+     data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}"
+     data-sly-use.templates="core/wcm/components/commons/v1/templates.html">
+</sly>
+
+<div data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     class="cmp-adaptiveform-signaturestep"
+     data-cmp-is="adaptiveFormSignatureStep"
+     data-cmp-visible="${signaturestep.visible ? 'true' : 'false'}"
+     data-cmp-enabled="${signaturestep.enabled ? 'true' : 'false'}"
+     id="${signaturestep.id}"
+     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
+
+    <!-- Title header — mirrors the foundation signature step card layout -->
+    <div class="cmp-adaptiveform-signaturestep__header">
+        <span class="cmp-adaptiveform-signaturestep__title">${signaturestep.label.value @ context='text'}</span>
+    </div>
+
+    <!-- Body: loading message, Adobe Sign iframe, or error message -->
+    <div class="cmp-adaptiveform-signaturestep__body">
+
+        <div class="cmp-adaptiveform-signaturestep__template-message"
+             data-sly-test="${signaturestep.displayMsg}">${signaturestep.displayMsg @ context='text'}</div>
+
+        <!-- src is set by JS after the signing URL is obtained from the server -->
+        <iframe class="cmp-adaptiveform-signaturestep__iframe"
+                title="Adobe Sign"
+                frameborder="0"
+                style="display:none;"></iframe>
+
+        <!-- Shown by JS on agreement fetch failure -->
+        <div class="cmp-adaptiveform-signaturestep__error" style="display:none;"></div>
+
+    </div>
+
+</div>
+<sly data-sly-call="${templates.placeholder @ isEmpty = true}"></sly>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/signaturestep.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/signaturestep.js
new file mode 100644
index 0000000000..fda21489fa
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/signaturestep/v1/signaturestep/signaturestep.js
@@ -0,0 +1,34 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+use(function () {
+
+  var clientlibsArr = ['core.forms.components.base.v1.editor'];
+  var labelPath = 'core/fd/components/af-commons/v1/fieldTemplates/label.html';
+  var shortDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/shortDescription.html";
+  var longDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/longDescription.html";
+  var questionMarkPath = "core/fd/components/af-commons/v1/fieldTemplates/questionMark.html";
+  var errorMessagePath = "core/fd/components/af-commons/v1/fieldTemplates/errorMessage.html";
+
+  return {
+    labelPath: labelPath,
+    shortDescriptionPath: shortDescriptionPath,
+    longDescriptionPath: longDescriptionPath,
+    questionMarkPath: questionMarkPath,
+    errorMessagePath: errorMessagePath,
+    clientlibs: clientlibsArr
+  };
+});
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/.content.xml
new file mode 100644
index 0000000000..051d207217
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Summary Step"
+    jcr:description="A summary step that displays a message after form completion and optionally auto-submits."
+    sling:resourceSuperType="core/fd/components/form/summarystep/v1/summarystep"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/.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/summarystep/v1/.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/summarystep/v1/summarystep/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/.content.xml
new file mode 100644
index 0000000000..d5258c369b
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/.content.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="form"
+    jcr:description="A summary step that displays a message after form completion and optionally auto-submits."
+    jcr:primaryType="cq:Component"
+    jcr:title="Adaptive Form Summary Step (v1)"
+    sling:resourceSuperType="core/fd/components/form/base/v1/base"
+    componentGroup=".core-adaptiveform"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/_cq_dialog/.content.xml
new file mode 100644
index 0000000000..2e033bf36e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/_cq_dialog/.content.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns: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 Summary Step Component"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[core.forms.components.summarystep.v1.editor]"
+    helpPath="https://www.adobe.com/go/aem_af_cmp_summarystep_v1"
+    trackingFeature="core-components:adaptiveform-summarystep:v1">
+  <content
+      granite:class="cmp-adaptiveform-summarystep__editdialog"
+      jcr:primaryType="nt:unstructured"
+      sling:resourceType="granite/ui/components/coral/foundation/container">
+    <items jcr:primaryType="nt:unstructured">
+      <accordion
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/accordion"
+          sling:hideResource="true"/>
+      <tabs
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/tabs"
+          granite:class="cmp-adaptiveform-base__editdialogbasic"
+          maximized="{Boolean}true">
+        <items jcr:primaryType="nt:unstructured"
+            sling:hideChildren="[validation,patterns]">
+          <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"/>
+                      <richTextTitle
+                          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/richTextTitle"/>
+                      <isTitleRichText
+                          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/isTitleRichText"/>
+                      <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"/>
+                      <displayMsg
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/richtext"
+                          fieldLabel="Summary Message"
+                          fieldDescription="Message shown to the user after form completion."
+                          name="./displayMsg"
+                          useFixedInlineToolbar="{Boolean}true"/>
+                      <autoSubmit
+                          jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                          fieldLabel="Auto Submit"
+                          name="./autoSubmit"
+                          text="Auto submit"
+                          uncheckedValue="false"
+                          value="true"/>
+                      <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/base/v1/base/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"/>
+          <advanced
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="granite/ui/components/coral/foundation/include"
+              path="/mnt/overlay/fd/af/authoring/dialog/customProperties/cq:dialog/advanced"/>
+        </items>
+      </tabs>
+    </items>
+  </content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/_cq_template.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/_cq_template.xml
new file mode 100644
index 0000000000..154b3b58d4
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/_cq_template.xml
@@ -0,0 +1,7 @@
+<?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="Summary Step"
+    fieldType="plain-text"
+    autoSubmit="{Boolean}true"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/.content.xml
new file mode 100644
index 0000000000..e97a72c7e1
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/.content.xml
@@ -0,0 +1,3 @@
+<?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="nt:unstructured"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/.content.xml
new file mode 100644
index 0000000000..256728161e
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/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.summarystep.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/summarystep/v1/summarystep/clientlibs/editor/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/js.txt
new file mode 100644
index 0000000000..13a9ead296
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/js.txt
@@ -0,0 +1,2 @@
+#base=js
+summarystep.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/js/summarystep.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/js/summarystep.js
new file mode 100644
index 0000000000..8821ff57aa
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/editor/js/summarystep.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+(function($) {
+    "use strict";
+
+    const Utils = window.CQ.FormsCoreComponents.Utils.v1,
+        EDIT_DIALOG = ".cmp-adaptiveform-summarystep__editdialog";
+
+    Utils.initializeEditDialog(EDIT_DIALOG)();
+})(jQuery);
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/.content.xml
new file mode 100644
index 0000000000..581b2945f5
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    allowProxy="{Boolean}true"
+    categories="[core.forms.components.summarystep.v1.runtime]"
+    dependencies="[core.forms.components.runtime.base]"/>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/css.txt
new file mode 100644
index 0000000000..c6c2164a46
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/css.txt
@@ -0,0 +1,2 @@
+#base=css
+summarystepview.css
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/css/summarystepview.css b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/css/summarystepview.css
new file mode 100644
index 0000000000..b19f573f1a
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/css/summarystepview.css
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+.cmp-adaptiveform-summarystep {
+    display: block;
+    position: relative;
+    box-sizing: border-box;
+    overflow: auto;
+    max-width: 100%;
+}
+
+.cmp-adaptiveform-summarystep__title {
+    display: block;
+}
+
+.cmp-adaptiveform-summarystep__content {
+    overflow: auto;
+    box-sizing: border-box;
+}
+
+.cmp-adaptiveform-summarystep__message {
+}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/js.txt
new file mode 100644
index 0000000000..d0a91c6649
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/js.txt
@@ -0,0 +1,2 @@
+#base=js
+summarystepview.js
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/js/summarystepview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/js/summarystepview.js
new file mode 100644
index 0000000000..848768b0dd
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/clientlibs/site/js/summarystepview.js
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+(function () {
+    "use strict";
+
+    class SummaryStep extends FormView.FormFieldBase {
+
+        static NS = FormView.Constants.NS;
+        static IS = "adaptiveFormSummaryStep";
+        static bemBlock = 'cmp-adaptiveform-summarystep';
+        static selectors = {
+            self: `[data-${this.NS}-is="${this.IS}"]`,
+            message: `.${this.bemBlock}__message`,
+        };
+
+        constructor(params) {
+            super(params);
+        }
+
+        getClass() { return SummaryStep.IS; }
+
+        getWidget() { return null; }
+        getLabel() { return null; }
+        getErrorDiv() { return null; }
+        getTooltipDiv() { return null; }
+        getQuestionMarkDiv() { return null; }
+
+        setModel(model) {
+            super.setModel(model);
+            // Sanitize any anchor links in the displayed message to same-origin only.
+            // This mirrors foundation summary.js behaviour (SummaryDataUpdated handler).
+            this.#sanitizeMessageLinks();
+
+            // If autoSubmit is configured, trigger form submission immediately.
+            if (model.properties["fd:autoSubmit"] === true) {
+                this.#autoSubmitForm();
+            }
+        }
+
+        // Restrict all anchor hrefs in the message div to same-origin URLs.
+        #sanitizeMessageLinks() {
+            const messageEl = this.element.querySelector(SummaryStep.selectors.message);
+            if (!messageEl) return;
+            const origin = window.location.origin;
+            messageEl.querySelectorAll('a[href]').forEach(anchor => {
+                const href = anchor.getAttribute('href');
+                if (href && !href.startsWith(origin) && !href.startsWith('/') && !href.startsWith('#')) {
+                    anchor.removeAttribute('href');
+                }
+            });
+        }
+
+        // Dispatch a submit action through the AF Runtime model.
+        #autoSubmitForm() {
+            try {
+                const formModel = this.formContainer.getModel();
+                if (formModel && typeof formModel.dispatch === 'function') {
+                    formModel.dispatch({ type: FormView.Constants.SUBMIT_EVENT || 'submit' });
+                }
+            } catch (e) {
+                // Guard — do not crash the component if dispatch is unavailable
+            }
+        }
+    }
+
+    FormView.Utils.setupField(({ element, formContainer }) => {
+        return new SummaryStep({ element, formContainer });
+    }, SummaryStep.selectors.self);
+
+})();
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/summarystep.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/summarystep.html
new file mode 100644
index 0000000000..14185552c3
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/summarystep.html
@@ -0,0 +1,40 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2024 Adobe
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+
+<sly data-sly-use.summarystep="com.adobe.cq.forms.core.components.models.form.SummaryStep"
+     data-sly-use.renderer="${'summarystep.js'}"
+     data-sly-use.clientlib="${'/libs/granite/sightly/templates/clientlib.html'}"
+     data-sly-use.templates="core/wcm/components/commons/v1/templates.html">
+</sly>
+
+<div data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     class="cmp-adaptiveform-summarystep"
+     data-cmp-is="adaptiveFormSummaryStep"
+     data-cmp-visible="${summarystep.visible ? 'true' : 'false'}"
+     data-cmp-enabled="${summarystep.enabled ? 'true' : 'false'}"
+     id="${summarystep.id}"
+     data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}">
+
+    <div class="cmp-adaptiveform-summarystep__title"
+         data-sly-test="${summarystep.label.value}">${summarystep.label.value @ context='text'}</div>
+
+    <div class="cmp-adaptiveform-summarystep__content">
+        <div class="cmp-adaptiveform-summarystep__message"
+             data-sly-test="${summarystep.displayMsg}">${summarystep.displayMsg @ context='html'}</div>
+    </div>
+
+</div>
+<sly data-sly-call="${templates.placeholder @ isEmpty = true}"></sly>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/summarystep.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/summarystep.js
new file mode 100644
index 0000000000..fda21489fa
--- /dev/null
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/summarystep/v1/summarystep/summarystep.js
@@ -0,0 +1,34 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2024 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+use(function () {
+
+  var clientlibsArr = ['core.forms.components.base.v1.editor'];
+  var labelPath = 'core/fd/components/af-commons/v1/fieldTemplates/label.html';
+  var shortDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/shortDescription.html";
+  var longDescriptionPath = "core/fd/components/af-commons/v1/fieldTemplates/longDescription.html";
+  var questionMarkPath = "core/fd/components/af-commons/v1/fieldTemplates/questionMark.html";
+  var errorMessagePath = "core/fd/components/af-commons/v1/fieldTemplates/errorMessage.html";
+
+  return {
+    labelPath: labelPath,
+    shortDescriptionPath: shortDescriptionPath,
+    longDescriptionPath: longDescriptionPath,
+    questionMarkPath: questionMarkPath,
+    errorMessagePath: errorMessagePath,
+    clientlibs: clientlibsArr
+  };
+});
diff --git a/ui.tests/test-module/specs/signaturestep/signaturestep.runtime.spec.js b/ui.tests/test-module/specs/signaturestep/signaturestep.runtime.spec.js
new file mode 100644
index 0000000000..3d7f2051b9
--- /dev/null
+++ b/ui.tests/test-module/specs/signaturestep/signaturestep.runtime.spec.js
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+describe("Form with Signature Step component", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/signaturestep/basic.html";
+    const bemBlock = 'cmp-adaptiveform-signaturestep';
+    const IS = "adaptiveFormSignatureStep";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    const tabSelector = 'ol li';
+    const tab1 = () => cy.get(tabSelector).eq(0);
+    const tab2 = () => cy.get(tabSelector).eq(1);
+
+    it("should initialize form container", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+    });
+
+    it("should render the signature step in the second tab", () => {
+        tab2().click();
+        tab2().should('have.class', 'cmp-tabs__tab--active');
+        cy.get(`[data-cmp-is="${IS}"]`).should('exist').and('be.visible');
+    });
+
+    it("should have correct BEM block and data attributes on the signature step", () => {
+        tab2().click();
+        cy.get(`[data-cmp-is="${IS}"]`)
+            .should('have.attr', 'data-cmp-is', IS)
+            .and('have.attr', 'data-cmp-visible', 'true');
+        cy.get(`.${bemBlock}`).should('exist');
+    });
+
+    it("should show the template loading message while signing is not initialized", () => {
+        tab2().click();
+        // The template message is visible before a signing URL is loaded.
+        // In test environments without a real Adobe Sign cloud config, the
+        // fetch will fail and the template message remains visible (or the
+        // error div is shown instead).
+        cy.get(`.${bemBlock}__template-message, .${bemBlock}__error`).should('exist');
+    });
+
+    it("should have the iframe hidden until a signing URL is obtained", () => {
+        tab2().click();
+        cy.get(`.${bemBlock}__iframe`).should('not.have.attr', 'src')
+            .or('have.css', 'display', 'none');
+    });
+
+    it("should not show the signature step on the first tab", () => {
+        tab1().click();
+        cy.get(`[data-cmp-is="${IS}"]`).should('not.be.visible');
+    });
+});
diff --git a/ui.tests/test-module/specs/summarystep/summarystep.runtime.spec.js b/ui.tests/test-module/specs/summarystep/summarystep.runtime.spec.js
new file mode 100644
index 0000000000..76c2c69699
--- /dev/null
+++ b/ui.tests/test-module/specs/summarystep/summarystep.runtime.spec.js
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+describe("Form with Summary Step component", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/summarystep/basic.html";
+    const bemBlock = 'cmp-adaptiveform-summarystep';
+    const IS = "adaptiveFormSummaryStep";
+    let formContainer = null;
+
+    beforeEach(() => {
+        cy.previewForm(pagePath).then(p => {
+            formContainer = p;
+        });
+    });
+
+    const tabSelector = 'ol li';
+    const tab1 = () => cy.get(tabSelector).eq(0);
+    const tab2 = () => cy.get(tabSelector).eq(1);
+
+    it("should initialize form container", () => {
+        expect(formContainer, "formcontainer is initialized").to.not.be.null;
+    });
+
+    it("should render the summary step in the second tab", () => {
+        tab2().click();
+        tab2().should('have.class', 'cmp-tabs__tab--active');
+        cy.get(`[data-cmp-is="${IS}"]`).should('exist').and('be.visible');
+    });
+
+    it("should have correct BEM block and data attributes on the summary step", () => {
+        tab2().click();
+        cy.get(`[data-cmp-is="${IS}"]`)
+            .should('have.attr', 'data-cmp-is', IS)
+            .and('have.attr', 'data-cmp-visible', 'true');
+        cy.get(`.${bemBlock}`).should('exist');
+        cy.get(`.${bemBlock}__content`).should('exist');
+    });
+
+    it("should display the configured displayMsg in the message area", () => {
+        tab2().click();
+        cy.get(`.${bemBlock}__message`)
+            .should('exist')
+            .and('not.be.empty');
+        cy.get(`.${bemBlock}__message`).invoke('text').then(text => {
+            expect(text.trim()).to.include('Thank you');
+        });
+    });
+
+    it("should not show the summary step on the first tab", () => {
+        tab1().click();
+        cy.get(`[data-cmp-is="${IS}"]`).should('not.be.visible');
+    });
+});