diff --git a/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.svg b/web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/csharp-mvc/Content/images/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/csharp-mvc/Content/stylesheet.css b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
index 903f2d19..a4a47cf8 100644
--- a/web/documentserver-example/csharp-mvc/Content/stylesheet.css
+++ b/web/documentserver-example/csharp-mvc/Content/stylesheet.css
@@ -158,6 +158,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
index aa01fdaf..0ed34cba 100644
--- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
+++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
@@ -44,7 +44,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get all the supported file extensions
         public static List<string> FileExts
         {
-            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).ToList(); }
+            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).Concat(FillFormExts).ToList(); }
         }
 
         // get file extensions that can be viewed
@@ -53,6 +53,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
+        public static List<string> FillFormExts
+        {
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+        }
+
         // get file extensions that can be edited
         public static List<string> EditedExts
         {
diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
index c25baecb..ebd26b1f 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs
@@ -80,11 +80,16 @@ namespace OnlineEditorsExampleMVC.Models
             var editorsMode = Mode ?? "edit";  // get editor mode
 
             var canEdit = DocManagerHelper.EditedExts.Contains(ext);  // check if the file with such an extension can be edited
-            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
-            var submitForm = canEdit && (editorsMode.Equals("edit") || editorsMode.Equals("fillForms"));  // check if the Submit form button is displayed or not
 
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
+            
+            if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && DocManagerHelper.FillFormExts.Contains(ext)) {
+                editorsMode = "fillForms";
+                canEdit = true;
+            }
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or not
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
 
             // favorite icon state
             bool? favorite = user.favorite;
diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
index adec7d08..e240ae0b 100644
--- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
+++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs
@@ -49,7 +49,7 @@ namespace OnlineEditorsExampleMVC.Models
                 ".dot", ".dotx", ".dotm",
                 ".odt", ".fodt", ".ott", ".rtf", ".txt",
                 ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
             };
 
         // spreadsheet extensions
diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
index 017d7e5b..cc4955f8 100644
--- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
+++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj
@@ -131,6 +131,7 @@
     <Content Include="Content\images\embeded.svg" />
     <Content Include="Content\images\error.svg" />
     <Content Include="Content\images\file_docx.svg" />
+    <Content Include="Content\images\file_docxf.svg" />
     <Content Include="Content\images\file_pptx.svg" />
     <Content Include="Content\images\file_upload.svg" />
     <Content Include="Content\images\file_xlsx.svg" />
@@ -143,6 +144,7 @@
     <Content Include="Content\images\loader16.gif" />
     <Content Include="Content\images\logo.png" />
     <Content Include="Content\images\logo.svg" />
+    <Content Include="Content\images\mobile-fill-forms.svg" />
     <Content Include="Content\images\mobile.svg" />
     <Content Include="Content\images\notdone.svg" />
     <Content Include="Content\images\review.svg" />
diff --git a/web/documentserver-example/csharp-mvc/Scripts/jscript.js b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
index e810a914..b4889c08 100644
--- a/web/documentserver-example/csharp-mvc/Scripts/jscript.js
+++ b/web/documentserver-example/csharp-mvc/Scripts/jscript.js
@@ -168,7 +168,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
index 14d4d78b..c266e8a9 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
@@ -47,9 +47,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -134,6 +136,23 @@
             <% Model.GetMailMergeConfig(out dataMailMergeRecipients); %>
             docEditor.setMailMergeRecipients(<%= dataMailMergeRecipients%>);  // insert recipient data for mail merge into the file
         };
+        
+         var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+             var title = event.data.title;
+             var url = event.data.url;
+             var data = {
+                 title: title,
+                 url: url
+             };
+             let xhr = new XMLHttpRequest();
+             xhr.open("POST", "webeditor.ashx?type=saveas");
+             xhr.setRequestHeader( 'Content-Type', 'application/json');
+             xhr.send(JSON.stringify(data));
+             xhr.onload = function () {
+                 innerAlert(xhr.responseText);
+                 innerAlert(JSON.parse(xhr.responseText).file, true);
+             }
+         };
 
         var config = <%= Model.GetDocConfig(Request, Url) %>;
 
@@ -185,12 +204,15 @@
         };
         // the user is mentioned in a comment
         config.events['onRequestSendNotify'] = function (event) {
-            var actionLink = JSON.stringify(event.data.actionLink);
-            console.log("onRequestSendNotify:");
-            console.log(event.data);
-            console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+            var data = JSON.stringify(event.data);
+            innerAlert("onRequestSendNotify: " + data);
         };
         <% } %>
+        
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
 
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
index bb207b79..b6e33437 100644
--- a/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
+++ b/web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
@@ -65,6 +65,9 @@
                                         <li>
                                             <a class="try-editor slide" data-type="pptx">Presentation</a>
                                         </li>
+                                        <li>
+                                            <a class="try-editor form" data-type="docxf">Master form</a>
+                                        </li>
                                     </ul>
                                     <label class="create-sample">
                                         <input id="createSample" class="checkbox" type="checkbox" />With sample content
@@ -178,8 +181,10 @@
                                             <% foreach (var storedFile in storedFiles)
                                                {
                                                     var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
-                                                            var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower(); 
-                                                            var canEdit = DocManagerHelper.EditedExts.Contains(Path.GetExtension(storedFile.Name).ToLower());
+                                                            var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower();
+                                                            var ext = Path.GetExtension(storedFile.Name).ToLower();
+                                                            var canEdit = DocManagerHelper.EditedExts.Contains(ext);
+                                                            var isFillFormDoc = DocManagerHelper.FillFormExts.Contains(ext);
                                                         %>
 
                                                             <tr class="tableRow" title="<%= storedFile.Name %> [<%= DocManagerHelper.GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
@@ -222,25 +227,40 @@
                                                                     <% } %>
                                                                     <% if (docType == "word") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
-                                                                                <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                                            </a>
-                                                                        </td>
-                                                                     <% } else { %>
-                                                                        <td class="contentCells contentCells-icon"></td>
-                                                                    <% } %>
-                                                                    <% if (docType == "word"){ %>
-                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                             <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "blockcontent" }) %>" target="_blank">
                                                                                 <img src="content/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                             </a>
                                                                         </td>
                                                                     <% } else { %>
-                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                        <td class="contentCells contentCells-icon"></td>
                                                                     <% } %>
                                                                     <% if (docType != "word" && docType != "cell") { %>
                                                                         <td class="contentCells contentCells-icon "></td>
                                                                     <% } %>
+                                                                    <% if (isFillFormDoc) { %>
+                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                                <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                            </a>
+                                                                        </td>
+                                                                    <% } else { %>
+                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                        <% } %>
+                                                                <% } else if (isFillFormDoc) { %>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon">
+                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                           <img src="content/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices"/>
+                                                                       </a>
+                                                                    </td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                           <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                       </a>
+                                                                    </td>
                                                                 <% } else { %>
                                                                     <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                                 <% } %>
@@ -351,6 +371,7 @@
     <%: Scripts.Render("~/bundles/jquery", "~/bundles/scripts") %>
 
     <script language="javascript" type="text/javascript">
+        var FillExtList = '<%= string.Join(",", DocManagerHelper.FillFormExts.ToArray()) %>';
         var ConverExtList = '<%= string.Join(",", DocManagerHelper.ConvertExts.ToArray()) %>';
         var EditedExtList = '<%= string.Join(",", DocManagerHelper.EditedExts.ToArray()) %>';
         var UrlConverter = '<%= Url.Content("~/webeditor.ashx?type=convert") %>';
diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
index 34b02828..283dfce7 100644
--- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
@@ -64,6 +64,81 @@ namespace OnlineEditorsExampleMVC
                 case "files":
                     Files(context);
                     break;
+                case "saveas":
+                    SaveAs(context);
+                    break;
+            }
+        }
+
+        private static void SaveAs(HttpContext context)
+        {
+            context.Response.ContentType = "text/plain";
+            try
+            {
+                    string fileData;
+                try
+                {
+                    using (var receiveStream = context.Request.InputStream)
+                    using (var readStream = new StreamReader(receiveStream))
+                    {
+                        fileData = readStream.ReadToEnd();
+                        if (string.IsNullOrEmpty(fileData)) context.Response.Write("{\"error\":\"Request stream is empty\"}");
+                    }
+                }
+                catch (Exception e)
+                {
+                    throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
+                }
+    
+                var jss = new JavaScriptSerializer();
+                var body = jss.Deserialize<Dictionary<string, object>>(fileData);
+                var fileUrl = (string) body["url"];
+                var title = (string) body["title"];
+                var fileName = DocManagerHelper.GetCorrectName(title);
+                var extension = "." + (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
+    
+                var allExt = DocManagerHelper.ConvertExts
+                    .Concat(DocManagerHelper.EditedExts)
+                    .Concat(DocManagerHelper.ViewedExts)
+                    .Concat(DocManagerHelper.FillFormExts)
+                    .ToArray();
+    
+                if (!allExt.Contains(extension))
+                { 
+                    context.Response.Write("{\"error\":\"File type is not supported\"}");
+                }
+                
+                var req = (HttpWebRequest)WebRequest.Create(fileUrl);
+    
+                using (var stream = req.GetResponse().GetResponseStream())
+                {
+                    
+                    if (stream == null || req.GetResponse().ContentLength <= 0 || req.GetResponse().ContentLength > DocManagerHelper.MaxFileSize)
+                    {
+                        context.Response.Write("{\"error\": \"File size is incorrect\"}");
+                    }
+                    const int bufferSize = 4096;
+                
+                    using (var fs = File.Open(DocManagerHelper.StoragePath(fileName, null), FileMode.Create))
+                    {
+                        var buffer = new byte[bufferSize];
+                        int readed;
+                        while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
+                        {
+                            fs.Write(buffer, 0, readed);  // write bytes to the output stream
+                        }
+                    }
+                }
+                    
+                var id = context.Request.Cookies.GetOrDefault("uid", null);
+                var user = Users.getUser(id);  // get the user
+                DocManagerHelper.CreateMeta(fileName, user.id, user.name, null);
+    
+                context.Response.Write("{ \"file\": \"" + fileName + "\"}");
+            }
+            catch (Exception e)
+            {
+                context.Response.Write("{ \"error\": \"" + 1 + "\", \"message\": \"" + e.Message + "\"}");
             }
         }
 
diff --git a/web/documentserver-example/csharp-mvc/assets b/web/documentserver-example/csharp-mvc/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/csharp-mvc/assets
+++ b/web/documentserver-example/csharp-mvc/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config
index 075d6338..88410ca6 100644
--- a/web/documentserver-example/csharp-mvc/web.appsettings.config
+++ b/web/documentserver-example/csharp-mvc/web.appsettings.config
@@ -6,8 +6,9 @@
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
   
+  <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />
diff --git a/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.svg b/web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/csharp/App_Themes/images/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/csharp/App_Themes/stylesheet.css b/web/documentserver-example/csharp/App_Themes/stylesheet.css
index 0b8d4e3f..d03489f4 100644
--- a/web/documentserver-example/csharp/App_Themes/stylesheet.css
+++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css
@@ -158,6 +158,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index 1e5c7ba9..2a6368d9 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -67,6 +67,9 @@
                                             <li>
                                                 <a class="try-editor slide" data-type="slide">Presentation</a>
                                             </li>
+                                            <li>
+                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                            </li>
                                         </ul>
                                         <label class="create-sample">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content
@@ -179,8 +182,10 @@
                                                 <%  foreach (var storedFile in storedFiles)
                                                     {
                                                         var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                        var ext = Path.GetExtension(storedFile.Name).ToLower();
                                                         var docType = DocumentType(storedFile.Name);
-                                                        var canEdit = EditedExts.Contains(Path.GetExtension(storedFile.Name).ToLower());
+                                                        var canEdit = EditedExts.Contains(ext);
+                                                        var isFillFormDoc = FillFormsExts.Contains(ext);
                                                         %>
 
                                                         <tr class="tableRow" title="<%= storedFile.Name %> [<%= GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
@@ -223,25 +228,40 @@
                                                                 <% } %>
                                                                 <% if (docType == "word") { %>
                                                                     <td class="contentCells contentCells-icon">
-                                                                    <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
-                                                                        <img src="app_themes/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                                    </a>
-                                                                </td>
-                                                                <% } else { %>
-                                                                    <td class="contentCells contentCells-icon"></td>
-                                                                <% } %>
-                                                                <% if (docType == "word") { %>
-                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                         <a href="<%= editUrl + "&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
                                                                             <img src="app_themes/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                         </a>
                                                                     </td>
                                                                 <% } else{%>
-                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                    <td class="contentCells contentCells-icon"></td>
                                                                 <%} %>
                                                                 <%if (docType != "word" && docType != "cell"){%>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                 <% } %>
+                                                                    <% if (isFillFormDoc) { %>
+                                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                                                                <img src="app_themes/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                            </a>
+                                                                        </td>
+                                                                <% } else { %>
+                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% } %>
+                                                                <% } else if (isFillFormDoc) { %>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon">
+                                                                        <a href="<%= editUrl + "&editorsType=mobile&editorsMode=fillForms" %>" target="_blank">
+                                                                           <img src="app_themes/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices"/>
+                                                                        </a>
+                                                                    </td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-icon "></td>
+                                                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                        <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                                                            <img src="app_themes/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                        </a>
+                                                                    </td>
                                                             <% } else { %>
                                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                             <% } %>
