diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
index 8543ffb1ac..a5085f83a9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs
@@ -6,6 +6,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Files;
 
 public static class FileEntryExtensions
 {
+    private static int _maximumRecursionCount  = 20;
+    
     public static FileEntry ReplaceText(this FileEntry file, string oldText, string newText)
     {
         file.NormalizeLineEndings();
@@ -20,7 +22,7 @@ public static class FileEntryExtensions
 
     public static void RemoveTemplateCodeMarkers(this FileEntry file)
     {
-        if (!file.Content.Contains("</TEMPLATE-REMOVE>"))
+        if (!file.Content.Contains("<TEMPLATE-REMOVE") && !file.Content.Contains("</TEMPLATE-REMOVE>") )
         {
             return;
         }
@@ -37,9 +39,9 @@ public static class FileEntryExtensions
             {
                 //TODO: What if we use inline like: <TEMPLATE-REMOVE IF-NOT="..."> some-code </TEMPLATE-REMOVE>
                 //TODO: This logic skips the code in that case. Should handle it
-                ++i;
+                continue;
             }
-
+            
             if (i < lines.Length)
             {
                 newLines.Add(lines[i]);
@@ -49,9 +51,9 @@ public static class FileEntryExtensions
         file.SetLines(newLines);
     }
 
-    private static void RemoveMarkedTemplateCode(this FileEntry file, List<string> symbols)
+    private static void RemoveMarkedTemplateCode(this FileEntry file, List<string> symbols, int recursionCount = 0)
     {
-        if (!file.Content.Contains("</TEMPLATE-REMOVE>"))
+        if (!file.Content.Contains("<TEMPLATE-REMOVE") || recursionCount > _maximumRecursionCount)
         {
             return;
         }
@@ -97,9 +99,25 @@ public static class FileEntryExtensions
                     continue;
                 }
 
-                while (i < lines.Length && !lines[i].Contains("</TEMPLATE-REMOVE>"))
+                var innerConditionCount = 0;
+                
+                while (i < lines.Length)
                 {
-                    ++i;
+                    i++;
+                    
+                    if (lines[i].Contains("<TEMPLATE-REMOVE"))
+                    {
+                        innerConditionCount++;
+                    }
+                    else if (lines[i].Contains("</TEMPLATE-REMOVE>"))
+                    {
+                        if (innerConditionCount < 1)
+                        {
+                            break;
+                        }
+                        
+                        innerConditionCount--;
+                    }
                 }
 
                 if (lines[i+1].Contains("<TEMPLATE-REMOVE"))
@@ -117,6 +135,8 @@ public static class FileEntryExtensions
         }
 
         file.SetLines(newLines);
+
+        RemoveMarkedTemplateCode(file, symbols, recursionCount + 1);
     }
 
     private static TemplateRemoveMarkerParseResult ParseTemplateRemoveMarker(string marker)
@@ -126,6 +146,7 @@ public static class FileEntryExtensions
         var condition = marker.Trim()
             .RemovePreFix("//").Trim()
             .RemovePreFix("@*").Trim()
+            .RemovePreFix("#").Trim()
             .RemovePreFix("<!--").Trim()
             .RemovePreFix("<TEMPLATE-REMOVE").Trim()
             .RemovePostFix("*@").Trim()
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index 6a0b532135..c94783fa0f 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -37,6 +37,7 @@ public abstract class AppTemplateBase : TemplateInfo
         RandomizeSslPorts(context, steps);
         RandomizeStringEncryption(context, steps);
         UpdateNuGetConfig(context, steps);
+        ConfigureDockerFiles(context, steps);
         ChangeConnectionString(context, steps);
         CleanupFolderHierarchy(context, steps);
 
diff --git a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
index 0649b3c7fb..249f75ebb0 100644
--- a/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
+++ b/framework/src/Volo.Abp.Swashbuckle/wwwroot/swagger/ui/abp.swagger.js
@@ -8,6 +8,8 @@ var abp = abp || {};
         var firstRequest = true;
         abp.appPath = configObject.baseUrl || abp.appPath;
 
+        var requestInterceptor = configObject.requestInterceptor;
+        
         configObject.requestInterceptor = async function (request) {
 
             if(request.url.includes(excludeUrl[1])){
@@ -26,6 +28,10 @@ var abp = abp || {};
             if (antiForgeryToken) {
                 request.headers[abp.security.antiForgery.tokenHeaderName] = antiForgeryToken;
             }
+            
+            if(requestInterceptor){
+                requestInterceptor(request);
+            }
             return request;
         };