diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js
index 09ed9007c..8ef59c485 100644
--- a/apps/common/main/lib/view/PasswordDialog.js
+++ b/apps/common/main/lib/view/PasswordDialog.js
@@ -55,7 +55,7 @@ define([
 
             _.extend(_options,  {
                 width           : 350,
-                height          : 220,
+                height          : 238,
                 header          : true,
                 cls             : 'modal-dlg',
                 contentTemplate : '',
@@ -65,7 +65,7 @@ define([
             }, options);
 
             this.template = options.template || [
-                '<div class="box" style="height:' + (_options.height - 85) + 'px;">',
+                '<div class="box">',
                     '<div class="input-row" style="margin-bottom: 10px;">',
                         '<label>' + t.txtDescription + '</label>',
                     '</div>',
@@ -76,9 +76,8 @@ define([
                     '<div class="input-row">',
                         '<label>' + t.txtRepeat + '</label>',
                     '</div>',
-                    '<div id="id-repeat-txt" class="input-row"></div>',
-                '</div>',
-                '<div class="separator horizontal"/>'
+                    '<div id="id-repeat-txt" class="input-row" style="margin-bottom: 10px;"></div>',
+                '</div>'
             ].join('');
 
             this.handler        =   options.handler;
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index 2978100b0..dffc44187 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -414,6 +414,10 @@ DE.ApplicationController = new(function(){
                 message = me.errorUpdateVersionOnDisconnect;
                 break;
 
+            case Asc.c_oAscError.ID.AccessDeny:
+                message = me.errorAccessDeny;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index bf8dc0e8e..8a4845511 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -414,6 +414,7 @@ define([
                     docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
                     docInfo.put_Token(data.doc.token);
                     docInfo.put_Permissions(_permissions);
+                    docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
 //                    docInfo.put_Review(this.permissions.review);
 
                     var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType);
diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js
index bbda408ea..2fdbb0189 100644
--- a/apps/documenteditor/main/app/view/StyleTitleDialog.js
+++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js
@@ -45,6 +45,7 @@ define([
     DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 350,
+            height: 196,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
             buttons: ['ok', 'cancel']
diff --git a/apps/documenteditor/main/locale/fi.json b/apps/documenteditor/main/locale/fi.json
index 508962f5b..7da94b7ad 100644
--- a/apps/documenteditor/main/locale/fi.json
+++ b/apps/documenteditor/main/locale/fi.json
@@ -1122,7 +1122,7 @@
   "DE.Views.ImageSettings.textEdit": "Muokkaa",
   "DE.Views.ImageSettings.textEditObject": "Muokkaa objektia",
   "DE.Views.ImageSettings.textFromFile": "Tiedostosta",
-  "DE.Views.ImageSettings.textFromUrl": "Verkko-osoitteesta",
+  "DE.Views.ImageSettings.textFromUrl": "URL-osoitteesta",
   "DE.Views.ImageSettings.textHeight": "Korkeus",
   "DE.Views.ImageSettings.textInsert": "Korvaa kuva",
   "DE.Views.ImageSettings.textOriginalSize": "Oletuskoko",
diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
index a630bb57c..7de2d59fe 100644
--- a/apps/documenteditor/mobile/app/controller/Main.js
+++ b/apps/documenteditor/mobile/app/controller/Main.js
@@ -253,6 +253,7 @@ define([
                     docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
                     docInfo.put_Token(data.doc.token);
                     docInfo.put_Permissions(_permissions);
+                    docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
 
                     var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType);
                     if (type && typeof type[1] === 'string') {
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index 6baf1fc98..ffaf30b11 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -514,6 +514,10 @@ PE.ApplicationController = new(function(){
                 message = me.errorUpdateVersionOnDisconnect;
                 break;
 
+            case Asc.c_oAscError.ID.AccessDeny:
+                message = me.errorAccessDeny;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index bcbc8026b..7342c5086 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -372,6 +372,7 @@ define([
                     docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
                     docInfo.put_Token(data.doc.token);
                     docInfo.put_Permissions(_permissions);
+                    docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
                 }
 
                 this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));
diff --git a/apps/presentationeditor/main/locale/fi.json b/apps/presentationeditor/main/locale/fi.json
index b7203c6a1..3d8d6efd9 100644
--- a/apps/presentationeditor/main/locale/fi.json
+++ b/apps/presentationeditor/main/locale/fi.json
@@ -949,7 +949,7 @@
   "PE.Views.ImageSettings.textEdit": "Muokkaa",
   "PE.Views.ImageSettings.textEditObject": "Muokkaa objektia",
   "PE.Views.ImageSettings.textFromFile": "Tiedostosta",
-  "PE.Views.ImageSettings.textFromUrl": "Verkko-osoitteesta",
+  "PE.Views.ImageSettings.textFromUrl": "URL-osoitteesta",
   "PE.Views.ImageSettings.textHeight": "Korkeus",
   "PE.Views.ImageSettings.textInsert": "Korvaa kuva",
   "PE.Views.ImageSettings.textOriginalSize": "Oletuskoko",
@@ -1112,7 +1112,7 @@
   "PE.Views.SlideSettings.textEmptyPattern": "Ei kuviota",
   "PE.Views.SlideSettings.textFade": "Häivytys",
   "PE.Views.SlideSettings.textFromFile": "Tiedostosta",
-  "PE.Views.SlideSettings.textFromUrl": "Verkko-osoitteesta",
+  "PE.Views.SlideSettings.textFromUrl": "URL-osoitteesta",
   "PE.Views.SlideSettings.textGradient": "Kalteva",
   "PE.Views.SlideSettings.textGradientFill": "Kalteva täyttö",
   "PE.Views.SlideSettings.textHorizontalIn": "Sisään vaakasuoraan",
@@ -1262,7 +1262,7 @@
   "PE.Views.TextArtSettings.textDirection": "Suunta",
   "PE.Views.TextArtSettings.textEmptyPattern": "Ei kuviota",
   "PE.Views.TextArtSettings.textFromFile": "Tiedostosta",
-  "PE.Views.TextArtSettings.textFromUrl": "Verkko-osoitteesta",
+  "PE.Views.TextArtSettings.textFromUrl": "URL-osoitteesta",
   "PE.Views.TextArtSettings.textGradient": "Kalteva",
   "PE.Views.TextArtSettings.textGradientFill": "Kalteva täyttö",
   "PE.Views.TextArtSettings.textImageTexture": "Kuva tai pintarakenne",
diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js
index 7d8dd1958..6cb144489 100644
--- a/apps/presentationeditor/mobile/app/controller/Main.js
+++ b/apps/presentationeditor/mobile/app/controller/Main.js
@@ -256,6 +256,7 @@ define([
                     docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
                     docInfo.put_Token(data.doc.token);
                     docInfo.put_Permissions(_permissions);
+                    docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
                 }
 
                 this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));
diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index 7d689f967..722ed7a11 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -422,6 +422,10 @@ SSE.ApplicationController = new(function(){
                 message = me.errorUpdateVersionOnDisconnect;
                 break;
 
+            case Asc.c_oAscError.ID.AccessDeny:
+                message = me.errorAccessDeny;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index 2e53f2267..48bd32c27 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -2058,7 +2058,7 @@ define([
                         name = menuItem.asc_getName(true),
                         origname = me.api.asc_getFormulaNameByLocale(name),
                         mnu = new Common.UI.MenuItem({
-                            iconCls: (type==Asc.c_oAscPopUpSelectorType.Func) ? 'mnu-popup-func': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'mnu-popup-table' : 'mnu-popup-range') ,
+                            iconCls: 'menu__icon ' + ((type==Asc.c_oAscPopUpSelectorType.Func) ? 'btn-function': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'btn-menu-table' : 'btn-named-range')) ,
                             caption: name,
                             hint        : (funcdesc && funcdesc[origname]) ? funcdesc[origname].d : ''
                     }).on('click', function(item, e) {
@@ -2223,8 +2223,8 @@ define([
                     this.documentHolder.cmpEl.append(inputtip.parentEl);
                 }
 
-                var hint = title ? ('<b>' + (title || '') + '</b><br>') : '';
-                hint += (message || '');
+                var hint = title ? ('<b>' + (Common.Utils.String.htmlEncode(title || '')) + '</b><br>') : '';
+                hint += (Common.Utils.String.htmlEncode(message || ''));
 
                 if (inputtip.ref && inputtip.ref.isVisible()) {
                     if (inputtip.text != hint) {
@@ -2259,7 +2259,8 @@ define([
 
                 inputtip.ref.getBSTip().$tip.css({
                     top : showPoint[1] + 'px',
-                    left: showPoint[0] + 'px'
+                    left: showPoint[0] + 'px',
+                    'z-index': 900
                 });
             } else {
                 if (!inputtip.isHidden && inputtip.ref) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index ed18c256e..b8cfa1499 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -420,6 +420,7 @@ define([
                     docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
                     docInfo.put_Token(data.doc.token);
                     docInfo.put_Permissions(_permissions);
+                    docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
 
                     this.headerView && this.headerView.setDocumentCaption(data.doc.title);
 
@@ -1453,9 +1454,9 @@ define([
                         if (icon!==undefined) {
                             config.iconCls = (icon==Asc.c_oAscEDataValidationErrorStyle.Stop) ? 'error' : ((icon==Asc.c_oAscEDataValidationErrorStyle.Information) ? 'info' : 'warn');
                         }
-                        errData && errData.asc_getErrorTitle() && (config.title = errData.asc_getErrorTitle());
+                        errData && errData.asc_getErrorTitle() && (config.title = Common.Utils.String.htmlEncode(errData.asc_getErrorTitle()));
                         config.buttons  = ['ok', 'cancel'];
-                        config.msg = errData && errData.asc_getError() ? errData.asc_getError() : this.errorDataValidate;
+                        config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate;
                         config.maxwidth = 600;
                         break;
 
diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js
index 09cbf6e84..5e657f620 100644
--- a/apps/spreadsheeteditor/main/app/controller/Print.js
+++ b/apps/spreadsheeteditor/main/app/controller/Print.js
@@ -274,6 +274,7 @@ define([
             }
 
             if (this.api) {
+                Common.UI.Menu.Manager.hideAll();
                 this.asUrl = asUrl;
                 this.downloadFormat = format;
                 this.printSettingsDlg = (new SSE.Views.PrintSettings({
diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js
index add9bd0ce..f9cdd2171 100644
--- a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js
@@ -68,11 +68,11 @@ define([
                 '<div id="radio-fit-to" style="margin-bottom: 4px;"></div>',
                 '<div style="padding-left: 22px;">',
                     '<div>',
-                        '<label style="height: 22px;width: 45px;padding-top: 4px;display: inline-block;margin-bottom: 4px;">' + this.textWidth + '</label>',
+                        '<label style="height: 22px;width: 55px;padding-top: 4px;display: inline-block;margin-bottom: 4px;">' + this.textWidth + '</label>',
                         '<div id="scale-width" style="display: inline-block;margin-bottom: 4px;"></div>',
                     '</div>',
                     '<div>',
-                        '<label style="height: 22px;width: 45px;padding-top: 4px;display: inline-block;margin-bottom: 16px;">' + this.textHeight + '</label>',
+                        '<label style="height: 22px;width: 55px;padding-top: 4px;display: inline-block;margin-bottom: 16px;">' + this.textHeight + '</label>',
                         '<div id="scale-height" style="display: inline-block;margin-bottom: 16px;"></div>',
                     '</div>',
                 '</div>',
diff --git a/apps/spreadsheeteditor/main/locale/fi.json b/apps/spreadsheeteditor/main/locale/fi.json
index b4de5b85e..65a99e21c 100644
--- a/apps/spreadsheeteditor/main/locale/fi.json
+++ b/apps/spreadsheeteditor/main/locale/fi.json
@@ -786,7 +786,7 @@
   "SSE.Views.ChartSettingsDlg.textHundredMil": "100 000 000",
   "SSE.Views.ChartSettingsDlg.textHundreds": "Satoja",
   "SSE.Views.ChartSettingsDlg.textHundredThousands": "100 000",
-  "SSE.Views.ChartSettingsDlg.textIn": "/",
+  "SSE.Views.ChartSettingsDlg.textIn": "Sisällä",
   "SSE.Views.ChartSettingsDlg.textInnerBottom": "Sisäreuna alhaalla",
   "SSE.Views.ChartSettingsDlg.textInnerTop": "Sisäreuna ylhäällä",
   "SSE.Views.ChartSettingsDlg.textInvalidRange": "VIRHE! Virheellinen solujen tietoalue",
@@ -1050,7 +1050,7 @@
   "SSE.Views.ImageSettings.textEdit": "Muokkaa",
   "SSE.Views.ImageSettings.textEditObject": "Muokkaa objektia",
   "SSE.Views.ImageSettings.textFromFile": "Tiedostosta",
-  "SSE.Views.ImageSettings.textFromUrl": "Verkko-osoitteesta",
+  "SSE.Views.ImageSettings.textFromUrl": "URL-osoitteesta",
   "SSE.Views.ImageSettings.textHeight": "Korkeus",
   "SSE.Views.ImageSettings.textInsert": "Korvaa kuva",
   "SSE.Views.ImageSettings.textKeepRatio": "Vakiosuhteet",
@@ -1169,7 +1169,7 @@
   "SSE.Views.PrintSettings.textFitCols": "Sovita kaikki sarakkeet yhdelle sivulle",
   "SSE.Views.PrintSettings.textFitPage": "Sovita taulukko yhdelle sivulle",
   "SSE.Views.PrintSettings.textFitRows": "Sovita kaikki rivit yhdelle sivulle",
-  "SSE.Views.PrintSettings.textHideDetails": "Piilota yksityiskohdat",
+  "SSE.Views.PrintSettings.textHideDetails": "Piilota tiedot",
   "SSE.Views.PrintSettings.textLayout": "Asettelu",
   "SSE.Views.PrintSettings.textPageOrientation": "Sivun suunta",
   "SSE.Views.PrintSettings.textPageScaling": "Skaalaus",
@@ -1318,7 +1318,7 @@
   "SSE.Views.TableSettings.textIsLocked": "Toinen käyttäjä on muokkaamassa tätä elementtiä. ",
   "SSE.Views.TableSettings.textLast": "Viimeinen",
   "SSE.Views.TableSettings.textReservedName": "Nimi, jota yrität käyttää, on jo viitattu solujen kaavoissa. Ole hyvä ja käytä muuta nimeä.",
-  "SSE.Views.TableSettings.textResize": "Muuta taulukon kokoa",
+  "SSE.Views.TableSettings.textResize": "Taulukon koko",
   "SSE.Views.TableSettings.textRows": "Rivit",
   "SSE.Views.TableSettings.textSelectData": "Valitse tiedot",
   "SSE.Views.TableSettings.textTableName": "Taulukon nimi",
@@ -1338,7 +1338,7 @@
   "SSE.Views.TextArtSettings.textDirection": "Suunta",
   "SSE.Views.TextArtSettings.textEmptyPattern": "Ei kuviota",
   "SSE.Views.TextArtSettings.textFromFile": "Tiedostosta",
-  "SSE.Views.TextArtSettings.textFromUrl": "Verkko-osoitteesta",
+  "SSE.Views.TextArtSettings.textFromUrl": "URL-osoitteesta",
   "SSE.Views.TextArtSettings.textGradient": "Kalteva",
   "SSE.Views.TextArtSettings.textGradientFill": "Kalteva täyttö",
   "SSE.Views.TextArtSettings.textImageTexture": "Kuva tai pintarakenne",
diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json
index 4ba3bf7ed..862f66db4 100644
--- a/apps/spreadsheeteditor/main/locale/hu.json
+++ b/apps/spreadsheeteditor/main/locale/hu.json
@@ -59,7 +59,7 @@
   "Common.Views.About.txtVersion": "Verzió",
   "Common.Views.Chat.textSend": "Küldés",
   "Common.Views.Comments.textAdd": "Hozzáad",
-  "Common.Views.Comments.textAddComment": "Hozzászólás hozzáadása",
+  "Common.Views.Comments.textAddComment": "Hozzáad",
   "Common.Views.Comments.textAddCommentToDoc": "Hozzászólás hozzáadása a dokumentumhoz",
   "Common.Views.Comments.textAddReply": "Válasz hozzáadása",
   "Common.Views.Comments.textAnonym": "Vendég",
@@ -1305,7 +1305,7 @@
   "SSE.Views.ChartSettingsDlg.textMinorType": "Kisebb típusú",
   "SSE.Views.ChartSettingsDlg.textMinValue": "Minimum érték",
   "SSE.Views.ChartSettingsDlg.textNextToAxis": "Tengely mellett",
-  "SSE.Views.ChartSettingsDlg.textNone": "nincs",
+  "SSE.Views.ChartSettingsDlg.textNone": "Nincs",
   "SSE.Views.ChartSettingsDlg.textNoOverlay": "Nincs átfedés",
   "SSE.Views.ChartSettingsDlg.textOneCell": "Mozgatás cellákkal méretezés nélkül",
   "SSE.Views.ChartSettingsDlg.textOnTickMarks": "Tengely osztásokon",
@@ -2209,7 +2209,7 @@
   "SSE.Views.TableSettings.textLast": "Utolsó",
   "SSE.Views.TableSettings.textLongOperation": "Hosszú művelet",
   "SSE.Views.TableSettings.textReservedName": "A használni kívánt név már hivatkozásra került egyes képletekben. Kérjük, használjon más nevet.",
-  "SSE.Views.TableSettings.textResize": "Táblázat átméretezése",
+  "SSE.Views.TableSettings.textResize": "Táblázat méret",
   "SSE.Views.TableSettings.textRows": "Sorok",
   "SSE.Views.TableSettings.textSelectData": "Adatok kiválasztása",
   "SSE.Views.TableSettings.textTableName": "Táblázat név",
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
index 4b53ba3b4..d7a69c082 100644
--- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
+++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
@@ -90,35 +90,4 @@
     }
 }
 
-#menu-formula-selection {
-    .dropdown-menu li {
-        .menu-item-icon {
-            .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 20px) !important;
-
-            &.mnu-popup-range {
-                background-position: 0 -1560px;
-            }
-            &.mnu-popup-table {
-                background-position: 0 -1580px;
-            }
-            &.mnu-popup-func {
-                background-position: 0 -1300px;
-            }
-        }
-
-        &.selected {
-            .mnu-popup-range {
-                background-position: -20px -1560px;
-            }
-            .mnu-popup-table {
-                background-position: -20px -1580px;
-            }
-            .mnu-popup-func {
-                background-position: -20px -1300px;
-            }
-        }
-    }
-}
-
-
 
diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js
index bf5493a3c..927dc8965 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/Main.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js
@@ -269,6 +269,7 @@ define([
                     docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
                     docInfo.put_Token(data.doc.token);
                     docInfo.put_Permissions(_permissions);
+                    docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys);
                 }
 
                 this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));
diff --git a/build/documenteditor.json b/build/documenteditor.json
index efcb75f30..4793a5c2b 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -415,7 +415,8 @@
                 }
             ],
             "index-page": {
-                "../deploy/web-apps/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy"
+                "../deploy/web-apps/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy",
+                "../deploy/web-apps/apps/documenteditor/embed/index_loader.html": "../apps/documenteditor/embed/index_loader.html.deploy"
             },
             "images-app": [
                 {
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index c5a41e95f..f5263ba0e 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -418,7 +418,8 @@
                 }
             ],
             "index-page": {
-                "../deploy/web-apps/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy"
+                "../deploy/web-apps/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy",
+                "../deploy/web-apps/apps/presentationeditor/embed/index_loader.html": "../apps/presentationeditor/embed/index_loader.html.deploy"
             },
             "images-app": [
                 {
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index 1f7fc176d..62a6924b0 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -432,8 +432,9 @@
                 }
             ],
             "index-page": {
-                "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy"
-            },
+                "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy",
+                "../deploy/web-apps/apps/spreadsheeteditor/embed/index_loader.html": "../apps/spreadsheeteditor/embed/index_loader.html.deploy"
+           },
             "images-app": [
                 {
                     "expand": true,