@@ -358,6 +378,7 @@
     <script language="javascript" type="text/javascript" src="script/jquery.dropdownToggle.js"></script>
     <script language="javascript" type="text/javascript" src="script/jscript.js"></script>
     <script language="javascript" type="text/javascript">
+        var FillFormExtList = '<%= string.Join(",", FillFormsExts.ToArray()) %>';
         var ConverExtList = '<%= string.Join(",", ConvertExts.ToArray()) %>';
         var EditedExtList = '<%= string.Join(",", EditedExts.ToArray()) %>';
     </script>
diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs
index a47e1ce5..7b3141b8 100644
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@@ -56,7 +56,7 @@ namespace OnlineEditorsExample
                 ".dot", ".dotx", ".dotm",
                 ".odt", ".fodt", ".ott", ".rtf", ".txt",
                 ".html", ".htm", ".mht", ".xml",
-                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
             };
 
         // get an internal file extension
@@ -109,7 +109,7 @@ namespace OnlineEditorsExample
         // get all the supported file extensions
         private static List<string> FileExts
         {
-            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).ToList(); }
+            get { return ViewedExts.Concat(EditedExts).Concat(ConvertExts).Concat(FillFormsExts).ToList(); }
         }
 
         // file extensions that can be viewed
@@ -117,6 +117,11 @@ namespace OnlineEditorsExample
         {
             get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
+        
+        public static List<string> FillFormsExts
+        {
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
+        }
 
         // file extensions that can be edited
         public static List<string> EditedExts
@@ -366,6 +371,72 @@ namespace OnlineEditorsExample
             return _fileName;
         }
 
+        public static string DoSaveAs(HttpContext context)
+        {
+            string fileData;
+            try
+            {
+                using (var receiveStream = context.Request.InputStream)
+                using (var readStream = new StreamReader(receiveStream))
+                {
+                    fileData = readStream.ReadToEnd();
+                    if (string.IsNullOrEmpty(fileData)) return "{\"error\":\"Request stream is empty\"}";
+                }
+            }
+            catch (Exception e)
+            {
+                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
+            }
+
+            var jss = new JavaScriptSerializer();
+            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
+            var fileUrl = (string) body["url"];
+            var title = (string) body["title"];
+            var fileName = GetCorrectName(title);
+            var extension = "." + (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
+
+            var allExt = ConvertExts.Concat(EditedExts).Concat(ViewedExts).Concat(FillFormsExts).ToArray();
+
+            if (!allExt.Contains(extension))
+            {
+                return "{\"error\":\"File type is not supported\"}";
+            }
+            
+            var req = (HttpWebRequest)WebRequest.Create(fileUrl);
+            
+            // hack. http://ubuntuforums.org/showthread.php?t=1841740
+            if (IsMono)
+            {
+                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
+            }
+            
+            using (var stream = req.GetResponse().GetResponseStream())
+            {
+                
+                if (stream == null || req.GetResponse().ContentLength <= 0 || req.GetResponse().ContentLength > MaxFileSize)
+                {
+                    return "{\"error\": \"File size is incorrect\"}";
+                }
+                const int bufferSize = 4096;
+            
+                using (var fs = File.Open(StoragePath(fileName, null), FileMode.Create))
+                {
+                    var buffer = new byte[bufferSize];
+                    int readed;
+                    while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
+                    {
+                        fs.Write(buffer, 0, readed);  // write bytes to the output stream
+                    }
+                }
+            }
+                
+            var id = context.Request.Cookies.GetOrDefault("uid", null);
+            var user = Users.getUser(id);  // get the user
+            DocEditor.CreateMeta(fileName, user.id, user.name, null);
+
+            return "{\"file\": \"" + fileName + "\"}";
+        }
+
         // converting a file
         public static string DoConvert(HttpContext context)
         {
diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx
index 858e3d34..91da585d 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx
+++ b/web/documentserver-example/csharp/DocEditor.aspx
@@ -65,9 +65,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -146,6 +148,23 @@
         var onRequestMailMergeRecipients = function (event) {
             docEditor.setMailMergeRecipients(<%= DataMailMergeRecipients %>);  // insert recipient data for mail merge into the file
         };
+        
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "webeditor.ashx?type=saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        };
 
         var config = <%= DocConfig %>;
 
@@ -190,12 +209,15 @@
         };
         // the user is mentioned in a comment
         config.events['onRequestSendNotify'] = function (event) {
-            var actionLink = JSON.stringify(event.data.actionLink);
-            console.log("onRequestSendNotify:");
-            console.log(event.data);
-            console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+            var data = JSON.stringify(event.data);
+            innerAlert("onRequestSendNotify: " + data);
         };
         <% } %>
+        
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
 
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs
index 2efc8d6f..f29a8cc0 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@@ -145,12 +145,17 @@ namespace OnlineEditorsExample
             var editorsMode = Request.GetOrDefault("editorsMode", "edit");
 
             var canEdit = _Default.EditedExts.Contains(ext);  // check if this file can be edited
-            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
-            var submitForm = canEdit && (editorsMode.Equals("edit") || editorsMode.Equals("fillForms"));  // check if the Submit form button is displayed or hidden
             var editorsType = Request.GetOrDefault("editorsType", "desktop");
 
             var id = Request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);  // get the user
+            
+            if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && _Default.FillFormsExts.Contains(ext)) {
+                editorsMode = "fillForms";
+                canEdit = true;
+            }            
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
 
             var jss = new JavaScriptSerializer();
 
@@ -524,6 +529,9 @@ namespace OnlineEditorsExample
                 case "slide":
                     ext = ".pptx";  // .pptx for slide document type
                     break;
+                case "docxf":
+                    ext = ".docxf";
+                    break;
                 default:
                     return;
             }
diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
index de99848b..da373506 100644
--- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj
+++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
@@ -80,6 +80,7 @@
     <Content Include="App_Themes\images\embeded.svg" />
     <Content Include="App_Themes\images\error.svg" />
     <Content Include="App_Themes\images\file_docx.svg" />
+    <Content Include="App_Themes\images\file_docxf.svg" />
     <Content Include="App_Themes\images\file_pptx.svg" />
     <Content Include="App_Themes\images\file_upload.svg" />
     <Content Include="App_Themes\images\file_xlsx.svg" />
@@ -90,6 +91,7 @@
     <Content Include="App_Themes\images\icon_xlsx.svg" />
     <Content Include="App_Themes\images\info.svg" />
     <Content Include="App_Themes\images\logo.svg" />
+    <Content Include="App_Themes\images\mobile-fill-forms.svg" />
     <Content Include="App_Themes\images\mobile.svg" />
     <Content Include="App_Themes\images\notdone.svg" />
     <Content Include="App_Themes\images\review.svg" />
diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs
index 3f21772c..15849968 100644
--- a/web/documentserver-example/csharp/WebEditor.ashx.cs
+++ b/web/documentserver-example/csharp/WebEditor.ashx.cs
@@ -62,6 +62,23 @@ namespace OnlineEditorsExample
                 case "files":
                     Files(context);
                     break;
+                case "saveas":
+                    SaveAs(context);
+                    break;
+            }
+        }
+
+        private static void SaveAs(HttpContext context)
+        {
+            context.Response.ContentType = "text/plain";
+            try
+            {
+                var result = _Default.DoSaveAs(context);
+                context.Response.Write(result);
+            }
+            catch (Exception e)
+            {
+                context.Response.Write("{ \"error\": \"" + 1 + "\", \"message\": \"" + e.Message + "\"}");
             }
         }
 
diff --git a/web/documentserver-example/csharp/assets b/web/documentserver-example/csharp/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/csharp/assets
+++ b/web/documentserver-example/csharp/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/csharp/script/jscript.js b/web/documentserver-example/csharp/script/jscript.js
index 13910eb3..36a87ce5 100644
--- a/web/documentserver-example/csharp/script/jscript.js
+++ b/web/documentserver-example/csharp/script/jscript.js
@@ -168,7 +168,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillFormExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config
index e1727602..f98711f6 100644
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@@ -6,8 +6,9 @@
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
 
+  <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
index 8bfceaa6..81c08e28 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
@@ -58,6 +58,9 @@ public class FileController {
     @Value("${files.docservice.header}")
     private String documentJwtHeader;
 
+    @Value("${filesize-max}")
+    private String filesizeMax;
+
     @Autowired
     private FileUtility fileUtility;
     @Autowired
@@ -278,4 +281,35 @@ public class FileController {
 
         return"{\"error\":" + error + "}";
     }
+
+    @PostMapping("/saveas")
+    @ResponseBody
+    public String saveAs(@RequestBody JSONObject body, @CookieValue("uid") String uid) {
+        String title = (String) body.get("title");
+        String saveAsFileUrl = (String) body.get("url");
+
+        try {
+            String fileName = documentManager.getCorrectName(title);
+            String curExt = fileUtility.getFileExtension(fileName);
+
+            if (!fileUtility.getFileExts().contains(curExt)) {
+                return "{\"error\":\"File type is not supported\"}";
+            }
+
+            URL url = new URL(saveAsFileUrl);
+            java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
+            InputStream stream = connection.getInputStream();
+
+            if (Integer.parseInt(filesizeMax) < stream.available() || stream.available() <= 0) {
+                return "{\"error\":\"File size is incorrect\"}";
+            }
+            storageMutator.createFile(Path.of(storagePathBuilder.getFileLocation(fileName)), stream);
+            createUserMetadata(uid, fileName);
+
+            return "{\"file\":  \"" + fileName + "\"}";
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}";
+        }
+    }
 }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
