From 624d165fbba45c7197b24faaa236847017d98366 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 14 Apr 2021 23:44:13 +1000
Subject: [PATCH 1/2] ensure container is visible in edit mode,

---
 .../contentblock/v2/contentblock/variant.childsection.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html
index 54fce00f6..fed1b5bcc 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/variant.childsection.html
@@ -8,7 +8,7 @@
             <button class="btn btn-link title">${componentProperties.title}</button>
         </div>
         <div id="${componentProperties.componentId}-content"
-             class="${componentProperties.dataToggle}"
+             class="${componentProperties.dataToggle}${wcmmode.edit ? ' show' : ''}"
              aria-labelledby="${componentProperties.componentId}-heading"
              data-parent="#${componentProperties.dataParent}">
             <div class="body">
@@ -16,4 +16,4 @@
             </div>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>

From 66d59613ba68941fe3881437ba0ab5435a3ebce2 Mon Sep 17 00:00:00 2001
From: Seenivasa Ragavan <SSoundarRajan@agl.com.au>
Date: Sun, 25 Apr 2021 13:55:23 +1000
Subject: [PATCH 2/2] Fixing the issue when Replication Type is delete

---
 .../java/design/aem/transport/AkamaiTransportHandler.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/transport/AkamaiTransportHandler.java b/aemdesign-aem-services/src/main/java/design/aem/transport/AkamaiTransportHandler.java
index 0afcf1ac4..ce2dec305 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/transport/AkamaiTransportHandler.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/transport/AkamaiTransportHandler.java
@@ -148,7 +148,10 @@ public ReplicationResult deliver(TransportContext ctx, ReplicationTransaction tx
         ReplicationActionType replicationType = tx.getAction().getType();
 
         // only runs the code if ReplicationAction type matches any of the following
-        if (replicationType == ReplicationActionType.TEST || replicationType == ReplicationActionType.ACTIVATE || replicationType == ReplicationActionType.DEACTIVATE) {
+        if (replicationType == ReplicationActionType.TEST ||
+                replicationType == ReplicationActionType.ACTIVATE ||
+                replicationType == ReplicationActionType.DEACTIVATE ||
+                replicationType == ReplicationActionType.DELETE ) {
             return handleRequest(tx);
         } else {
             throw new ReplicationException("Replication action type " + replicationType + " not supported.");