diff --git a/.github/workflows/ci-build-upload.yml b/.github/workflows/ci-build-upload.yml
index 8dad8c1df9..362932903f 100644
--- a/.github/workflows/ci-build-upload.yml
+++ b/.github/workflows/ci-build-upload.yml
@@ -69,7 +69,7 @@ jobs:
 
           - name: Upload artifact
             if: steps.apps-files.outcome == 'success'
-            uses: actions/upload-artifact@v3
+            uses: actions/upload-artifact@v4
             with:
               name: apps-artifact
               path: apps.tar
@@ -82,7 +82,7 @@ jobs:
         steps:
 
           - name: Download artifact
-            uses: actions/download-artifact@v3
+            uses: actions/download-artifact@v4
             with:
               name: apps-artifact
 
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 9f1bb45fe5..d1eb246e4b 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1377,6 +1377,7 @@ define([
                 me.api.asc_registerCallback('asc_onEndAction',              _.bind(me.onLongActionEnd, me));
                 me.api.asc_registerCallback('asc_onCoAuthoringDisconnect',  _.bind(me.onCoAuthoringDisconnect, me));
                 me.api.asc_registerCallback('asc_onDisconnectEveryone',     _.bind(me.onDisconnectEveryone, me));
+                me.api.asc_registerCallback('asc_onCompletePreparingOForm',     _.bind(me.onCompletePreparingOForm, me));
                 me.api.asc_registerCallback('asc_onPrint',                  _.bind(me.onPrint, me));
                 me.api.asc_registerCallback('asc_onConfirmAction',          _.bind(me.onConfirmAction, me));
 
@@ -1960,6 +1961,9 @@ define([
                                             msg  : this.warnStartFilling,
                                             buttons: ['ok']
                                         });
+            },
+
+            onCompletePreparingOForm: function() {
                 Common.Gateway.startFilling();
             },
 
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index 23f2fbf595..fcc03ca220 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -444,11 +444,13 @@ class MainController extends Component {
                     let oform = this.api.asc_GetOForm();
                     let role = new AscCommon.CRestrictionSettings();
                     const _userOptions = this.props.storeAppOptions.user;
-                    if (oform && _userOptions && _userOptions.roles && _userOptions.roles.length>0 && oform.asc_canFillRole(_userOptions.roles[0])) {
-                        role.put_OFormRole(_userOptions.roles[0]);
-                    } else {
-                        role.put_OFormNoRole(true);
-                        Common.Notifications.trigger('toolbar:deactivateeditcontrols');
+                    if (oform && _userOptions && _userOptions.roles) {
+                        if (_userOptions.roles.length>0 && oform.asc_canFillRole(_userOptions.roles[0])) {
+                            role.put_OFormRole(_userOptions.roles[0]);
+                        } else {
+                            role.put_OFormNoRole(true);
+                            Common.Notifications.trigger('toolbar:deactivateeditcontrols');
+                        }
                     }
                     this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms, role);
                 }