index 9a22382a..f9e28586 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
@@ -70,6 +70,7 @@ public class IndexController {
         List<String> docTypes = new ArrayList<>();
         List<Boolean> filesEditable = new ArrayList<>();
         List<String> versions = new ArrayList<>();
+        List<Boolean> isFillFormDoc = new ArrayList<>();
 
         List<User> users = userService.findAll();
 
@@ -82,8 +83,10 @@ public class IndexController {
             docTypes.add(fileUtility.getDocumentType(fileName).toString().toLowerCase());
             filesEditable.add(fileUtility.getEditedExts().contains(fileUtility.getFileExtension(fileName)));
             versions.add(" ["+storagePathBuilder.getFileVersion(fileName, true)+"]");
+            isFillFormDoc.add(fileUtility.getFillExts().contains(fileUtility.getFileExtension(fileName)));
         }
 
+        model.addAttribute("isFillFormDoc", isFillFormDoc);
         model.addAttribute("versions",versions);
         model.addAttribute("files", files);
         model.addAttribute("docTypes", docTypes);
@@ -100,6 +103,7 @@ public class IndexController {
     public HashMap<String, String> configParameters(){
         HashMap<String, String> configuration = new HashMap<>();
 
+        configuration.put("FillExtList", String.join(",", fileUtility.getFillExts()));
         configuration.put("ConverExtList", String.join(",",fileUtility.getConvertExts()));
         configuration.put("EditedExtList", String.join(",",fileUtility.getEditedExts()));
         configuration.put("UrlConverter", urlConverter);
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
index 23e115d5..d2338f14 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
@@ -46,12 +46,15 @@ public class DefaultFileUtility implements FileUtility {
     @Value("${files.docservice.convert-docs}")
     private String docserviceConvertDocs;
 
+    @Value("${files.docservice.fillforms-docs}")
+    private String docserviceFillDocs;
+
     private List<String> ExtsDocument = Arrays.asList(
                             ".doc", ".docx", ".docm",
                             ".dot", ".dotx", ".dotm",
                             ".odt", ".fodt", ".ott", ".rtf", ".txt",
                             ".html", ".htm", ".mht", ".xml",
-                            ".pdf", ".djvu", ".fb2", ".epub", ".xps");
+                            ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oform");
 
     private List<String> ExtsSpreadsheet = Arrays.asList(
                             ".xls", ".xlsx", ".xlsm",
@@ -118,6 +121,11 @@ public class DefaultFileUtility implements FileUtility {
         return ".docx";
     }
 
+    public List<String> getFillExts()
+    {
+        return Arrays.asList(docserviceFillDocs.split("\\|"));
+    }
+
     public List<String> getViewedExts()
     {
         return Arrays.asList(docserviceViewedDocs.split("\\|"));
@@ -139,6 +147,7 @@ public class DefaultFileUtility implements FileUtility {
         res.addAll(getViewedExts());
         res.addAll(getEditedExts());
         res.addAll(getConvertExts());
+        res.addAll(getFillExts());
 
         return res;
     }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
index 25b622ed..5a6eaca4 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
@@ -30,6 +30,7 @@ public interface FileUtility {
     String getFileExtension(String url);
     String getInternalExtension(DocumentType type);
     List<String> getFileExts();
+    List<String> getFillExts();
     List<String> getViewedExts();
     List<String> getEditedExts();
     List<String> getConvertExts();
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
index 022c0c6b..98444687 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
@@ -20,6 +20,7 @@ package com.onlyoffice.integration.services.configurers.implementations;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.models.configurations.Customization;
+import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.services.configurers.CustomizationConfigurer;
 import com.onlyoffice.integration.services.configurers.wrappers.DefaultCustomizationWrapper;
 import org.springframework.context.annotation.Primary;
@@ -31,7 +32,7 @@ public class DefaultCustomizationConfigurer implements CustomizationConfigurer<D
     @Override
     public void configure(Customization customization, DefaultCustomizationWrapper wrapper){
         Action action = wrapper.getAction();
-        Boolean canEdit = wrapper.getCanEdit();
-        customization.setSubmitForm(canEdit && (action.equals(Action.edit) || action.equals(Action.fillForms)));
+        User user = wrapper.getUser();
+        customization.setSubmitForm(action.equals(Action.fillForms) && user.getId() == 1 && false);
     }
 }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
index db644644..d67084f3 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
@@ -55,7 +55,7 @@ public class DefaultDocumentConfigurer implements DocumentConfigurer<DefaultDocu
         document.setTitle(fileName);
         document.setUrl(documentManager.getDownloadUrl(fileName));
         document.setUrlUser(documentManager.getFileUri(fileName, false));
-        document.setFileType(fileUtility.getInternalExtension(fileUtility.getDocumentType(fileName)).replace(".",""));
+        document.setFileType(fileUtility.getFileExtension(fileName).replace(".",""));
         document.getInfo().setFavorite(wrapper.getFavorite());
 
         String key =  serviceConverter.
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
index d5c24117..216a813e 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
@@ -73,18 +73,19 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
             config.setActionLink(objectMapper.readValue(wrapper.getActionData(), (JavaType) new TypeToken<HashMap<String, Object>>() { }.getType()));
         }
         String fileName = wrapper.getFileName();
+        String fileExt = fileUtility.getFileExtension(fileName);
         boolean userIsAnon = wrapper.getUser().getName().equals("Anonymous");
 
         config.setTemplates(userIsAnon ? null : templateManager.createTemplates(fileName));
         config.setCallbackUrl(documentManager.getCallback(fileName));
         config.setCreateUrl(userIsAnon ? null : documentManager.getCreateUrl(fileName, false));
         config.setLang(wrapper.getLang());
-        Boolean canEdit = fileUtility.getEditedExts().contains(fileUtility.getFileExtension(fileName));
+        Boolean canEdit = wrapper.getCanEdit();
         Action action = wrapper.getAction();
 
         defaultCustomizationConfigurer.configure(config.getCustomization(), DefaultCustomizationWrapper.builder()
                 .action(action)
-                .canEdit(canEdit)
+                .user(wrapper.getUser())
                 .build());
         config.setMode(canEdit && !action.equals(Action.view) ? Mode.edit : Mode.view);
         config.setUser(mapper.toModel(wrapper.getUser()));
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
index 9feb7348..ef30ff02 100755
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
@@ -66,17 +66,19 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
             fileModel.setType(wrapper.getType());
 
             Permission userPermissions = mapper.toModel(wrapper.getUser().getPermissions());
-            userPermissions.setComment(
-                    !action.equals(Action.view)
-                            && !action.equals(Action.fillForms)
-                            && !action.equals(Action.embedded)
-                            && !action.equals(Action.blockcontent)
-            );
+
+            String fileExt = fileUtility.getFileExtension(wrapper.getFileName());
+            Boolean canEdit = fileUtility.getEditedExts().contains(fileExt);
+            if ((!canEdit && action.equals(Action.edit) || action.equals(Action.fillForms)) && fileUtility.getFillExts().contains(fileExt)) {
+                canEdit = true;
+                wrapper.setAction(Action.fillForms);
+            }
+            wrapper.setCanEdit(canEdit);
 
             DefaultDocumentWrapper documentWrapper = DefaultDocumentWrapper
                     .builder()
                     .fileName(fileName)
-                    .permission(userPermissions)
+                    .permission(updatePermissions(userPermissions, action, canEdit))
                     .favorite(wrapper.getUser().getFavorite())
                     .build();
 
@@ -99,4 +101,31 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
         configure(fileModel, wrapper);
         return fileModel;
     }
+
+    private Permission updatePermissions(Permission userPermissions, Action action, Boolean canEdit) {
+        userPermissions.setComment(
+                !action.equals(Action.view)
+                        && !action.equals(Action.fillForms)
+                        && !action.equals(Action.embedded)
+                        && !action.equals(Action.blockcontent)
+        );
+
+        userPermissions.setFillForms(
+                !action.equals(Action.view)
+                        && !action.equals(Action.comment)
+                        && !action.equals(Action.embedded)
+                        && !action.equals(Action.blockcontent)
+        );
+
+        userPermissions.setReview(canEdit &&
+                (action.equals(Action.review) || action.equals(Action.edit)));
+
+        userPermissions.setEdit(canEdit &&
+                (action.equals(Action.view)
+                || action.equals(Action.edit)
+                || action.equals(Action.filter)
+                || action.equals(Action.blockcontent)));
+
+        return userPermissions;
+    }
 }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java
index 0b8ff7d5..dfe8b5fc 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultCustomizationWrapper.java
@@ -19,6 +19,7 @@
 package com.onlyoffice.integration.services.configurers.wrappers;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
+import com.onlyoffice.integration.entities.User;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -26,5 +27,5 @@ import lombok.Getter;
 @Builder
 public class DefaultCustomizationWrapper {
     private Action action;
-    private Boolean canEdit;
+    private User user;
 }
diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
index 81b53e9d..79b1097a 100644
--- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
+++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
@@ -24,9 +24,11 @@ import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 @Builder
+@Setter
 public class DefaultFileWrapper {
     private String fileName;
     private Type type;
@@ -34,4 +36,5 @@ public class DefaultFileWrapper {
     private Language lang;
     private Action action;
     private String actionData;
+    private Boolean canEdit;
 }
diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties
index 509fe98d..6fccee58 100755
--- a/web/documentserver-example/java-spring/src/main/resources/application.properties
+++ b/web/documentserver-example/java-spring/src/main/resources/application.properties
@@ -8,8 +8,9 @@ filesize-max=5242880
 files.storage=
 files.storage.folder=documents
 
+files.docservice.fillforms-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
-files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt|.docxf
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
 files.docservice.history.postfix=-hist
diff --git a/web/documentserver-example/java-spring/src/main/resources/assets b/web/documentserver-example/java-spring/src/main/resources/assets
index 65addf50..346236dd 160000
--- a/web/documentserver-example/java-spring/src/main/resources/assets
+++ b/web/documentserver-example/java-spring/src/main/resources/assets
@@ -1 +1 @@
-Subproject commit 65addf50e40c1a9fceb7c270b6c4b0f6bc5cf2ca
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.svg b/web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/img/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css b/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css
index d00c56c7..dde198c4 100755
--- a/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css
+++ b/web/documentserver-example/java-spring/src/main/resources/static/css/stylesheet.css
@@ -158,6 +158,10 @@ label .checkbox {
     background-image: url("img/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("img/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js b/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
index 43594e88..f8ae3ca8 100755
--- a/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
+++ b/web/documentserver-example/java-spring/src/main/resources/static/scripts/converter.js
@@ -20,10 +20,12 @@ var ConverExtList;
 var EditedExtList;
 var UrlConverter;
 var UrlEditor;
+var FillExtList;
 
 if (typeof jQuery !== "undefined") {
     jQuery.post('/config',
         function(data) {
+            FillExtList = data.FillExtList;
             ConverExtList = data.ConverExtList;
             EditedExtList = data.EditedExtList;
             UrlConverter = data.UrlConverter;
diff --git a/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js b/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
index ecc65215..5393d329 100755
--- a/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
+++ b/web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js
@@ -167,7 +167,7 @@ if (typeof jQuery !== "undefined") {
         var posExt = fileName.lastIndexOf(".");
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";
 
-        if (EditedExtList.indexOf(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
index 3b3f5cfb..567077b6 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html
@@ -31,9 +31,11 @@
         <script th:inline="javascript">
                 var docEditor;
 
-                var innerAlert = function (message) {
+                var innerAlert = function (message, inEditor) {
                     if (console && console.log)
                         console.log(message);
+                    if (inEditor && docEditor)
+                        docEditor.showMessage(message);
                 };
 
                 var onAppReady = function () {
@@ -108,6 +110,23 @@
                     config.editorConfig.user.name = "";
                 }
 
+                var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+                    var title = event.data.title;
+                    var url = event.data.url;
+                    var data = {
+                        title: title,
+                        url: url
+                    };
+                    let xhr = new XMLHttpRequest();
+                    xhr.open("POST", "saveas");
+                    xhr.setRequestHeader( 'Content-Type', 'application/json');
+                    xhr.send(JSON.stringify(data));
+                    xhr.onload = function () {
+                        innerAlert(xhr.responseText);
+                        innerAlert(JSON.parse(xhr.responseText).file, true);
+                    }
+                };
+
                 config.width = "100%";
                 config.height = "100%";
                 config.events = {
@@ -149,15 +168,16 @@
                         });
                     };
                     config.events['onRequestSendNotify'] = function (event) {
-                        var actionLink = JSON.stringify(event.data.actionLink);
-                        var replaceLink =replaceActionLink(location.href, actionLink);
-                        docEditor.setActionLink(replaceLink);
-                        console.log("onRequestSendNotify:");
-                        console.log(event.data);
-                        console.log("Link to comment: " + replaceLink);
+                        event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                        var data = JSON.stringify(event.data);
+                        innerAlert("onRequestSendNotify: " + data);
                     };
                 }
 
+                if (config.editorConfig.createUrl) {
+                    config.events.onRequestSaveAs = onRequestSaveAs;
+                };
+
                 var сonnectEditor = function () {
                     docEditor = new DocsAPI.DocEditor("iframeEditor", config);
                 };
diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/index.html b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
index 76163926..88ce2335 100755
--- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html
+++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html
@@ -54,6 +54,9 @@
                                     <li>
                                         <a class="try-editor slide" data-type="pptx">Presentation</a>
                                     </li>
+                                    <li>
+                                        <a class="try-editor form" data-type="docxf">Master form</a>
+                                    </li>
                                 </ul>
                                 <label class="create-sample">
                                     <input id="createSample" class="checkbox" type="checkbox" />With sample content
@@ -191,27 +194,43 @@
                                                 </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
-                                                                <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                            </a>
-                                                        </td>
-                                                    </div>
-                                                    <div th:if="not (${docTypes[iState.index]}  eq 'word')">
-                                                        <td class="contentCells contentCells-icon "></td>
-                                                    </div>
-                                                    <div th:if="${docTypes[iState.index]} eq 'word'">
-                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                             <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent')}" target="_blank">
                                                             <img src="css/img/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                             </a>
                                                         </td>
                                                     </div>
                                                     <div th:if="not (${docTypes[iState.index]}  eq 'word')">
-                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift "></td>
+                                                        <td class="contentCells contentCells-icon"></td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'slide'">
                                                         <td class="contentCells contentCells-icon "></td>
                                                     </div>
+                                                    <div th:if="${isFillFormDoc[iState.index]}">
+                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
+                                                                <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                            </a>
+                                                        </td>
+                                                    </div>
+                                                    <div th:if="${not isFillFormDoc[iState.index]}">
+                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                    </div>
+                                            </th:block>
+                                            <th:block th:if="${isFillFormDoc[iState.index] and not filesEditable[iState.index]}">
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <td class="contentCells contentCells-icon">
+                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms')}" target="_blank">
+                                                        <img src="css/img/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
+                                                    </a>
+                                                </td>
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <td class="contentCells contentCells-icon "></td>
+                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
+                                                        <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                    </a>
+                                                </td>
                                             </th:block>
                                             <th:block th:if="${not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
index 97ebebab..27f42a0c 100644
--- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
+++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
@@ -40,6 +40,7 @@ import entities.FileType;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 import org.primeframework.jwt.Verifier;
 import org.primeframework.jwt.domain.JWT;
 import org.primeframework.jwt.hmac.HMACVerifier;
@@ -89,6 +90,47 @@ public class IndexServlet extends HttpServlet
             case "files":
                 Files(request, response, writer);
                 break;
+            case "saveas":
+                SaveAs(request, response, writer);
+                break;
+        }
+    }
+
+    private static void SaveAs(HttpServletRequest request, HttpServletResponse response, PrintWriter writer) {
+        response.setContentType("text/plain");
+        try {
+            Scanner scanner = new Scanner(request.getInputStream());
+            scanner.useDelimiter("\\A");
+            String bodyString = scanner.hasNext() ? scanner.next() : "";
+            scanner.close();
+
+            JSONParser parser = new JSONParser();
+            JSONObject body = (JSONObject) parser.parse(bodyString);
+
+            CookieManager cm = new CookieManager(request);
+            User user = Users.getUser(cm.getCookie("uid"));
+
+            String title = (String) body.get("title");
+            String saveAsFileUrl = (String) body.get("url");
+            int filesizeMax = Integer.parseInt(ConfigManager.GetProperty("filesize-max"));
+
+            URL url = new URL(saveAsFileUrl);
+            java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
+            InputStream stream = connection.getInputStream();
+
+            if (filesizeMax < stream.available() || stream.available() <= 0) {
+                writer.write( "{\"error\":\"File size is incorrect\"}");
+            }
+
+            String fileName = DocumentManager.GetCorrectName(title, null);
+            DocumentManager.CreateFile(Paths.get(DocumentManager.StoragePath(fileName, null)), stream);
+
+            DocumentManager.CreateMeta(fileName, user.id, user.name, null);
+
+            writer.write( "{\"file\":  \"" + fileName + "\"}");
+        } catch (Exception e) {
+            e.printStackTrace();
+            writer.write("{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}");
         }
     }
 
diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java
index d8f037a9..ed650563 100755
--- a/web/documentserver-example/java/src/main/java/entities/FileModel.java
+++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java
@@ -100,9 +100,15 @@ public class FileModel
         if (_type != null) type = _type;
 
         // check if the file with such an extension can be edited
-        Boolean canEdit = DocumentManager.GetEditedExts().contains(FileUtility.GetFileExtension(document.title));
+        String fileExt = FileUtility.GetFileExtension(document.title);
+        Boolean canEdit = DocumentManager.GetEditedExts().contains(fileExt);
         // check if the Submit form button is displayed or not
-        editorConfig.customization.submitForm = canEdit && (mode.equals("edit") || mode.equals("fillForms"));
+        editorConfig.customization.submitForm = mode.equals("fillForms") && user.id.equals("uid-1") && false;
+
+        if ((!canEdit && mode.equals("edit") || mode.equals("fillForms")) && DocumentManager.GetFillExts().contains(fileExt)) {
+            canEdit = true;
+            mode = "fillForms";
+        }
         // set the mode parameter: change it to view if the document can't be edited
         editorConfig.mode = canEdit && !mode.equals("view") ? "edit" : "view";
 
diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
index 18744788..863c66e0 100644
--- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
+++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
@@ -18,17 +18,13 @@
 
 package helpers;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -78,10 +74,16 @@ public class DocumentManager
         res.addAll(GetViewedExts());
         res.addAll(GetEditedExts());
         res.addAll(GetConvertExts());
+        res.addAll(GetFillExts());
 
         return res;
     }
 
+    public static List<String> GetFillExts() {
+        String exts = ConfigManager.GetProperty("files.docservice.fill-docs");
+        return Arrays.asList(exts.split("\\|"));
+    }
+
     // get file extensions that can be viewed
     public static List<String> GetViewedExts()
     {
@@ -294,19 +296,7 @@ public class DocumentManager
 
         InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(demoPath + demoName);  // get the input file stream
 
-        File file = new File(StoragePath(fileName, null));
-
-        try (FileOutputStream out = new FileOutputStream(file))
-        {
-            int read;
-            final byte[] bytes = new byte[1024];
-            while ((read = stream.read(bytes)) != -1)
-            {
-                out.write(bytes, 0, read);  // write bytes to the output stream
-            }
-            // force write data to the output stream that can be cached in the current thread
-            out.flush();
-        }
+        CreateFile(Paths.get(StoragePath(fileName, null)), stream);
 
         // create meta information of the demo file
         CreateMeta(fileName, user.id, user.name, null);
@@ -314,6 +304,28 @@ public class DocumentManager
         return fileName;
     }
 
+    public static boolean CreateFile(Path path, InputStream stream) {
+        if (Files.exists(path)){
+            return true;
+        }
+        try {
+            File file = Files.createFile(path).toFile();
+            try (FileOutputStream out = new FileOutputStream(file))
+            {
+                int read;
+                final byte[] bytes = new byte[1024];
+                while ((read = stream.read(bytes)) != -1)
+                {
+                    out.write(bytes, 0, read);
+                }
+                out.flush();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     // get file url
     public static String GetFileUri(String fileName, Boolean forDocumentServer)
     {
diff --git a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
index 5e89c491..9d158e50 100644
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@@ -57,7 +57,7 @@ public class FileUtility
                     ".dot", ".dotx", ".dotm",
                     ".odt", ".fodt", ".ott", ".rtf", ".txt",
                     ".html", ".htm", ".mht", ".xml",
-                    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+                    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
             );
 
     // spreadsheet extensions
diff --git a/web/documentserver-example/java/src/main/resources/assets b/web/documentserver-example/java/src/main/resources/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/java/src/main/resources/assets
+++ b/web/documentserver-example/java/src/main/resources/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties
index bc88de10..493c5a25 100644
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@@ -3,8 +3,9 @@ version=1.0.0
 filesize-max=5242880
 storage-folder=app_data
 
+files.docservice.fill-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
-files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt|.docxf
 files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
 
diff --git a/web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg b/web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/java/src/main/webapp/css/img/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.svg b/web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/java/src/main/webapp/css/img/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
index 53e5f963..20ac8d86 100644
--- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
+++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css
@@ -158,6 +158,10 @@ label .checkbox {
     background-image: url("img/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("img/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp
index 709d8537..971855c7 100644
--- a/web/documentserver-example/java/src/main/webapp/editor.jsp
+++ b/web/documentserver-example/java/src/main/webapp/editor.jsp
@@ -37,9 +37,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -119,6 +121,23 @@
             docEditor.setMailMergeRecipients(${dataMailMergeRecipients});  // insert recipient data for mail merge into the file
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "IndexServlet?type=saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        };
+
         var config = JSON.parse('<%= FileModel.Serialize(Model) %>');
         config.width = "100%";
         config.height = "100%";
@@ -168,13 +187,16 @@
             };
             // the user is mentioned in a comment
             config.events['onRequestSendNotify'] = function (event) {
-                var actionLink = JSON.stringify(event.data.actionLink);
-                console.log("onRequestSendNotify:");
-                console.log(event.data);
-                console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
             };
         <% } %>
 
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
+
         var сonnectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp
index ac18efef..e71ef4fd 100644
--- a/web/documentserver-example/java/src/main/webapp/index.jsp
+++ b/web/documentserver-example/java/src/main/webapp/index.jsp
@@ -64,6 +64,9 @@
                                             <li>
                                                 <a class="try-editor slide" data-type="pptx">Presentation</a>
                                             </li>
+                                            <li>
+                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                            </li>
                                         </ul>
                                         <label class="create-sample">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content
@@ -172,6 +175,7 @@
                                             <table cellspacing="0" cellpadding="0" width="100%">
                                                 <tbody>
                                                     <% for (Integer i = 0; i < files.length; i++) {
+                                                        Boolean isFillFormDoc = DocumentManager.GetFillExts().contains(FileUtility.GetFileExtension(files[i].getName()).toLowerCase());
                                                         String docType = FileUtility.GetFileType(files[i].getName()).toString().toLowerCase();
                                                         Boolean canEdit = DocumentManager.GetEditedExts().contains(FileUtility.GetFileExtension(files[i].getName()));
                                                         String version=" ["+DocumentManager.GetFileVersion(DocumentManager.HistoryDir(DocumentManager.StoragePath(files[i].getName(), null)))+"]";
@@ -216,25 +220,39 @@
                                                                 <% } %>
                                                                 <% if (docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
-                                                                        <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                                    </a>
-                                                                </td>
-                                                                <% } else { %>
-                                                                <td class="contentCells contentCells-icon "></td>
-                                                                <% } %>
-                                                                <% if (docType.equals("word")) { %>
-                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                     <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=blockcontent" target="_blank">
                                                                         <img src="css/img/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                     </a>
                                                                 </td>
                                                                 <% } else { %>
-                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <td class="contentCells contentCells-icon"></td>
                                                                 <% } %>
                                                                 <% if (!docType.equals("cell") && !docType.equals("word")) { %>
                                                                 <td class="contentCells contentCells-icon "></td>
                                                                 <% } %>
+                                                                <% if (isFillFormDoc) { %>
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
+                                                                        <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                    </a>
+                                                                </td>
+                                                                <% } else { %>
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                <% }%>
+                                                                <% } else if (isFillFormDoc) {%>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <td class="contentCells contentCells-icon">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=mobile&mode=fillForms" target="_blank">
+                                                                        <img src="css/img/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
+                                                                    </a>
+                                                                </td>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <td class="contentCells contentCells-icon "></td>
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                    <a href="EditorServlet?fileName=<%= URLEncoder.encode(files[i].getName(), "UTF-8") %>&type=desktop&mode=fillForms" target="_blank">
+                                                                        <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                    </a>
                                                             <% } else { %>
                                                             <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                             <% } %>
@@ -351,6 +369,7 @@
         <script type="text/javascript" src="scripts/jscript.js"></script>
 
         <script language="javascript" type="text/javascript">
+            var FillExtList = "<%= String.join(",", DocumentManager.GetFillExts()) %>";
             var ConverExtList = "<%= String.join(",", DocumentManager.GetConvertExts()) %>";
             var EditedExtList = "<%= String.join(",", DocumentManager.GetEditedExts()) %>";
             var UrlConverter = "IndexServlet?type=convert";
diff --git a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
index 953d727e..824ca76f 100644
--- a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
+++ b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js
@@ -167,7 +167,7 @@ if (typeof jQuery !== "undefined") {
         var posExt = fileName.lastIndexOf(".");
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";
 
-        if (EditedExtList.indexOf(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js
index 4b3a8c8f..8b5324f4 100644
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@@ -103,6 +103,7 @@ app.get("/", function (req, res) {  // define a handler for default page
             preloaderUrl: siteUrl + configServer.get('preloaderUrl'),
             convertExts: configServer.get('convertedDocs').join(","),
             editedExts: configServer.get('editedDocs').join(","),
+            fillExts: configServer.get("fillDocs").join(","),
             storedFiles: docManager.getStoredFiles(),
             params: docManager.getCustomParams(),
             users: users,
@@ -196,7 +197,7 @@ app.post("/upload", function (req, res) {  // define a handler for uploading fil
             return;
         }
 
-        const exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'));  // all the supported file extensions
+        const exts = [].concat(configServer.get('viewedDocs'), configServer.get('editedDocs'), configServer.get('convertedDocs'), configServer.get("fillDocs"));  // all the supported file extensions
         const curExt = fileUtility.getFileExtension(file.name);
         const documentType = fileUtility.getFileType(file.name);
 
@@ -225,6 +226,54 @@ app.post("/upload", function (req, res) {  // define a handler for uploading fil
     });
 });
 
+app.post("/create", function (req, res) {
+    var title = req.body.title;
+    var fileUrl = req.body.url;
+
+    try {
+        docManager.init(storageFolder, req, res);
+        docManager.storagePath(""); // mkdir if not exist
+
+        var fileName = docManager.getCorrectName(title);
+        var userAddress = docManager.curUserHostAddress();
+        docManager.historyPath(fileName, userAddress, true);
+
+        urllib.request(fileUrl, {method: "GET"},function(err, data) {
+            if (configServer.get("maxFileSize") < data.length || data.length <= 0) {  // check if the file size exceeds the maximum file size
+                res.writeHead(200, { "Content-Type": "application/json" });
+                res.write(JSON.stringify({ "error": "File size is incorrect" }));
+                res.end();
+                return;
+            }
+
+            const exts = [].concat(configServer.get("viewedDocs"), configServer.get("editedDocs"), configServer.get("convertedDocs"), configServer.get("fillDocs"));  // all the supported file extensions
+            const curExt = fileUtility.getFileExtension(fileName);
+
+            if (exts.indexOf(curExt) == -1) {  // check if the file extension is supported
+                res.writeHead(200, { "Content-Type": "application/json" });  // and write the error status and message to the response
+                res.write(JSON.stringify({ "error": "File type is not supported" }));
+                res.end();
+                return;
+            }
+
+            fileSystem.writeFileSync(docManager.storagePath(fileName), data);
+
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.write(JSON.stringify({ "file" : fileName }));
+            res.end();
+
+        });
+
+    } catch (e) {
+        res.status(500);
+        res.write(JSON.stringify({
+            error: 1,
+            message: e.message
+        }));
+        res.end();
+    }
+});
+
 app.post("/convert", function (req, res) {  // define a handler for converting files
 
     var fileName = fileUtility.getFileName(req.body.filename);
@@ -687,6 +736,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
             res.redirect(redirectPath);
             return;
         }
+        fileExt = fileUtility.getFileExtension(fileName);
 
         var userAddress = docManager.curUserHostAddress();
         if (!docManager.existsSync(docManager.storagePath(fileName, userAddress))) {  // if the file with a given name doesn't exist
@@ -703,8 +753,12 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 type = new RegExp(configServer.get("mobileRegEx"), "i").test(req.get('User-Agent')) ? "mobile" : "desktop";
             }
 
-        var canEdit = configServer.get('editedDocs').indexOf(fileUtility.getFileExtension(fileName)) != -1;  // check if this file can be edited
-        var submitForm = canEdit && (mode == "edit" || mode == "fillForms");
+        var canEdit = configServer.get('editedDocs').indexOf(fileExt) != -1;  // check if this file can be edited
+        if ((!canEdit && mode == "edit" || mode == "fillForms") && configServer.get('fillDocs').indexOf(fileExt) != -1) {
+            mode = "fillForms";
+            canEdit = true;
+        }
+        var submitForm = mode == "fillForms" && userid == "uid-1" && !1;
 
         var countVersion = 1;
 
@@ -728,7 +782,7 @@ app.get("/editor", function (req, res) {  // define a handler for editing docume
                 var historyD = {
                     version: i,
                     key: keyVersion,
-                    url: i == countVersion ? url : (docManager.getlocalFileUri(fileName, i, true) + "/prev" + fileUtility.getFileExtension(fileName)),
+                    url: i == countVersion ? url : (docManager.getlocalFileUri(fileName, i, true) + "/prev" + fileExt),
                 };
 
                 if (i > 1 && docManager.existsSync(docManager.diffPath(fileName, userAddress, i-1))) {  // check if the path to the file with document versions differences exists
diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json
index 5bc3f7b5..ec446cd4 100644
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@@ -23,7 +23,8 @@
     "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
     "exampleUrl": null,
     "viewedDocs": [".pdf", ".djvu", ".xps", ".oxps"],
-    "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt"],
+    "editedDocs": [".docx", ".xlsx", ".csv", ".pptx", ".txt", ".docxf"],
+    "fillDocs": [".docx", ".oform"],
     "convertedDocs": [".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".xml", ".epub", ".fb2"],
     "storageFolder": "./files",
     "storagePath": "/files",
diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js
index 39dbd9ee..4dd32c48 100644
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@@ -63,7 +63,7 @@ fileUtility.fileType = {
 }
 
 // the document extension list
-fileUtility.documentExts = [".doc", ".docx", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".xml", ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"];
+fileUtility.documentExts = [".doc", ".docx", ".oform", ".docm", ".dot", ".dotx", ".dotm", ".odt", ".fodt", ".ott", ".rtf", ".txt", ".html", ".htm", ".mht", ".xml", ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"];
 
 // the spreadsheet extension list
 fileUtility.spreadsheetExts = [".xls", ".xlsx", ".xlsm", ".xlt", ".xltx", ".xltm", ".ods", ".fods", ".ots", ".csv"];
diff --git a/web/documentserver-example/nodejs/helpers/users.js b/web/documentserver-example/nodejs/helpers/users.js
index b04f71ed..f60961da 100644
--- a/web/documentserver-example/nodejs/helpers/users.js
+++ b/web/documentserver-example/nodejs/helpers/users.js
@@ -22,7 +22,8 @@ var descr_user_1 = [
     "Can review all the changes",
     "Can perform all actions with comments",
     "The file favorite state is undefined",
-    "Can create files from templates using data from the editor"
+    "Can create files from templates using data from the editor",
+    //"Can submit forms"
 ];
 
 var descr_user_2 = [
@@ -30,7 +31,8 @@ var descr_user_2 = [
     "Can review only his own changes or changes made by users with no group",
     "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
     "This file is marked as favorite",
-    "Can create new files from the editor"
+    "Can create new files from the editor",
+    //"Can’t submit forms"
 ];
 
 var descr_user_3 = [
@@ -41,7 +43,8 @@ var descr_user_3 = [
     "Can’t copy data from the file to clipboard",
     "Can’t download the file",
     "Can’t print the file",
-    "Can create new files from the editor"
+    "Can create new files from the editor",
+    //"Can’t submit forms"
 ];
 
 var descr_user_0 = [
@@ -51,7 +54,8 @@ var descr_user_0 = [
     "Can perform all actions with comments",
     "The file favorite state is undefined",
     "Can't mention others in comments",
-    "Can't create new files from the editor"
+    "Can't create new files from the editor",
+    //"Can’t submit forms"
 ];
 
 var users = [
diff --git a/web/documentserver-example/nodejs/public/assets b/web/documentserver-example/nodejs/public/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/nodejs/public/assets
+++ b/web/documentserver-example/nodejs/public/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/nodejs/public/images/file_docxf.svg b/web/documentserver-example/nodejs/public/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/nodejs/public/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/nodejs/public/images/mobile-fill-forms.svg b/web/documentserver-example/nodejs/public/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/nodejs/public/images/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/nodejs/public/javascripts/jscript.js b/web/documentserver-example/nodejs/public/javascripts/jscript.js
index b95a025d..d0e5a7dd 100644
--- a/web/documentserver-example/nodejs/public/javascripts/jscript.js
+++ b/web/documentserver-example/nodejs/public/javascripts/jscript.js
@@ -198,7 +198,8 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1
+            || FilledExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
index b4458e9d..f6d6bd2a 100644
--- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
+++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("../images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("../images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs
index 0cac3a38..472def6b 100644
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@@ -39,9 +39,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         var onAppReady = function () {  // the application is loaded into the browser
@@ -139,12 +141,28 @@
         };
 
         var onRequestSendNotify = function(event) {  // the user is mentioned in a comment
-            var actionLink = JSON.stringify(event.data.actionLink);
-            console.log("onRequestSendNotify:");
-            console.log(event.data);
-            console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+            var data = JSON.stringify(event.data);
+            innerAlert("onRequestSendNotify: " + data);
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            }
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "create");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        }
+
         var config = {<%- include("config") %>,
                 events: {
                     "onAppReady": onAppReady,
@@ -168,6 +186,10 @@
             config.events.onRequestSendNotify = onRequestSendNotify;
         }
 
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        }
+
         var connectEditor = function () {
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
             fixSize();
diff --git a/web/documentserver-example/nodejs/views/index.ejs b/web/documentserver-example/nodejs/views/index.ejs
index abb8b3b1..67159243 100644
--- a/web/documentserver-example/nodejs/views/index.ejs
+++ b/web/documentserver-example/nodejs/views/index.ejs
@@ -56,6 +56,9 @@
                                         <li>
                                             <a class="try-editor slide reload-page" target="_blank" href="editor?fileExt=pptx<%= params %>" title="Create new presentation">Presentation</a>
                                         </li>
+                                        <li>
+                                            <a class="try-editor form reload-page" target="_blank" href="editor?fileExt=docxf<%= params %>" title="Create new master form">Master form</a>
+                                        </li>
                                     </ul>
                                     <label class="create-sample">
                                         <input id="createSample" type="checkbox" class="checkbox" />With sample content
@@ -202,23 +205,36 @@
                                                         <% } %>
                                                         <% if (storedFiles[i].documentType == "word") { %>
                                                             <td class="contentCells contentCells-icon">
-                                                                <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
-                                                                    <img src="images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
-                                                            </td>
-                                                        <% } else { %>
-                                                            <td class="contentCells contentCells-icon "></td>
-                                                        <% } %>
-                                                        <% if (storedFiles[i].documentType == "word") { %>
-                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                 <a href="editor?type=desktop&mode=blockcontent&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                                                     <img src="images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification" /></a>
                                                             </td>
                                                         <% } else { %>
-                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
                                                         <% } %>
                                                         <% if (storedFiles[i].documentType !== "word" && storedFiles[i].documentType !== "cell") {%>
                                                             <td class="contentCells contentCells-icon "></td>
+                                                        <% } %>
+                                                        <% if (fillExts.indexOf(storedFiles[i].name.substring(storedFiles[i].name.lastIndexOf('.')).trim().toLowerCase()) !== -1) { %>
+                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                                                    <img src="images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
+                                                            </td>
+                                                        <% } else {%>
+                                                            <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
                                                         <%}%>
+                                                    <% } else if (fillExts.indexOf(storedFiles[i].name.substring(storedFiles[i].name.lastIndexOf('.')).trim().toLowerCase()) !== -1) { %>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon">
+                                                            <a href="editor?type=mobile&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                                                <img src="images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" /></a>
+                                                        </td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-icon "></td>
+                                                        <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"">
+                                                            <a href="editor?type=desktop&mode=fillForms&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
+                                                                <img src="images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>
+                                                        </td>
                                                     <% } else { %>
                                                         <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                     <% } %>
@@ -331,6 +347,7 @@
     <script type="text/javascript">
         var ConverExtList = "<%= convertExts %>";
         var EditedExtList = "<%= editedExts %>";
+        var FilledExtList = "<%= fillExts %>";
         var UrlConverter = "convert";
         var UrlEditor = "editor";
     </script>
diff --git a/web/documentserver-example/php/assets b/web/documentserver-example/php/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/php/assets
+++ b/web/documentserver-example/php/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/php/common.php b/web/documentserver-example/php/common.php
index 4002df1d..16b13248 100644
--- a/web/documentserver-example/php/common.php
+++ b/web/documentserver-example/php/common.php
@@ -325,11 +325,13 @@ function getStoredFiles() {
     foreach($cdir as $key => $fileName) {  // run through all the file and folder names
         if (!in_array($fileName,array(".", ".."))) {
             if (!is_dir($directory . DIRECTORY_SEPARATOR . $fileName)) {  // if an element isn't a directory
+                $ext = strtolower('.' . pathinfo($fileName, PATHINFO_EXTENSION));
                 $dat = filemtime($directory . DIRECTORY_SEPARATOR . $fileName);  // get the time of element modification
                 $result[$dat] = (object) array(  // and write the file to the result
                         "name" => $fileName,
                         "documentType" => getDocumentType($fileName),
-                        "canEdit" => in_array(strtolower('.' . pathinfo($fileName, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED'])
+                        "canEdit" => in_array($ext, $GLOBALS['DOC_SERV_EDITED']),
+                        "isFillFormDoc" => in_array($ext, $GLOBALS['DOC_SERV_FILLFORMS'])
                     );
             }
         }
@@ -409,7 +411,7 @@ function getFileInfo($fileId){
 
 // get all the supported file extensions
 function getFileExts() {
-    return array_merge($GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_CONVERT']);
+    return array_merge($GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_CONVERT'], $GLOBALS['DOC_SERV_FILLFORMS']);
 }
 
 // get the correct file name if such a name already exists
diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php
index 9236a28d..7f83cfb3 100644
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@@ -6,8 +6,9 @@ $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";
 $GLOBALS['ALONE'] = FALSE;
 
+$GLOBALS['DOC_SERV_FILLFORMS'] = array(".oform", ".docx");
 $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps", ".oxps");
-$GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt");
+$GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt", ".docxf");
 $GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".xml", ".epub", ".fb2");
 
 $GLOBALS['DOC_SERV_TIMEOUT'] = "120000";
@@ -41,7 +42,7 @@ $GLOBALS['ExtsDocument'] = array(".doc", ".docx", ".docm",
                                  ".dot", ".dotx", ".dotm",
                                  ".odt", ".fodt", ".ott", ".rtf", ".txt",
                                  ".html", ".htm", ".mht", ".xml",
-                                 ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps");
+                                 ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform");
 
 
 ?>
\ No newline at end of file
diff --git a/web/documentserver-example/php/css/images/file_docxf.svg b/web/documentserver-example/php/css/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/php/css/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/php/css/images/mobile-fill-forms.svg b/web/documentserver-example/php/css/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/php/css/images/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/php/css/stylesheet.css b/web/documentserver-example/php/css/stylesheet.css
index b90123e4..6bdc49ef 100644
--- a/web/documentserver-example/php/css/stylesheet.css
+++ b/web/documentserver-example/php/css/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 88cdf9bb..886ef73f 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -56,9 +56,14 @@
     $docKey = getDocEditorKey($filename);
     $filetype = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
 
+    $ext = strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION));
     $editorsMode = empty($_GET["action"]) ? "edit" : $_GET["action"];  // get the editors mode
-    $canEdit = in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']);  // check if the file can be edited
-    $submitForm = $canEdit && ($editorsMode == "edit" || $editorsMode == "fillForms");  // check if the Submit form button is displayed or not
+    $canEdit = in_array($ext, $GLOBALS['DOC_SERV_EDITED']);  // check if the file can be edited
+    if ((!$canEdit && $editorsMode == "edit" || $editorsMode == "fillForms") && in_array($ext, $GLOBALS['DOC_SERV_FILLFORMS'])) {
+        $editorsMode = "fillForms";
+        $canEdit = true;
+    }
+    $submitForm = $editorsMode == "fillForms" && $user->id == "uid-1" && !1;  // check if the Submit form button is displayed or not
     $mode = $canEdit && $editorsMode != "view" ? "edit" : "view";  // define if the editing mode is edit or view
     $type = empty($_GET["type"]) ? "desktop" : $_GET["type"];
 
@@ -339,9 +344,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -421,6 +428,23 @@
             docEditor.setMailMergeRecipients(<?php echo json_encode($dataMailMergeRecipients) ?>);  // insert recipient data for mail merge into the file
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "webeditor-ajax.php?type=saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText.substring(xhr.responseText.indexOf("{"))).file, true);
+            }
+        };
+
         var сonnectEditor = function () {
 
             <?php
@@ -478,13 +502,16 @@
             };
             // the user is mentioned in a comment
             config.events['onRequestSendNotify'] = function (event) {
-                var actionLink = JSON.stringify(event.data.actionLink);
-                console.log("onRequestSendNotify:");
-                console.log(event.data);
-                console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
             };
             <?php endif; ?>
 
+            if (config.editorConfig.createUrl) {
+                config.events.onRequestSaveAs = onRequestSaveAs;
+            };
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 
diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index 497bbce1..00de5b61 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -68,6 +68,9 @@
                                                 <li>
                                                     <a class="try-editor slide reload-page" target="_blank" href="doceditor.php?fileExt=pptx&user=<?php echo htmlentities($user); ?>">Presentation</a>
                                                 </li>
+                                                <li>
+                                                    <a class="try-editor form reload-page" target="_blank" href="doceditor.php?fileExt=docxf&user=<?php echo htmlentities($user); ?>">Master form</a>
+                                                </li>
                                             </ul>
                                             <label class="create-sample">
                                                 <input type="checkbox" id="createSample" class="checkbox" />With sample content
@@ -215,24 +218,36 @@
                                                                     }
                                                                     if ($storeFile->documentType == "word") {
                                                                         echo ' <td class="contentCells contentCells-icon ">';
-                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
-                                                                        echo '   <img src="css/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>';
-                                                                        echo ' </td>';
-                                                                    }
-                                                                    else{
-                                                                        echo ' <td class="contentCells contentCells-icon "></td> ';
-                                                                    }
-                                                                    if ($storeFile->documentType == "word") {
-                                                                        echo ' <td class="contentCells contentCells-icon contentCells-shift firstContentCellShift">';
                                                                         echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=blockcontent&type=desktop" target="_blank">';
                                                                         echo '   <img src="css/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification" /></a>';
                                                                         echo ' </td>';
                                                                     } else{
-                                                                       echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td> ';
+                                                                       echo ' <td class="contentCells contentCells-icon"></td> ';
                                                                     }
                                                                     if($storeFile->documentType!="word" && $storeFile->documentType!="cell"){
                                                                         echo ' <td class="contentCells contentCells-icon"></td>';
                                                                     }
+                                                                    if ($storeFile->isFillFormDoc) {
+                                                                        echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">';
+                                                                        echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
+                                                                        echo '   <img src="css/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>';
+                                                                        echo ' </td>';
+                                                                    } else {
+                                                                        echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td> ';
+                                                                    }
+                                                                 } else if ($storeFile->isFillFormDoc) {
+                                                                    echo ' <td class="contentCells contentCells-icon"></td>';
+                                                                    echo ' <td class="contentCells contentCells-icon">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
+                                                                    echo '   <img src="css/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" /></a>';
+                                                                    echo ' </td>';
+                                                                    echo ' <td class="contentCells contentCells-icon"></td>';
+                                                                    echo ' <td class="contentCells contentCells-icon"></td>';
+                                                                    echo ' <td class="contentCells contentCells-icon"></td>';
+                                                                    echo ' <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">';
+                                                                    echo '  <a href="doceditor.php?fileID=' . urlencode($storeFile->name) . '&user=' . htmlentities($user) . '&action=fillForms&type=desktop" target="_blank">';
+                                                                    echo '   <img src="css/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>';
+                                                                    echo ' </td>';
                                                                 } else {
                                                                     echo '<td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>';
                                                                 }
@@ -347,6 +362,7 @@
         <script type="text/javascript" src="js/jquery.dropdownToggle.js"></script>
         <script type="text/javascript" src="js/jscript.js"></script>
         <script type="text/javascript">
+            var FillFormsExtList = '<?php echo implode(",", $GLOBALS["DOC_SERV_FILLFORMS"]) ?>';
             var ConverExtList = '<?php echo implode(",", $GLOBALS["DOC_SERV_CONVERT"]) ?>';
             var EditedExtList = '<?php echo implode(",", $GLOBALS["DOC_SERV_EDITED"]) ?>';
         </script>
diff --git a/web/documentserver-example/php/js/jscript.js b/web/documentserver-example/php/js/jscript.js
index 776525cc..f05b9bbf 100644
--- a/web/documentserver-example/php/js/jscript.js
+++ b/web/documentserver-example/php/js/jscript.js
@@ -189,7 +189,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillFormsExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/php/webeditor-ajax.php b/web/documentserver-example/php/webeditor-ajax.php
index 70c6c27a..bf9c191e 100644
--- a/web/documentserver-example/php/webeditor-ajax.php
+++ b/web/documentserver-example/php/webeditor-ajax.php
@@ -87,6 +87,10 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) {
         case "files":
             $response_array = files();
             die (json_encode($response_array));
+        case "saveas":
+            $response_array = saveas();
+            $response_array['status'] = 'success';
+            die (json_encode($response_array));
         default:
             $response_array['status'] = 'error';
             $response_array['error'] = '404 Method not found';
@@ -94,6 +98,43 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) {
     }
 }
 
+// save copy as...
+function saveas() {
+   try {
+       $result;
+       $post = json_decode(file_get_contents('php://input'), true);
+       $fileurl = $post["url"];
+       $title = $post["title"];
+       $extension = strtolower(pathinfo($title, PATHINFO_EXTENSION));
+       $allexts = array_merge($GLOBALS['DOC_SERV_CONVERT'], $GLOBALS['DOC_SERV_EDITED'], $GLOBALS['DOC_SERV_VIEWD'], $GLOBALS['DOC_SERV_FILLFORMS']);
+       $filename = GetCorrectName($title);
+
+       if (!in_array("." . $extension, $allexts)) {
+           $result["error"] = "File type is not supported";
+           return $result;
+       }
+       $headers = get_headers($fileurl, 1);
+       $content_length = $headers["Content-Length"];
+       $data = file_get_contents(str_replace(" ","%20",$fileurl));
+
+       if ($data === false || $content_length <= 0 || $content_length > $GLOBALS['FILE_SIZE_MAX']) {
+           $result["error"] = "File size is incorrect";
+           return $result;
+       }
+
+       file_put_contents(getStoragePath($filename), $data, LOCK_EX);  // write data to the new file
+       $user = getUser($_GET["user"]);
+       createMeta($filename, $user->id, $user->name);  // and create meta data for this file
+
+       $result["file"] = $filename;
+       return $result;
+   } catch (Exception $e) {
+       sendlog("SaveAs: ".$e->getMessage(), "webedior-ajax.log");
+       $result["error"] = "error: " . 1 . "message:" . $e->getMessage();
+       return $result;
+   }
+}
+
 // uploading a file
 function upload() {
     $result; $filename;
diff --git a/web/documentserver-example/python/assets b/web/documentserver-example/python/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/python/assets
+++ b/web/documentserver-example/python/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/python/config.py b/web/documentserver-example/python/config.py
index dcb9dc1c..184f3791 100644
--- a/web/documentserver-example/python/config.py
+++ b/web/documentserver-example/python/config.py
@@ -5,8 +5,9 @@ VERSION = '1.0.0'
 FILE_SIZE_MAX = 5242880
 STORAGE_PATH = 'app_data'
 
+DOC_SERV_FILLFORMS = [".oform", ".docx"]
 DOC_SERV_VIEWED = [".pdf", ".djvu", ".xps", ".oxps"]  # file extensions that can be viewed
-DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt"]  # file extensions that can be edited
+DOC_SERV_EDITED = [".docx", ".xlsx", ".csv", ".pptx", ".txt", ".docxf"]  # file extensions that can be edited
 DOC_SERV_CONVERT = [                                           # file extensions that can be converted
     ".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt",
     ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm",
@@ -47,7 +48,7 @@ EXT_DOCUMENT = [
     ".dot", ".dotx", ".dotm",
     ".odt", ".fodt", ".ott", ".rtf", ".txt",
     ".html", ".htm", ".mht", ".xml",
-    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps"
+    ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
 ]
 
 if os.environ.get("EXAMPLE_DOMAIN"):  # generates a link for example domain
diff --git a/web/documentserver-example/python/src/urls.py b/web/documentserver-example/python/src/urls.py
index 502398ee..44f150e2 100644
--- a/web/documentserver-example/python/src/urls.py
+++ b/web/documentserver-example/python/src/urls.py
@@ -39,7 +39,8 @@ urlpatterns = [
     path('track', actions.track),
     path('remove', actions.remove),
     path('csv', actions.csv),
-    path('files', actions.files)
+    path('files', actions.files),
+    path('saveas', actions.saveAs)
 ]
 
 urlpatterns += staticfiles_urlpatterns()
\ No newline at end of file
diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py
index 952d8aee..b79c4ffa 100644
--- a/web/documentserver-example/python/src/utils/docManager.py
+++ b/web/documentserver-example/python/src/utils/docManager.py
@@ -73,6 +73,9 @@ LANGUAGES = {
     'vi': 'Vietnamese'
 }
 
+def isCanFillForms(ext):
+    return ext in config.DOC_SERV_FILLFORMS
+
 # check if the file extension can be viewed
 def isCanView(ext):
     return ext in config.DOC_SERV_VIEWED
@@ -87,14 +90,15 @@ def isCanConvert(ext):
 
 # check if the file extension is supported by the editor (it can be viewed or edited or converted)
 def isSupportedExt(ext):
-    return isCanView(ext) | isCanEdit(ext) | isCanConvert(ext)
+    return isCanView(ext) | isCanEdit(ext) | isCanConvert(ext) | isCanFillForms(ext)
 
 # get internal extension for a given file type
 def getInternalExtension(fileType):
     mapping = {
         'word': '.docx',
         'cell': '.xlsx',
-        'slide': '.pptx'
+        'slide': '.pptx',
+        'docxf': '.docxf'
     }
 
     return mapping.get(fileType, '.docx') # the default file type is .docx
@@ -208,7 +212,7 @@ def getStoredFiles(req):
 
     for f in files:
         if os.path.isfile(os.path.join(directory, f)):
-            fileInfos.append({'version':historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f, req))), 'type': fileUtils.getFileType(f), 'title': f, 'url': getFileUri(f, True, req), 'canEdit': isCanEdit(fileUtils.getFileExt(f))}) # write information about file type, title and url
+            fileInfos.append({'isFillFormDoc': isCanFillForms(fileUtils.getFileExt(f)),'version':historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f, req))), 'type': fileUtils.getFileType(f), 'title': f, 'url': getFileUri(f, True, req), 'canEdit': isCanEdit(fileUtils.getFileExt(f))}) # write information about file type, title and url
 
     return fileInfos
 
diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py
index 23096937..d14c3a6c 100644
--- a/web/documentserver-example/python/src/views/actions.py
+++ b/web/documentserver-example/python/src/views/actions.py
@@ -23,6 +23,7 @@
  SOFTWARE.
 
 """
+import requests
 
 import config
 import json
@@ -115,6 +116,37 @@ def createNew(request):
 
     return HttpResponse(json.dumps(response), content_type='application/json')
 
+# save file as...
+def saveAs(request):
+    response ={}
+
+    try:
+        body = json.loads(request.body)
+        saveAsFileUrl = body.get('url')
+        title = body.get('title')
+
+        filename = docManager.getCorrectName(title, request)
+        path = docManager.getStoragePath(filename, request)
+        resp = requests.get(saveAsFileUrl)
+
+        if ((len(resp.content) > config.FILE_SIZE_MAX) | (len(resp.content) <= 0)):  # check if the file size exceeds the maximum size allowed (5242880)
+            response.setdefault('error', 'File size is incorrect')
+            raise Exception('File size is incorrect')
+
+        curExt = fileUtils.getFileExt(filename)
+        if not docManager.isSupportedExt(curExt):  # check if the file extension is supported by the document manager
+            response.setdefault('error', 'File type is not supported')
+            raise Exception('File type is not supported')
+
+        docManager.saveFileFromUri(saveAsFileUrl, path, request, True)  # save the file from the new url in the storage directory
+
+        response.setdefault('file', filename)
+    except Exception as e:
+        response.setdefault('error', 1)
+        response.setdefault('message', e.args[0])
+
+    return HttpResponse(json.dumps(response), content_type='application/json')
+
 # edit a file
 def edit(request):
     filename = fileUtils.getFileName(request.GET['filename'])
@@ -129,7 +161,11 @@ def edit(request):
 
     edMode = request.GET.get('mode') if request.GET.get('mode') else 'edit'  # get the editor mode: view/edit/review/comment/fillForms/embedded (the default mode is edit)
     canEdit = docManager.isCanEdit(ext)  # check if the file with this extension can be edited
-    submitForm = canEdit & ((edMode == 'edit') | (edMode == 'fillForms'))  # if the Submit form button is displayed or hidden
+
+    if (((not canEdit) and edMode == 'edit') or edMode == 'fillForms') and docManager.isCanFillForms(ext) :
+        edMode = 'fillForms'
+        canEdit = True
+    submitForm = edMode == 'fillForms' and user.id == 'uid-1' and False  # if the Submit form button is displayed or hidden
     mode = 'edit' if canEdit & (edMode != 'view') else 'view'  # if the file can't be edited, the mode is view
 
     edType = request.GET.get('type') if request.GET.get('type') else 'desktop'  # get the editor type: embedded/mobile/desktop (the default type is desktop)
diff --git a/web/documentserver-example/python/src/views/index.py b/web/documentserver-example/python/src/views/index.py
index a658095d..0e74d9c5 100644
--- a/web/documentserver-example/python/src/views/index.py
+++ b/web/documentserver-example/python/src/views/index.py
@@ -39,6 +39,7 @@ def default(request):  # default parameters that will be passed to the template
         'preloadurl': config.DOC_SERV_SITE_URL + config.DOC_SERV_PRELOADER_URL,
         'editExt': json.dumps(config.DOC_SERV_EDITED),  # file extensions that can be edited
         'convExt': json.dumps(config.DOC_SERV_CONVERT),  # file extensions that can be converted
-        'files': docManager.getStoredFiles(request)  # information about stored files
+        'files': docManager.getStoredFiles(request),  # information about stored files
+        'fillExt': json.dumps(config.DOC_SERV_FILLFORMS)
     }
     return render(request, 'index.html', context)  # execute the "index.html" template with context data and return http response in json format
\ No newline at end of file
diff --git a/web/documentserver-example/python/static/css/stylesheet.css b/web/documentserver-example/python/static/css/stylesheet.css
index c1219130..421be08c 100644
--- a/web/documentserver-example/python/static/css/stylesheet.css
+++ b/web/documentserver-example/python/static/css/stylesheet.css
@@ -166,6 +166,10 @@ label .checkbox {
     background-image: url("../images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("../images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/python/static/images/file_docxf.svg b/web/documentserver-example/python/static/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/python/static/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/python/static/images/mobile-fill-forms.svg b/web/documentserver-example/python/static/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/python/static/images/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/python/static/js/jscript.js b/web/documentserver-example/python/static/js/jscript.js
index f919ca9b..c2e0db31 100644
--- a/web/documentserver-example/python/static/js/jscript.js
+++ b/web/documentserver-example/python/static/js/jscript.js
@@ -175,7 +175,7 @@ if (typeof jQuery !== "undefined") {
         var posExt = fileName.lastIndexOf(".");
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : "";
 
-        if (EditedExtList.indexOf(posExt) !== -1) {
+        if (EditedExtList.indexOf(posExt) !== -1 || FillExtList.indexOf(posExt) !== -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html
index 90210c47..25a8223d 100644
--- a/web/documentserver-example/python/templates/editor.html
+++ b/web/documentserver-example/python/templates/editor.html
@@ -50,9 +50,11 @@
 
         var docEditor;
 
-        var innerAlert = function (message) {
+        var innerAlert = function (message, inEditor) {
             if (console && console.log)
                 console.log(message);
+            if (inEditor && docEditor)
+                docEditor.showMessage(message);
         };
 
         // the application is loaded into the browser
@@ -134,6 +136,23 @@
             );
         };
 
+        var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+            var title = event.data.title;
+            var url = event.data.url;
+            var data = {
+                title: title,
+                url: url
+            };
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "saveas");
+            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+                innerAlert(JSON.parse(xhr.responseText).file, true);
+            }
+        };
+
         var connectEditor = function () {
 
             config = {{ cfg | safe }}
@@ -181,14 +200,16 @@
                 };
                 // the user is mentioned in a comment
                 config.events['onRequestSendNotify'] = function (event) {
-                    var actionLink = JSON.stringify(event.data.actionLink);
-                    console.log("onRequestSendNotify:");
-                    console.log(event.data);
-                    console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                    event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                    var data = JSON.stringify(event.data);
+                    innerAlert("onRequestSendNotify: " + data);
                 };
 
             {% endif %}
 
+            if (config.editorConfig.createUrl) {
+                config.events.onRequestSaveAs = onRequestSaveAs;
+            };
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
             fixSize();
diff --git a/web/documentserver-example/python/templates/index.html b/web/documentserver-example/python/templates/index.html
index dc2f7d13..0edbcd5c 100644
--- a/web/documentserver-example/python/templates/index.html
+++ b/web/documentserver-example/python/templates/index.html
@@ -67,6 +67,9 @@
                                         <li>
                                             <a class="try-editor slide reload-page" target="_blank" data-type="slide">Presentation</a>
                                         </li>
+                                        <li>
+                                            <a class="try-editor form reload-page" target="_blank" data-type="docxf">Master form</a>
+                                        </li>
                                     </ul>
                                     <label class="create-sample">
                                         <input type="checkbox" id="createSample" class="checkbox" />With sample content
@@ -187,25 +190,40 @@
                                                             {% endif %}
                                                             {% if file.type == 'word' %}
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="edit?filename={{ file.title }}&type=desktop&mode=fillForms" target="_blank">
-                                                                        <img src="{% static "images/fill-forms.svg" %}" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                                                    </a>
-                                                                </td>
-                                                            {% else %}
-                                                                <td class="contentCells contentCells-icon "></td>
-                                                            {% endif %}
-                                                            {% if file.type == 'word' %}
-                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                                                     <a href="edit?filename={{ file.title }}&type=desktop&mode=blockcontent" target="_blank">
                                                                         <img src="{% static "images/block-content.svg" %}" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                     </a>
                                                                 </td>
                                                             {% else %}
-                                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                                 <td class="contentCells contentCells-icon"></td>
                                                             {% endif %}
                                                             {% if file.type == 'slide' %}
                                                                 <td class="contentCells contentCells-icon "></td>
                                                             {% endif %}
+                                                            {% if file.isFillFormDoc %}
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                                                    <a href="edit?filename={{ file.title }}&type=desktop&mode=fillForms" target="_blank">
+                                                                        <img src="{% static "images/fill-forms.svg" %}" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                    </a>
+                                                                </td>
+                                                            {% else %}
+                                                                <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                                            {% endif %}
+                                                        {% elif file.isFillFormDoc %}
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon">
+                                                                <a href="edit?filename={{ file.title }}&type=mobile&mode=fillForms" target="_blank">
+                                                                    <img src="{% static "images/mobile-fill-forms.svg" %}" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices"/>
+                                                                </a>
+                                                            </td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon"></td>
+                                                            <td class="contentCells contentCells-icon">
+                                                                <a href="edit?filename={{ file.title }}&type=desktop&mode=fillForms" target="_blank">
+                                                                    <img src="{% static "images/fill-forms.svg" %}" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                                                </a>
+                                                            </td>
                                                         {% else %}
                                                             <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                         {% endif %}
@@ -320,6 +338,7 @@
     <script type="text/javascript" src="{% static "js/jscript.js" %}"></script>
 
     <script type="text/javascript">
+        var FillExtList = {{ fillExt | safe }};
         var ConverExtList = {{ convExt | safe }};
         var EditedExtList = {{ editExt | safe }};
         var UrlConverter = "convert";
diff --git a/web/documentserver-example/ruby/app/assets/images/file_docxf.svg b/web/documentserver-example/ruby/app/assets/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/ruby/app/assets/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.svg b/web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.svg
new file mode 100644
index 00000000..31db5ea7
--- /dev/null
+++ b/web/documentserver-example/ruby/app/assets/images/mobile-fill-forms.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 5C5 3.89543 5.89543 3 7 3H16C17.1046 3 18 3.89543 18 5V8H17V6H6V18H17V16H18V19C18 20.1046 17.1046 21 16 21H7C5.89543 21 5 20.1046 5 19V5ZM13 4H10V5H13V4ZM12 19.5C12 19.7761 11.7761 20 11.5 20C11.2239 20 11 19.7761 11 19.5C11 19.2239 11.2239 19 11.5 19C11.7761 19 12 19.2239 12 19.5Z" fill="#444444"/>
+<rect x="7" y="9" width="1" height="6" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 8V9L11 9V15H12V16H9V15H10V9H9V8H12Z" fill="#444444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H18V14H15H14H13V15H14H18C18.5523 15 19 14.5523 19 14V10C19 9.44772 18.5523 9 18 9H14H13V10H14H15Z" fill="#444444"/>
+</svg>
diff --git a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
index 7d41c159..2a4159c3 100644
--- a/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
+++ b/web/documentserver-example/ruby/app/assets/javascripts/jscript.js
@@ -167,7 +167,7 @@ if (typeof jQuery != "undefined") {
         var posExt = fileName.lastIndexOf('.');
         posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
 
-        if (EditedExtList.indexOf(posExt) != -1) {
+        if (EditedExtList.indexOf(posExt) != -1 || FillExtList.indexOf(posExt) != -1) {
             jq("#beginEdit").removeClass("disable");
         }
     };
diff --git a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
index 575805ea..3a11a72e 100644
--- a/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
+++ b/web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
@@ -158,6 +158,10 @@ label .checkbox {
     background-image: url("file_pptx.svg");
 }
 
+.try-editor.form {
+  background-image: url("file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb
index 5156c549..14406230 100644
--- a/web/documentserver-example/ruby/app/controllers/home_controller.rb
+++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb
@@ -258,7 +258,7 @@ class HomeController < ApplicationController
 
       # add headers to the response to specify the page parameters
       response.headers['Content-Length'] = File.size(file_path).to_s
-      response.headers['Content-Type'] = MimeMagic.by_path(file_path).type
+      response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type
       response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + URI.escape(file_name, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
 
       send_file file_path, :x_sendfile => true
@@ -266,4 +266,49 @@ class HomeController < ApplicationController
       render plain: '{ "error": "File not found"}'
     end
   end
+
+  # Save Copy as...
+  def saveas
+    begin
+      body = JSON.parse(request.body.read)
+      file_url = body["url"]
+      title = body["title"]
+      file_name = DocumentHelper.get_correct_name(title, nil)
+      extension = File.extname(file_name).downcase
+      all_exts = DocumentHelper.convert_exts + DocumentHelper.edited_exts + DocumentHelper.viewed_exts + DocumentHelper.fill_forms_exts
+
+      unless all_exts.include?(extension)
+        render plain: '{"error": "File type is not supported"}'
+        return
+      end
+
+      uri = URI.parse(file_url)  # create the request url
+      http = Net::HTTP.new(uri.host, uri.port)  # create a connection to the http server
+
+      if file_url.start_with?('https')
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE  # set the flags for the server certificate verification at the beginning of SSL session
+      end
+      req = Net::HTTP::Get.new(uri.request_uri)  # create the get requets
+      res = http.request(req)
+      data = res.body
+
+      if data.size <= 0 || data.size > Rails.configuration.fileSizeMax
+        render plain: '{"error": "File size is incorrect"}'
+        return
+      end
+
+      File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file|
+        file.write(data)
+      end
+      user = Users.get_user(cookies[:uid])
+      DocumentHelper.create_meta(file_name, user.id, user.name, nil)  # create meta data of the new file
+
+      render plain: '{"file" : "' + file_name + '"}'
+      return
+    rescue => ex
+      render plain: '{"error":1, "message": "' + ex.message + '"}'
+      return
+    end
+  end
 end
\ No newline at end of file
diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb
index 3808226e..2932e582 100644
--- a/web/documentserver-example/ruby/app/models/document_helper.rb
+++ b/web/documentserver-example/ruby/app/models/document_helper.rb
@@ -38,7 +38,15 @@ class DocumentHelper
 
     # all the supported file extensions
     def file_exts
-      [].concat(viewed_exts).concat(edited_exts).concat(convert_exts)
+      [].concat(viewed_exts).concat(edited_exts).concat(convert_exts).concat(fill_forms_exts)
+    end
+
+    def fill_forms_exts
+      if Rails.configuration.fillDocs.empty?
+        []
+      else
+        Rails.configuration.fillDocs.split("|")
+      end
     end
 
     # file extensions that can be viewed
diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb
index 9c6c0aef..95be66a1 100644
--- a/web/documentserver-example/ruby/app/models/file_model.rb
+++ b/web/documentserver-example/ruby/app/models/file_model.rb
@@ -84,7 +84,11 @@ class FileModel
   def get_config
     editorsmode = @mode ? @mode : "edit"  # mode: view/edit/review/comment/fillForms/embedded
     canEdit = DocumentHelper.edited_exts.include?(file_ext)  # check if the document can be edited
-    submitForm = canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("fillForms"))  # the Submit form button state
+    if (!canEdit && editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) && DocumentHelper.fill_forms_exts.include?(file_ext)
+      editorsmode = "fillForms"
+      canEdit = true
+    end
+    submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") && false  # the Submit form button state
     mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view"
     templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section
     templates = [
diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb
index 7c5be1ff..8aa006f7 100644
--- a/web/documentserver-example/ruby/app/models/file_utility.rb
+++ b/web/documentserver-example/ruby/app/models/file_utility.rb
@@ -18,7 +18,7 @@ class FileUtility
 
   
   # the document extension list
-  @@exts_document = %w(.doc .docx .docm .dot .dotx .dotm .odt .fodt .ott .rtf .txt .html .htm .mht .xml .pdf .djvu .fb2 .epub .xps .oxps)
+  @@exts_document = %w(.doc .docx .docm .oform .dot .dotx .dotm .odt .fodt .ott .rtf .txt .html .htm .mht .xml .pdf .djvu .fb2 .epub .xps .oxps)
 
   # the spreadsheet extension list
   @@exts_spreadsheet = %w(.xls .xlsx .xlsm .xlt .xltx .xltm .ods .fods .ots .csv)
diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb
index 472a5851..5bf5d31d 100644
--- a/web/documentserver-example/ruby/app/views/home/editor.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb
@@ -27,9 +27,11 @@
 
     var docEditor;
 
-    var innerAlert = function (message) {
+    var innerAlert = function (message, inEditor) {
         if (console && console.log)
             console.log(message);
+        if (inEditor && docEditor)
+            docEditor.showMessage(message);
     };
 
     // the application is loaded into the browser
@@ -109,6 +111,23 @@
         docEditor.setMailMergeRecipients(<%= raw @file.dataMailMergeRecipients.to_json %>);  // insert recipient data for mail merge into the file
     };
 
+    var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
+        var title = event.data.title;
+        var url = event.data.url;
+        var data = {
+            title: title,
+            url: url
+        };
+        let xhr = new XMLHttpRequest();
+        xhr.open("POST", "saveas");
+        xhr.setRequestHeader( 'Content-Type', 'application/json');
+        xhr.send(JSON.stringify(data));
+        xhr.onload = function () {
+            innerAlert(xhr.responseText);
+            innerAlert(JSON.parse(xhr.responseText).file, true);
+        }
+    };
+
     var сonnectEditor = function () {
 
         var config = <%= raw @file.get_config.to_json %>;
@@ -159,14 +178,17 @@
             };
             // the user is mentioned in a comment
             config.events['onRequestSendNotify'] = function (event) {
-                var actionLink = JSON.stringify(event.data.actionLink);
-                console.log("onRequestSendNotify:");
-                console.log(event.data);
-                console.log("Link to comment: " + replaceActionLink(location.href, actionLink));
+                event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
             };
             <% end
         %>
 
+        if (config.editorConfig.createUrl) {
+            config.events.onRequestSaveAs = onRequestSaveAs;
+        };
+
         docEditor = new DocsAPI.DocEditor("iframeEditor", config);
     };
 
diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb
index 9a069d4b..a2b451d0 100644
--- a/web/documentserver-example/ruby/app/views/home/index.html.erb
+++ b/web/documentserver-example/ruby/app/views/home/index.html.erb
@@ -40,6 +40,9 @@
                       <li>
                         <a class="try-editor slide" data-type="pptx">Presentation</a>
                       </li>
+                      <li>
+                        <a class="try-editor form" data-type="docxf">Master form</a>
+                      </li>
                   </ul>
                   <label class="create-sample">
                       <input id="createSample" class="checkbox" type="checkbox" />With sample content
@@ -151,6 +154,7 @@
                     <tbody>
                       <% 
                         docs.each { |d|
+                          isFillFormDoc = DocumentHelper.fill_forms_exts.include?(File.extname(d).downcase)
                           editUrl = "editor?fileName=#{URI::encode(d)}"
                           docType = FileUtility.get_file_type(d) 
                           canEdit = DocumentHelper.edited_exts.include?(File.extname(d).downcase) %>
@@ -194,25 +198,40 @@
                               <% end %>
                                   <% if docType.eql?("word") %>
                                     <td class="contentCells contentCells-icon">
-                                        <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
-                                            <img src="assets/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
-                                        </a>
-                                    </td>
-                                  <% else %>
-                                    <td class="contentCells  contentCells-icon "></td>
-                                  <% end %>
-                                  <% if docType.eql?("word") %>
-                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
                                         <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
                                             <img src="assets/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                         </a>
                                     </td>
                                   <% else %>
-                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift" ></td>
+                                    <td class="contentCells contentCells-icon"></td>
                                   <% end %>
                                   <% if !docType.eql?("word") && !docType.eql?("cell")%>
                                       <td class="contentCells contentCells-icon "></td>
                                   <% end %>
+                                  <% if isFillFormDoc%>
+                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                      <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                        <img src="assets/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                      </a>
+                                    </td>
+                                  <% else %>
+                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift"></td>
+                                  <% end %>
+                                  <% elsif isFillFormDoc %>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon">
+                                      <a href="<%= "#{editUrl}&editorsType=mobile&editorsMode=fillForms" %>" target="_blank">
+                                        <img src="assets/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
+                                      </a>
+                                    </td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-icon"></td>
+                                    <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
+                                      <a href="<%= "#{editUrl}&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                        <img src="assets/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                      </a>
+                                    </td>
                             <% else %>
                               <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                             <% end %>
@@ -325,6 +344,7 @@
 <%= javascript_include_tag "application" %>
 
 <script language="javascript" type="text/javascript">
+    var FillExtList = '<%= DocumentHelper.fill_forms_exts.join"," %>';
     var ConvertExtList = '<%= DocumentHelper.convert_exts.join(",") %>';
     var EditedExtList = '<%= DocumentHelper.edited_exts.join(",") %>';
     var UrlConverter = '<%= convert_path %>';
diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb
index 04496928..f88f5b64 100644
--- a/web/documentserver-example/ruby/config/application.rb
+++ b/web/documentserver-example/ruby/config/application.rb
@@ -32,8 +32,9 @@ module OnlineEditorsExampleRuby
     Rails.configuration.storagePath="app_data"
     Rails.configuration.timeout=120
 
+    Rails.configuration.fillDocs=".oform|.docx"
     Rails.configuration.viewedDocs=".pdf|.djvu|.xps|.oxps"
-    Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt"
+    Rails.configuration.editedDocs=".docx|.xlsx|.csv|.pptx|.txt|.docxf"
     Rails.configuration.convertDocs=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"
 
     Rails.configuration.urlSite="http://documentserver/"
diff --git a/web/documentserver-example/ruby/config/routes.rb b/web/documentserver-example/ruby/config/routes.rb
index dbb51624..35fafb97 100644
--- a/web/documentserver-example/ruby/config/routes.rb
+++ b/web/documentserver-example/ruby/config/routes.rb
@@ -11,6 +11,7 @@ Rails.application.routes.draw do
   match '/track',    to: 'home#track',    via: 'post'
   match '/csv',    to: 'home#csv',    via: 'get'
   match '/files',    to: 'home#files',    via: 'get'
+  match '/saveas',    to: 'home#saveas',    via: 'post'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
diff --git a/web/documentserver-example/ruby/public/assets b/web/documentserver-example/ruby/public/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/ruby/public/assets
+++ b/web/documentserver-example/ruby/public/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4