@sapui5/sap.ushell 1.120.7 → 1.121.0

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,12 +2,13 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.120.7
+ * @version 1.121.0
  * @private
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",
     "sap/base/i18n/Localization",
+    "sap/ui/core/Element",
     "sap/ushell/utils",
     "sap/ui/core/library",
     "sap/ui/thirdparty/jquery",
@@ -20,17 +21,18 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ushell/Config",
     "sap/ushell/utils/UrlParsing",
-    "sap/ui/core/Core",
     "sap/m/Button",
     "sap/m/library",
     "sap/ui/thirdparty/hasher",
+    "sap/ui/core/EventBus",
     "sap/ushell/resources",
     "sap/ushell/ui/shell/ShellHeadItem",
-    "sap/ui/core/Configuration",
-    "sap/base/util/uid"
+    "sap/base/util/uid",
+    "sap/ushell/Container"
 ], function (
     Formatting,
     Localization,
+    Element,
     utils,
     coreLib,
     jQuery,
@@ -43,43 +45,139 @@ sap.ui.define([
     deepExtend,
     Config,
     UrlParsing,
-    Core,
     Button,
     mobileLibrary,
     hasher,
+    EventBus,
     resources,
     ShellHeadItem,
-    CoreConfiguration,
-    fnGetUid
+    fnGetUid,
+    Container
 ) {
     "use strict";
 
-    var SAP_API_PREFIX = "sap.ushell.";
+    const SAP_API_PREFIX = "sap.ushell.";
 
-    var oDummyComponent = new UIComponent();
-    var URLHelper = mobileLibrary.URLHelper;
+    const oDummyComponent = new UIComponent();
+    const URLHelper = mobileLibrary.URLHelper;
     /**
      * All APIs must start with "sap.ushell" prefix
      */
     var oAPIs = {
+        "sap.ushell.services.Navigation": {
+            oServiceCalls: {
+                getHref: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.getHref(oServiceParams.oMessageData.body.oTarget);
+                        });
+                    }
+                },
+                backToPreviousApp: {
+                    executeServiceCallFn: () => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.backToPreviousApp();
+                        });
+                    }
+                },
+                historyBack: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.historyBack(oServiceParams.oMessageData.body.iSteps);
+                        });
+                    }
+                },
+                isInitialNavigation: {
+                    executeServiceCallFn: () => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.isInitialNavigation();
+                        });
+                    }
+                },
+                navigate: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        const oTarget = deepExtend({}, oServiceParams.oMessageData.body.oTarget);
+                        utils.storeSapSystemToLocalStorage(oTarget);
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.navigate(oTarget);
+                        });
+                    }
+                },
+                getPrimaryIntent: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.getPrimaryIntent(
+                                oServiceParams.oMessageData.body.sSemanticObject,
+                                oServiceParams.oMessageData.body.oLinkFilter);
+                        });
+                    }
+                },
+                getLinks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.getLinks(oServiceParams.oMessageData.body);
+                        });
+                    }
+                },
+                getSemanticObjects: {
+                    executeServiceCallFn: () => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.getSemanticObjects();
+                        });
+                    }
+                },
+
+                isNavigationSupported: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.isNavigationSupported(oServiceParams.oMessageData.body.aTargets);
+                        });
+                    }
+                },
+                getAppState: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.getAppState(
+                                oDummyComponent,
+                                oServiceParams.oMessageData.body.sAppStateKey
+                            ).then(function (oState) {
+                                delete oState._oServiceInstance;
+                                return oState;
+                            });
+                        });
+                    }
+                },
+                resolveIntent: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.resolveIntent(oServiceParams.oMessageData.body.sHashFragment);
+                        });
+                    }
+                },
+                isUrlSupported: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+                            return oNavigationService.isUrlSupported(oServiceParams.oMessageData.body.sUrl);
+                        });
+                    }
+                }
+            }
+        },
         "sap.ushell.services.CrossApplicationNavigation": {
             oServiceCalls: {
                 hrefForExternal: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
-                            oCrossAppNavService.hrefForExternalAsync(oServiceParams.oMessageData.body.oArgs, undefined, true)
-                                .then(oDeferred.resolve, oDeferred.reject);
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                            return oCrossAppNavService.hrefForExternalAsync(oServiceParams.oMessageData.body.oArgs);
                         });
-                        return oDeferred.promise();
                     }
                 },
                 getSemanticObjectLinks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         // beware sSemanticObject may also be an array of argument arrays
                         // {sSemanticObject, mParameters, bIgnoreFormFactors }
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.getSemanticObjectLinks(
                                 oServiceParams.oMessageData.body.sSemanticObject, oServiceParams.oMessageData.body.mParameters,
                                 oServiceParams.oMessageData.body.bIgnoreFormFactors, undefined, undefined, oServiceParams.oMessageData.body.bCompactIntents)
@@ -89,102 +187,99 @@ sap.ui.define([
                     }
                 },
                 isIntentSupported: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.isIntentSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 isNavigationSupported: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.isNavigationSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 backToPreviousApp: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                    executeServiceCallFn: async () => {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.backToPreviousApp();
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 historyBack: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.historyBack(oServiceParams.oMessageData.body.iSteps);
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 getAppStateData: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         // note: sAppStateKey may be an array of argument arrays
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.getAppStateData(oServiceParams.oMessageData.body.sAppStateKey).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 toExternal: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred(),
                             oArgs = deepExtend({}, oServiceParams.oMessageData.body.oArgs);
 
                         utils.storeSapSystemToLocalStorage(oArgs);
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.toExternal(oArgs).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 registerBeforeAppCloseEvent: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         oServiceParams.oContainer.setProperty("beforeAppCloseEvent", {
                             enabled: true,
                             params: oServiceParams.oMessageData.body},
                             true
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 expandCompactHash: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.expandCompactHash(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 getDistinctSemanticObjects: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.getDistinctSemanticObjects().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 getLinks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.getLinks(oServiceParams.oMessageData.body).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 getPrimaryIntent: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.getPrimaryIntent(
                                 oServiceParams.oMessageData.body.sSemanticObject,
                                 oServiceParams.oMessageData.body.mParameters).then(oDeferred.resolve, oDeferred.reject);
@@ -193,18 +288,18 @@ sap.ui.define([
                     }
                 },
                 hrefForAppSpecificHash: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.hrefForAppSpecificHashAsync(oServiceParams.oMessageData.body.sAppHash).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 isInitialNavigation: {
-                    executeServiceCallFn: function () {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.isInitialNavigationAsync().then(function (bIsInitialNavigation) {
                                 oDeferred.resolve(bIsInitialNavigation);
                             });
@@ -213,9 +308,9 @@ sap.ui.define([
                     }
                 },
                 getAppState: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.getAppState(
                                 oDummyComponent,
                                 oServiceParams.oMessageData.body.sAppStateKey
@@ -228,13 +323,13 @@ sap.ui.define([
                     }
                 },
                 setInnerAppRoute: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var oHash = UrlParsing.parseShellHash(hasher.getHash()),
                             sNewHash;
 
                         //do nothing if new is exactly like the current one
                         if (oHash.appSpecificRoute === oServiceParams.oMessageData.body.appSpecificRoute) {
-                            return new jQuery.Deferred().resolve().promise();
+                            return;
                         }
                         oHash.appSpecificRoute = oServiceParams.oMessageData.body.appSpecificRoute;
                         sNewHash = "#" + UrlParsing.constructShellHash(oHash);
@@ -245,20 +340,19 @@ sap.ui.define([
                             hasher.replaceHash(sNewHash);
                         }
                         hasher.disableBlueBoxHashChangeTrigger = false;
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 setInnerAppStateData: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
                         PostMessageAPI.prototype._createNewInnerAppState(oServiceParams).then(oDeferred.resolve);
                         return oDeferred.promise();
                     }
                 },
                 resolveIntent: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+                        Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
                             oCrossAppNavService.resolveIntent(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -269,14 +363,14 @@ sap.ui.define([
         "sap.ushell.ui5service.ShellUIService": {
             oServiceCalls: {
                 setTitle: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        return new jQuery.Deferred().resolve(oServiceParams.oContainer.getShellUIService().setTitle(oServiceParams.oMessageData.body.sTitle)).promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        oServiceParams.oContainer.getShellUIService().setTitle(oServiceParams.oMessageData.body.sTitle);
                     }
                 },
                 setBackNavigation: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var fnCallback;
-                        if (oServiceParams.oMessageData.body && oServiceParams.oMessageData.body.callbackMessage && oServiceParams.oMessageData.body.callbackMessage.service) {
+                        if (oServiceParams?.oMessageData?.body?.callbackMessage?.service) {
                             fnCallback = PostMessageAPI.prototype._backButtonPressedCallback.bind(
                                 null,
                                 oServiceParams.oMessage.source,
@@ -285,7 +379,6 @@ sap.ui.define([
                             );
                         } // empty body or callback message will call the setBackNavigation with undefined, this should reset the back button callback
                         oServiceParams.oContainer.getShellUIService().setBackNavigation(fnCallback);
-                        return Promise.resolve();
                     }
                 }
             }
@@ -293,59 +386,53 @@ sap.ui.define([
         "sap.ushell.services.ShellUIService": {
             oServiceCalls: {
                 setTitle: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        return new jQuery.Deferred().resolve(oServiceParams.oContainer.getShellUIService().setTitle(oServiceParams.oMessageData.body.sTitle)).promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        oServiceParams.oContainer.getShellUIService().setTitle(oServiceParams.oMessageData.body.sTitle);
                     }
                 },
                 setHierarchy: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        return new jQuery.Deferred().resolve(oServiceParams.oContainer.getShellUIService().setHierarchy(oServiceParams.oMessageData.body.aHierarchyLevels)).promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        oServiceParams.oContainer.getShellUIService().setHierarchy(oServiceParams.oMessageData.body.aHierarchyLevels);
                     }
                 },
                 setRelatedApps: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        return new jQuery.Deferred().resolve(oServiceParams.oContainer.getShellUIService().setRelatedApps(oServiceParams.oMessageData.body.aRelatedApps)).promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        oServiceParams.oContainer.getShellUIService().setRelatedApps(oServiceParams.oMessageData.body.aRelatedApps);
                     }
                 },
                 setDirtyFlag: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.setDirtyFlag(oServiceParams.oMessageData.body.bIsDirty);
-                        return new jQuery.Deferred().resolve().promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.setDirtyFlag(oServiceParams.oMessageData.body.bIsDirty);
                     }
                 },
                 showShellUIBlocker: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var bShow = oServiceParams.oMessageData.body.bShow;
                         showUIBlocker(bShow);
-                        sap.ui.getCore().getEventBus().publish(
+                        EventBus.getInstance().publish(
                             "sap.ushell.services.ShellUIService", "showShellUIBlocker",
                             { bShow: bShow }
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 getFLPUrl: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var bIncludeHash = false;
-                        if (oServiceParams.oMessageData.body && oServiceParams.oMessageData.body.bIncludeHash === true) {
-                            bIncludeHash = true;
-                        }
-                        return new jQuery.Deferred().resolve(sap.ushell.Container.getFLPUrl(bIncludeHash)).promise();
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getFLPUrlAsync(oServiceParams?.oMessageData?.body?.bIncludeHash);
                     }
                 },
                 getShellGroupIDs: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                        Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                             oBookmarkService.getShellGroupIDs((oServiceParams.oMessageData.body ? oServiceParams.oMessageData.body.bGetAll : undefined)).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 addBookmark: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                        Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                             oBookmarkService.addBookmarkByGroupId(oServiceParams.oMessageData.body.oParameters, oServiceParams.oMessageData.body.groupId)
                                 .then(oDeferred.resolve, oDeferred.reject);
                         });
@@ -353,7 +440,7 @@ sap.ui.define([
                     }
                 },
                 addBookmarkDialog: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         // do not change the ["require"] to .require. This is to avoid
                         //  adding dependencies to the core min/ext.
                         /*eslint-disable dot-notation*/
@@ -362,20 +449,19 @@ sap.ui.define([
                             dialogButton.firePress({});
                         });
                         /*eslint-enable dot-notation*/
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 getShellGroupTiles: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                        Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
                             oLaunchPageService.getTilesByGroupId(oServiceParams.oMessageData.body.groupId).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 sendUrlAsEmail: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var sAppName = Config.last("/core/shellHeader/application").title;
                         var sSubject = (sAppName === undefined) ?
                             resources.i18n.getText("linkToApplication") :
@@ -389,11 +475,10 @@ sap.ui.define([
                             document.URL,
                             true
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 sendEmailWithFLPButton: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var sAppName = Config.last("/core/shellHeader/application").title;
                         var sSubject = (sAppName === undefined) ?
                             resources.i18n.getText("linkToApplication") :
@@ -407,11 +492,10 @@ sap.ui.define([
                             document.URL,
                             oServiceParams.oMessageData.body.bSetAppStateToPublic
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 sendEmail: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         PostMessageAPI.prototype._sendEmail(
                             oServiceParams.oMessageData.body.sTo,
                             oServiceParams.oMessageData.body.sSubject,
@@ -421,11 +505,10 @@ sap.ui.define([
                             oServiceParams.oMessageData.body.sIFrameURL,
                             oServiceParams.oMessageData.body.bSetAppStateToPublic
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 processHotKey: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var oEvent;
                         // IE doesn't support creating the KeyboardEvent object with a the "new" constructor, hence if this will fail, it will be created
                         // using the document object- https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/KeyboardEvent
@@ -449,7 +532,6 @@ sap.ui.define([
                             oEvent = IEevent;
                         }
                         document.dispatchEvent(oEvent);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 }
             }
@@ -457,51 +539,45 @@ sap.ui.define([
         "sap.ushell.services.Container": {
             oServiceCalls: {
                 setDirtyFlag: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.setDirtyFlag(oServiceParams.oMessageData.body.bIsDirty);
-                        return new jQuery.Deferred().resolve().promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.setDirtyFlag(oServiceParams.oMessageData.body.bIsDirty);
                     }
                 },
                 registerDirtyStateProvider: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         if (oServiceParams.oMessageData.body.bRegister) {
                             PostMessageAPI.prototype.registerAsyncDirtyStateProvider(oServiceParams);
                         } else {
                             PostMessageAPI.prototype.deregisterAsyncDirtyStateProvider(oServiceParams);
                         }
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 getFLPUrl: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var bIncludeHash = false;
-                        if (oServiceParams.oMessageData.body && oServiceParams.oMessageData.body.bIncludeHash === true) {
-                            bIncludeHash = true;
-                        }
-                        return new jQuery.Deferred().resolve(sap.ushell.Container.getFLPUrl(bIncludeHash)).promise();
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getFLPUrlAsync(oServiceParams?.oMessageData?.body?.bIncludeHash);
                     }
                 },
                 getFLPConfig: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
 
-                        sap.ushell.Container.getFLPConfig().then(function (oFLPConfiguration) {
+                        Container.getFLPConfig().then(function (oFLPConfiguration) {
                             oDeferred.resolve(oFLPConfiguration);
                         });
                         return oDeferred.promise();
                     }
                 },
                 getFLPPlatform: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
 
-                        sap.ushell.Container.getFLPPlatform().then(oDeferred.resolve);
+                        Container.getFLPPlatform().then(oDeferred.resolve);
                         return oDeferred.promise();
                     }
                 },
                 attachLogoutEvent: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.attachLogoutEvent(function () {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.attachLogoutEvent(function () {
                             return new Promise(function (fnResolve, fnReject) {
                                 sap.ui.require(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"], function (PostMessageUtils) {
                                     PostMessageUtils.postMessageToIframeApp(
@@ -509,7 +585,6 @@ sap.ui.define([
                                 });
                             });
                         }, true);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 }
             }
@@ -517,79 +592,60 @@ sap.ui.define([
         "sap.ushell.services.AppState": {
             oServiceCalls: {
                 getAppState: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                            oAppStateService.getAppState(
-                                oServiceParams.oMessageData.body.sKey
-                            ).done(function (oState) {
-                                delete oState._oServiceInstance;
-                                oDeferred.resolve(oState);
-                            }).fail(function (oState) {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const oAppStateService = await Container.getServiceAsync("AppState");
+                        return oAppStateService.getAppState(oServiceParams.oMessageData.body.sKey).always((oState) => {
+                            if (oState?._oServiceInstance) {
                                 delete oState._oServiceInstance;
-                                oDeferred.resolve(oState);
-                            });
+                            }
                         });
-                        return oDeferred.promise();
                     }
                 },
                 _saveAppState: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                            oAppStateService._saveAppState(
-                                oServiceParams.oMessageData.body.sKey,
-                                oServiceParams.oMessageData.body.sData,
-                                oServiceParams.oMessageData.body.sAppName,
-                                oServiceParams.oMessageData.body.sComponent,
-                                oServiceParams.oMessageData.body.bTransient,
-                                oServiceParams.oMessageData.body.iPersistencyMethod,
-                                oServiceParams.oMessageData.body.oPersistencySettings).then(oDeferred.resolve, oDeferred.reject);
-                        });
-                        return oDeferred.promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const oAppStateService = await Container.getServiceAsync("AppState");
+                        return oAppStateService._saveAppState(
+                            oServiceParams.oMessageData.body.sKey,
+                            oServiceParams.oMessageData.body.sData,
+                            oServiceParams.oMessageData.body.sAppName,
+                            oServiceParams.oMessageData.body.sComponent,
+                            oServiceParams.oMessageData.body.bTransient,
+                            oServiceParams.oMessageData.body.iPersistencyMethod,
+                            oServiceParams.oMessageData.body.oPersistencySettings);
                     }
                 },
                 _loadAppState: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                            oAppStateService._loadAppState(oServiceParams.oMessageData.body.sKey).then(oDeferred.resolve, oDeferred.reject);
-                        });
-                        return oDeferred.promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const oAppStateService = await Container.getServiceAsync("AppState");
+                        return oAppStateService._loadAppState(oServiceParams.oMessageData.body.sKey);
                     }
                 },
                 deleteAppState: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                            oAppStateService.deleteAppState(oServiceParams.oMessageData.body.sKey).then(oDeferred.resolve, oDeferred.reject);
-                        });
-                        return oDeferred.promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const oAppStateService = await Container.getServiceAsync("AppState");
+                        return oAppStateService.deleteAppState(oServiceParams.oMessageData.body.sKey);
                     }
                 },
                 makeStatePersistent: {
-                   executeServiceCallFn: function (oServiceParams) {
-                       var oDeferred = new jQuery.Deferred();
-                       sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                           oAppStateService.makeStatePersistent(
-                               oServiceParams.oMessageData.body.sKey,
-                               oServiceParams.oMessageData.body.iPersistencyMethod,
-                               oServiceParams.oMessageData.body.oPersistencySettings).then(oDeferred.resolve, oDeferred.reject);
-                       });
-                       return oDeferred.promise();
-                   }
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const oAppStateService = await Container.getServiceAsync("AppState");
+                        return oAppStateService.makeStatePersistent(
+                            oServiceParams.oMessageData.body.sKey,
+                            oServiceParams.oMessageData.body.iPersistencyMethod,
+                            oServiceParams.oMessageData.body.oPersistencySettings);
+                    }
                 }
             }
         },
         "sap.ushell.services.Bookmark": {
             oServiceCalls: {
                 addBookmarkUI5: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
                                 PostMessageAPI.prototype._stripBookmarkServiceUrlForLocalContentProvider(oServiceParams.oMessageData.body.oParameters, oSystemContext);
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.addBookmark(
                                         oServiceParams.oMessageData.body.oParameters,
                                         oServiceParams.oMessageData.body.vContainer,
@@ -602,9 +658,9 @@ sap.ui.define([
                     }
                 },
                 addBookmark: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                        Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                             oBookmarkService.addBookmarkByGroupId(
                                 oServiceParams.oMessageData.body.oParameters,
                                 oServiceParams.oMessageData.body.groupId).then(oDeferred.resolve, oDeferred.reject);
@@ -613,18 +669,18 @@ sap.ui.define([
                     }
                 },
                 getShellGroupIDs: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                        Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                             oBookmarkService.getShellGroupIDs().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 addCatalogTileToGroup: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                        Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                             oBookmarkService.addCatalogTileToGroup(
                                 oServiceParams.oMessageData.body.sCatalogTileId,
                                 oServiceParams.oMessageData.body.sGroupId,
@@ -634,11 +690,11 @@ sap.ui.define([
                     }
                 },
                 countBookmarks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.countBookmarks(
                                         oServiceParams.oMessageData.body.sUrl,
                                         oSystemContext.id).then(oDeferred.resolve, oDeferred.reject);
@@ -649,11 +705,11 @@ sap.ui.define([
                     }
                 },
                 deleteBookmarks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.deleteBookmarks(
                                         oServiceParams.oMessageData.body.sUrl,
                                         oSystemContext.id).then(oDeferred.resolve, oDeferred.reject);
@@ -664,11 +720,11 @@ sap.ui.define([
                     }
                 },
                 updateBookmarks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.updateBookmarks(
                                         oServiceParams.oMessageData.body.sUrl,
                                         oServiceParams.oMessageData.body.oParameters,
@@ -680,20 +736,20 @@ sap.ui.define([
                     }
                 },
                 getContentNodes: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                        Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                             oBookmarkService.getContentNodes().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 addCustomBookmark: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.addCustomBookmark(
                                         oServiceParams.oMessageData.body.sVizType,
                                         oServiceParams.oMessageData.body.oConfig,
@@ -706,12 +762,12 @@ sap.ui.define([
                     }
                 },
                 countCustomBookmarks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
                                 oServiceParams.oMessageData.body.oIdentifier.contentProviderId = oSystemContext.id;
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.countCustomBookmarks(oServiceParams.oMessageData.body.oIdentifier).then(oDeferred.resolve, oDeferred.reject);
                                 });
                             });
@@ -720,12 +776,12 @@ sap.ui.define([
                     }
                 },
                 updateCustomBookmarks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
                                 oServiceParams.oMessageData.body.oIdentifier.contentProviderId = oSystemContext.id;
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.updateCustomBookmarks(
                                         oServiceParams.oMessageData.body.oIdentifier,
                                         oServiceParams.oMessageData.body.oConfig).then(oDeferred.resolve, oDeferred.reject);
@@ -736,12 +792,12 @@ sap.ui.define([
                     }
                 },
                 deleteCustomBookmarks: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
                                 oServiceParams.oMessageData.body.oIdentifier.contentProviderId = oSystemContext.id;
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                                     oBookmarkService.deleteCustomBookmarks(oServiceParams.oMessageData.body.oIdentifier).then(oDeferred.resolve, oDeferred.reject);
                                 });
                             });
@@ -750,11 +806,11 @@ sap.ui.define([
                     }
                 },
                 addBookmarkToPage: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
-                                sap.ushell.Container.getServiceAsync("Bookmark").then(function (BookmarkService) {
+                                Container.getServiceAsync("BookmarkV2").then(function (BookmarkService) {
                                     BookmarkService.addBookmarkToPage(
                                         oServiceParams.oMessageData.body.oParameters,
                                         oServiceParams.oMessageData.body.sPageId,
@@ -767,24 +823,179 @@ sap.ui.define([
                 }
             }
         },
+        "sap.ushell.services.BookmarkV2": {
+            oServiceCalls: {
+                addBookmarkUI5: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext();
+                        }).then(function (oSystemContext) {
+                            PostMessageAPI.prototype._stripBookmarkServiceUrlForLocalContentProvider(oServiceParams.oMessageData.body.oParameters, oSystemContext);
+                            return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                return oBookmarkService.addBookmark(
+                                    oServiceParams.oMessageData.body.oParameters,
+                                    oServiceParams.oMessageData.body.vContainer,
+                                    oSystemContext.id);
+                            });
+                        });
+                    }
+                },
+                addBookmark: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                            return oBookmarkService.addBookmarkByGroupId(
+                                oServiceParams.oMessageData.body.oParameters,
+                                oServiceParams.oMessageData.body.groupId);
+                        });
+                    }
+                },
+                getShellGroupIDs: {
+                    executeServiceCallFn: () => {
+                        return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                            return oBookmarkService.getShellGroupIDs();
+                        });
+                    }
+                },
+                addCatalogTileToGroup: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                            return oBookmarkService.addCatalogTileToGroup(
+                                oServiceParams.oMessageData.body.sCatalogTileId,
+                                oServiceParams.oMessageData.body.sGroupId,
+                                oServiceParams.oMessageData.body.oCatalogData);
+                        });
+                    }
+                },
+                countBookmarks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.countBookmarks(oServiceParams.oMessageData.body.sUrl, oSystemContext.id);
+                                });
+                            });
+                        });
+                    }
+                },
+                deleteBookmarks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.deleteBookmarks(oServiceParams.oMessageData.body.sUrl, oSystemContext.id);
+                                });
+                            });
+                        });
+                    }
+                },
+                updateBookmarks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.updateBookmarks(
+                                        oServiceParams.oMessageData.body.sUrl,
+                                        oServiceParams.oMessageData.body.oParameters,
+                                        oSystemContext.id);
+                                });
+                            });
+                        });
+                    }
+                },
+                getContentNodes: {
+                    executeServiceCallFn: () => {
+                        return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                            return oBookmarkService.getContentNodes();
+                        });
+                    }
+                },
+                addCustomBookmark: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.addCustomBookmark(
+                                        oServiceParams.oMessageData.body.sVizType,
+                                        oServiceParams.oMessageData.body.oConfig,
+                                        oServiceParams.oMessageData.body.vContentNodes,
+                                        oSystemContext.id);
+                                });
+                            });
+                        });
+                    }
+                },
+                countCustomBookmarks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                oServiceParams.oMessageData.body.oIdentifier.contentProviderId = oSystemContext.id;
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.countCustomBookmarks(oServiceParams.oMessageData.body.oIdentifier);
+                                });
+                            });
+                        });
+                    }
+                },
+                updateCustomBookmarks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                oServiceParams.oMessageData.body.oIdentifier.contentProviderId = oSystemContext.id;
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.updateCustomBookmarks(
+                                        oServiceParams.oMessageData.body.oIdentifier,
+                                        oServiceParams.oMessageData.body.oConfig);
+                                });
+                            });
+                        });
+                    }
+                },
+                deleteCustomBookmarks: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                oServiceParams.oMessageData.body.oIdentifier.contentProviderId = oSystemContext.id;
+                                return Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                                    return oBookmarkService.deleteCustomBookmarks(oServiceParams.oMessageData.body.oIdentifier);
+                                });
+                            });
+                        });
+                    }
+                },
+                addBookmarkToPage: {
+                    executeServiceCallFn: (oServiceParams) => {
+                        return Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                            return oAppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
+                                return Container.getServiceAsync("BookmarkV2").then(function (BookmarkService) {
+                                    return BookmarkService.addBookmarkToPage(
+                                        oServiceParams.oMessageData.body.oParameters,
+                                        oServiceParams.oMessageData.body.sPageId,
+                                        oSystemContext.id);
+                                });
+                            });
+                        });
+                    }
+                }
+            }
+        },
         "sap.ushell.services.AppLifeCycle": {
             oServiceCalls: {
                 getFullyQualifiedXhrUrl: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var result = "",
                             xhr = "",
                             oDeferred = new jQuery.Deferred(),
                             path = oServiceParams.oMessageData.body.path;
 
                         if (path !== "" && path !== undefined && path !== null) {
-                            sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
+                            Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
                                 AppLifeCycleService.getCurrentApplication().getSystemContext().then(function (oSystemContext) {
                                     xhr = oSystemContext.getFullyQualifiedXhrUrl(path);
 
                                     var sHostName = "",
                                         sProtocol = "",
                                         sPort = "",
-                                        sFlpURL = sap.ushell.Container.getFLPUrl(true),
+                                        sFlpURL = Container.getFLPUrl(true),
                                         oURI = new URI(sFlpURL);
                                     if (oURI.protocol() !== null && oURI.protocol() !== undefined && oURI.protocol() !== "") {
                                         sProtocol = oURI.protocol() + "://";
@@ -806,41 +1017,26 @@ sap.ui.define([
                     }
                 },
                 getSystemAlias: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var sSystemAlias = oServiceParams.oContainer.getSystemAlias();
                         if (sSystemAlias === null || sSystemAlias === undefined) {
                             sSystemAlias = "";
                         }
-
-                        return new jQuery.Deferred().resolve(sSystemAlias).promise();
+                        return sSystemAlias;
                     }
                 },
                 setNewAppInfo: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
                             AppLifeCycleService.setAppInfo(oServiceParams.oMessageData.body, true);
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 updateCurrentAppInfo: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycleService) {
                             AppLifeCycleService.setAppInfo(oServiceParams.oMessageData.body, false);
                         });
-                        return Promise.resolve();
-                    }
-                },
-                changeAppKeepAliveStatus: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        return new Promise(function (fnResolve) {
-                            sap.ui.require([
-                                "sap/ushell/components/applicationIntegration/AppLifeCycle"
-                            ], function (AppLifeCycleAI) {
-                                AppLifeCycleAI.changeAppKeepAliveStatus(oServiceParams.oContainer, oServiceParams.oMessageData.body);
-                                fnResolve();
-                            });
-                        });
                     }
                 }
             }
@@ -848,9 +1044,8 @@ sap.ui.define([
         "sap.ushell.services.AppConfiguration": {
             oServiceCalls: {
                 setApplicationFullWidth: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         AppConfiguration.setApplicationFullWidthInternal(oServiceParams.oMessageData.body.bValue);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 }
             }
@@ -892,7 +1087,7 @@ sap.ui.define([
             },
             oServiceCalls: {
                 hashChange: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         //FIX for internal incident #1980317281 - In general, hash structure in FLP is splitted into 3 parts:
                         //A - application identification & B - Application parameters & C - Internal application area
                         // Now, when an IFrame changes its hash, it sends PostMessage up to the FLP. The FLP does 2 things: Change its URL
@@ -908,9 +1103,9 @@ sap.ui.define([
                         // that is running in the Iframe.
                         var sDirection = oServiceParams.oMessageData.body.direction;
                         if (sDirection) {
-                            sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigationService) {
-                                oShellNavigationService.hashChanger.fireEvent("hashReplaced", {
-                                    hash: oShellNavigationService.hashChanger.getHash(),
+                            Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+                                oShellNavigationInternal.hashChanger.fireEvent("hashReplaced", {
+                                    hash: oShellNavigationInternal.hashChanger.getHash(),
                                     direction: sDirection
                                 });
                                 Log.debug("PostMessageAPI.hashChange :: Informed by the Iframe, to change the " +
@@ -925,21 +1120,18 @@ sap.ui.define([
                     }
                 },
                 iframeIsValid: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         oServiceParams.oContainer.setProperty("isIframeValidTime", {time: new Date().getTime()}, true);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 iframeIsBusy: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         //deprecated since 1.118 and not used anymore
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 isInvalidIframe: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         oServiceParams.oContainer.setProperty("isInvalidIframe", oServiceParams.oMessageData.body.bValue, true);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 }
             }
@@ -947,40 +1139,40 @@ sap.ui.define([
         "sap.ushell.services.UserInfo": {
             oServiceCalls: {
                 getThemeList: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
+                        Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
                             oUserInfoService.getThemeList().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 getShellUserInfo: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
+                        Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
                             oUserInfoService.getShellUserInfo().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 getLanguageList: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
+                        Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
                             oUserInfoService.getLanguageList().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 updateUserPreferences: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
                         if (oServiceParams.oMessageData.body.language) {
-                            sap.ushell.Container.getUser().setLanguage(oServiceParams.oMessageData.body.language);
-                            sap.ushell.Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
+                            Container.getUser().setLanguage(oServiceParams.oMessageData.body.language);
+                            Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
                                 oUserInfoService.updateUserPreferences().then(function () {
-                                    sap.ushell.Container.getUser().resetChangedProperty("language");
+                                    Container.getUser().resetChangedProperty("language");
                                     oDeferred.resolve();
                                 }, oDeferred.reject);
                             });
@@ -991,13 +1183,12 @@ sap.ui.define([
                     }
                 },
                 openThemeManager: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         EventHub.emit("openThemeManager", Date.now());
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 getLocaleData: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         const oLocaleData = {
                             //date format
                             calendarType: Formatting.getCalendarType(),
@@ -1016,7 +1207,7 @@ sap.ui.define([
                             //currency formats
                             currencyFormats: Formatting.getCustomCurrencies()
                         };
-                        return new jQuery.Deferred().resolve(oLocaleData).promise();
+                        return oLocaleData;
                     }
                 }
             }
@@ -1024,24 +1215,45 @@ sap.ui.define([
         "sap.ushell.services.ShellNavigation": {
             oServiceCalls: {
                 toExternal: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigationService) {
-                            oShellNavigationService.toExternal(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+                            oShellNavigationInternal.toExternal(
+                                oServiceParams.oMessageData.body.oArgs,
+                                undefined,
+                                oServiceParams.oMessageData.body.bWriteHistory);
+                        });
+                    }
+                },
+                toAppHash: {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+                            oShellNavigationInternal.toAppHash(
+                                oServiceParams.oMessageData.body.sAppHash,
+                                oServiceParams.oMessageData.body.bWriteHistory);
+                        });
+                    }
+                }
+            }
+        },
+        "sap.ushell.services.ShellNavigationInternal": {
+            oServiceCalls: {
+                toExternal: {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+                            oShellNavigationInternal.toExternal(
                                 oServiceParams.oMessageData.body.oArgs,
                                 undefined,
                                 oServiceParams.oMessageData.body.bWriteHistory);
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 toAppHash: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigationService) {
-                            oShellNavigationService.toAppHash(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+                            oShellNavigationInternal.toAppHash(
                                 oServiceParams.oMessageData.body.sAppHash,
                                 oServiceParams.oMessageData.body.bWriteHistory);
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 }
             }
@@ -1049,45 +1261,45 @@ sap.ui.define([
         "sap.ushell.services.NavTargetResolution": {
             oServiceCalls: {
                 getDistinctSemanticObjects: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.getDistinctSemanticObjects().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 expandCompactHash: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.expandCompactHash(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 resolveHashFragment: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.resolveHashFragment(oServiceParams.oMessageData.body.sHashFragment).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 isIntentSupported: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.isIntentSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
                     }
                 },
                 isNavigationSupported: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                        Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
                             oNavTargetResolutionService.isNavigationSupported(oServiceParams.oMessageData.body.aIntents).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1098,79 +1310,69 @@ sap.ui.define([
         "sap.ushell.services.Renderer": {
             oServiceCalls: {
                 addHeaderItem: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         addRendererButton("addHeaderItem", oServiceParams);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
 
                 addHeaderEndItem: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         addRendererButton("addHeaderEndItem", oServiceParams);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
 
                 showHeaderItem: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").showHeaderItem(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").showHeaderItem(
                             oServiceParams.oMessageData.body.aIds,
                             oServiceParams.oMessageData.body.bCurrentState || true,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 showHeaderEndItem: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").showHeaderEndItem(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").showHeaderEndItem(
                             oServiceParams.oMessageData.body.aIds,
                             oServiceParams.oMessageData.body.bCurrentState || true,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 hideHeaderItem: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").hideHeaderItem(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").hideHeaderItem(
                             oServiceParams.oMessageData.body.aIds,
                             oServiceParams.oMessageData.body.bCurrentState || true,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 hideHeaderEndItem: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").hideHeaderEndItem(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").hideHeaderEndItem(
                             oServiceParams.oMessageData.body.aIds,
                             oServiceParams.oMessageData.body.bCurrentState || true,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 setHeaderTitle: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").setHeaderTitle(
-                            oServiceParams.oMessageData.body.sTitle
-                        );
-                        return new jQuery.Deferred().resolve().promise();
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").setHeaderTitle(oServiceParams.oMessageData.body.sTitle);
                     }
                 },
                 setHeaderVisibility: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").setHeaderVisibility(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").setHeaderVisibility(
                             oServiceParams.oMessageData.body.bVisible,
                             oServiceParams.oMessageData.body.bCurrentState || true,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 createShellHeadItem: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var params = oServiceParams.oMessageData.body.params;
                         params.press = function () {
                             sap.ui.require(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"], function (PostMessageUtils) {
@@ -1180,51 +1382,47 @@ sap.ui.define([
                         /*eslint-disable no-new*/
                         new ShellHeadItem(params);
                         /*eslint-enable no-new*/
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 showActionButton: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").showActionButton(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").showActionButton(
                             oServiceParams.oMessageData.body.aIds,
                             oServiceParams.oMessageData.body.bCurrentState,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 hideActionButton: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").hideActionButton(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").hideActionButton(
                             oServiceParams.oMessageData.body.aIds,
                             oServiceParams.oMessageData.body.bCurrentState,
                             oServiceParams.oMessageData.body.aStates
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 addUserAction: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         oServiceParams.oMessageData.body.oParameters.oControlProperties.press = function () {
                             sap.ui.require(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"], function (PostMessageUtils) {
                                 PostMessageUtils.postMessageToIframeApp(oServiceParams.oContainer, "sap.ushell.appRuntime", "buttonClick",
                                     { buttonId: oServiceParams.oMessageData.body.oParameters.oControlProperties.id });
                             });
                         };
-                        sap.ushell.Container.getRenderer("fiori2").addUserAction(
+                        Container.getRendererInternal("fiori2").addUserAction(
                             oServiceParams.oMessageData.body.oParameters
                         );
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 addOptionsActionSheetButton: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var aButtons = Array.isArray(oServiceParams.oMessageData.body) ?
                             oServiceParams.oMessageData.body : [oServiceParams.oMessageData.body];
 
                         aButtons.forEach(function (oButton) {
-                            if (Core.byId(oButton.id)) {
-                                Core.byId(oButton.id).destroy();
+                            if (Element.getElementById(oButton.id)) {
+                                Element.getElementById(oButton.id).destroy();
                             }
                             /*eslint-disable no-new*/
                             new Button({
@@ -1239,46 +1437,42 @@ sap.ui.define([
                                 }
                             });
                             /*eslint-enable no-new*/
-                            sap.ushell.Container.getRenderer("fiori2").showActionButton(
+                            Container.getRendererInternal("fiori2").showActionButton(
                                 [oButton.id],
                                 true,
                                 oButton.aStates
                             );
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 removeOptionsActionSheetButton: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: async (oServiceParams) => {
                         var aButtons = Array.isArray(oServiceParams.oMessageData.body) ?
                             oServiceParams.oMessageData.body : [oServiceParams.oMessageData.body];
 
                         aButtons.forEach(function (oButton) {
-                            sap.ushell.Container.getRenderer("fiori2").hideActionButton(
+                            Container.getRendererInternal("fiori2").hideActionButton(
                                 oButton.id,
                                 true,
                                 oButton.aStates
                             );
-                            if (Core.byId(oButton.id)) {
-                                Core.byId(oButton.id).destroy();
+                            if (Element.getElementById(oButton.id)) {
+                                Element.getElementById(oButton.id).destroy();
                             }
                         });
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 updateHeaderItem: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").updateHeaderItem(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").updateHeaderItem(
                             oServiceParams.oMessageData.body.sId,
                             oServiceParams.oMessageData.body.oControlProperties);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 },
                 destroyButton: {
-                    executeServiceCallFn: function (oServiceParams) {
-                        sap.ushell.Container.getRenderer("fiori2").destroyButton(
+                    executeServiceCallFn: async (oServiceParams) => {
+                        Container.getRendererInternal("fiori2").destroyButton(
                             oServiceParams.oMessageData.body.aIds);
-                        return new jQuery.Deferred().resolve().promise();
                     }
                 }
             }
@@ -1286,9 +1480,9 @@ sap.ui.define([
         "sap.ushell.services.LaunchPage": {
             oServiceCalls: {
                 getGroupsForBookmarks: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                        Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
                             oLaunchPageService.getGroupsForBookmarks().then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1299,9 +1493,9 @@ sap.ui.define([
         "sap.ushell.services.Menu": {
             oServiceCalls: {
                 getSpacesPagesHierarchy: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("Menu").then(function (MenuService) {
+                        Container.getServiceAsync("Menu").then(function (MenuService) {
                             MenuService.getSpacesPagesHierarchy().then(function (aSpacePagesHierarchy) {
                                 oDeferred.resolve(aSpacePagesHierarchy);
                             });
@@ -1314,9 +1508,9 @@ sap.ui.define([
         "sap.ushell.services.CommonDataModel": {
             oServiceCalls: {
                 getAllPages: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: () => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("CommonDataModel").then(function (CommonDataModelService) {
+                        Container.getServiceAsync("CommonDataModel").then(function (CommonDataModelService) {
                             CommonDataModelService.getAllPages().then(function (aPages) {
                                 oDeferred.resolve(aPages);
                             });
@@ -1329,9 +1523,9 @@ sap.ui.define([
         "sap.ushell.services.UITracer": {
             oServiceCalls: {
                 trace: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("UITracer").then(function () {
+                        Container.getServiceAsync("UITracer").then(function () {
                             EventHub.emit("UITracer.trace", oServiceParams.oMessageData.body.trace);
                             oDeferred.resolve();
                         });
@@ -1343,17 +1537,17 @@ sap.ui.define([
         "sap.ushell.services.MessageBroker": {
             oServiceCalls: {
                 _execute: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
 
                         if (Config.last("/core/shell/enableMessageBroker")) {
-                            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                            Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
                                 sap.ui.require(["sap/ushell/services/_MessageBroker/MessageBrokerEngine"], function (MessageBrokerEngine) {
                                     MessageBrokerEngine.processPostMessage(oServiceParams).then(function (oResolvedData) {
-                                            oDeferred.resolve(oResolvedData);
-                                        }).catch(function (sError) {
-                                            oDeferred.reject(sError);
-                                        });
+                                        oDeferred.resolve(oResolvedData);
+                                    }).catch(function (sError) {
+                                        oDeferred.reject(sError);
+                                    });
                                 });
                             });
                         } else {
@@ -1367,9 +1561,9 @@ sap.ui.define([
         "sap.ushell.services.SearchableContent": {
             oServiceCalls: {
                 getApps: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("SearchableContent").then(function (SearchableContentService) {
+                        Container.getServiceAsync("SearchableContent").then(function (SearchableContentService) {
                             var oOptions;
                             try {
                                 oOptions = oServiceParams.oMessageData.body.oOptions;
@@ -1388,9 +1582,9 @@ sap.ui.define([
         "sap.ushell.services.ReferenceResolver": {
             oServiceCalls: {
                 resolveReferences: {
-                    executeServiceCallFn: function (oServiceParams) {
+                    executeServiceCallFn: (oServiceParams) => {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("ReferenceResolver").then(function (ReferenceResolverService) {
+                        Container.getServiceAsync("ReferenceResolver").then(function (ReferenceResolverService) {
                             ReferenceResolverService.resolveReferences(oServiceParams.oMessageData.body.aReferences).then(oDeferred.resolve, oDeferred.reject);
                         });
                         return oDeferred.promise();
@@ -1532,7 +1726,7 @@ sap.ui.define([
                 sNewAppStateKey,
                 oValue;
 
-            sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
+            Container.getServiceAsync("AppState").then(function (oAppStateService) {
                 oNewState = oAppStateService.createEmptyAppState();
                 if (oServiceParams.oMessageData.body.sData !== undefined) {
                     try {
@@ -1581,24 +1775,24 @@ sap.ui.define([
      */
     function showUIBlocker (bShow) {
         if (bShow === true) {
-            if (Core.byId("shell-header")) {
-                Core.byId("shell-header").setBlocked(true);
+            if (Element.getElementById("shell-header")) {
+                Element.getElementById("shell-header").setBlocked(true);
                 var oHeaderElement = jQuery("#shell-header-blockedLayer");
                 oHeaderElement.addClass("sapUshellShellBlocked");
             }
-            if (Core.byId("menuBar")) {
+            if (Element.getElementById("menuBar")) {
                 // This is a specific case for blocking menuPlugin items
-                Core.byId("menuBar").setBlocked(true);
+                Element.getElementById("menuBar").setBlocked(true);
                 var oMenuBarElement = jQuery("#menuBar-blockedLayer");
                 oMenuBarElement.addClass("sapUshellMenuBarBlocked");
             }
         } else if (bShow === false) {
-            if (Core.byId("shell-header")) {
-                Core.byId("shell-header").setBlocked(false);
+            if (Element.getElementById("shell-header")) {
+                Element.getElementById("shell-header").setBlocked(false);
             }
-            if (Core.byId("menuBar")) {
+            if (Element.getElementById("menuBar")) {
                 // This is a specific case for blocking menuPlugin items
-                Core.byId("menuBar").setBlocked(false);
+                Element.getElementById("menuBar").setBlocked(false);
             }
         }
     }
@@ -1607,7 +1801,7 @@ sap.ui.define([
      * @private
      */
     function addRendererButton (sAPI, oServiceParams) {
-        sap.ushell.Container.getRenderer("fiori2")[sAPI](
+        Container.getRendererInternal("fiori2")[sAPI](
             "sap.ushell.ui.shell.ShellHeadItem",
             {
                 id: oServiceParams.oMessageData.body.sId,
@@ -1630,7 +1824,7 @@ sap.ui.define([
      * @private
      */
     PostMessageAPI.prototype.registerAsyncDirtyStateProvider = function (oServiceParams) {
-        sap.ushell.Container.setAsyncDirtyStateProvider(function (oNavigationContext) {
+        Container.setAsyncDirtyStateProvider(function (oNavigationContext) {
             return new Promise(function (fnResolve) {
                 var backupTimer;
                 sap.ui.require(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"], function (PostMessageUtils) {
@@ -1639,11 +1833,11 @@ sap.ui.define([
                         "handleDirtyStateProvider",
                         { oNavigationContext: oNavigationContext },
                         true).then(function (oResponse) {
-                            if (backupTimer) {
-                                clearTimeout(backupTimer);
-                            }
-                            fnResolve(oResponse && oResponse.body && oResponse.body.result || false);
-                        });
+                        if (backupTimer) {
+                            clearTimeout(backupTimer);
+                        }
+                        fnResolve(oResponse && oResponse.body && oResponse.body.result || false);
+                    });
                     //safety check in case post message does not get result
                     backupTimer = setTimeout(function () {
                         fnResolve(false);
@@ -1657,48 +1851,45 @@ sap.ui.define([
      * @private
      */
     PostMessageAPI.prototype.deregisterAsyncDirtyStateProvider = function (oServiceParams) {
-        sap.ushell.Container.setAsyncDirtyStateProvider(undefined);
+        Container.setAsyncDirtyStateProvider(undefined);
     };
 
     /**
      * @private
      */
-    PostMessageAPI.prototype._sendEmail = function (sTo, sSubject, sBody, sCc, sBcc, sIFrameURL, bSetAppStateToPublic) {
+    PostMessageAPI.prototype._sendEmail = async function (sTo = "", sSubject = "", sBody = "", sCc = "", sBcc = "", sIFrameURL, bSetAppStateToPublic) {
         var sFLPUrl = (this._getBrowserURL && this._getBrowserURL()) || document.URL;
 
         function replaceIframeUrlToFLPUrl (sIFrameURL1, sFLPUrl1, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew) {
             //replace iframe url with flp url
-            sSubject = sSubject && sSubject.includes(sIFrameURL1) ? sSubject.replace(sIFrameURL1, sFLPUrl1) : sSubject;
-            sBody = sBody && sBody.includes(sIFrameURL1) ? sBody.replace(sIFrameURL1, sFLPUrl1) : sBody;
+            sSubject = sSubject.includes(sIFrameURL1) ? sSubject.replace(sIFrameURL1, sFLPUrl1) : sSubject;
+            sBody = sBody.includes(sIFrameURL1) ? sBody.replace(sIFrameURL1, sFLPUrl1) : sBody;
 
             //for cases where we do not find iframe url, replace the app state keys
-            sSubject = sSubject && sXStateKey && sXStateKeyNew && sSubject.includes(sXStateKey) ? sSubject.replace(sXStateKey, sXStateKeyNew) : sSubject;
-            sSubject = sSubject && sIStateKey && sIStateKeyNew && sSubject.includes(sIStateKey) ? sSubject.replace(sIStateKey, sIStateKeyNew) : sSubject;
-            sBody = sBody && sXStateKey && sXStateKeyNew && sBody.includes(sXStateKey) ? sBody.replace(sXStateKey, sXStateKeyNew) : sBody;
-            sBody = sBody && sIStateKey && sIStateKeyNew && sBody.includes(sIStateKey) ? sBody.replace(sIStateKey, sIStateKeyNew) : sBody;
+            if (sXStateKey && sXStateKeyNew) {
+                sSubject = sSubject.includes(sXStateKey) ? sSubject.replace(sXStateKey, sXStateKeyNew) : sSubject;
+                sSubject = sSubject.includes(sIStateKey) ? sSubject.replace(sIStateKey, sIStateKeyNew) : sSubject;
+                sBody = sBody.includes(sXStateKey) ? sBody.replace(sXStateKey, sXStateKeyNew) : sBody;
+                sBody = sBody.includes(sIStateKey) ? sBody.replace(sIStateKey, sIStateKeyNew) : sBody;
+            }
         }
 
         if (bSetAppStateToPublic) {
-            sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
-                oAppStateService.setAppStateToPublic(sIFrameURL)
-                    .done(function (sNewURL, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew) {
-                        if (sXStateKeyNew !== undefined) {
-                            sFLPUrl = sFLPUrl.replace(sXStateKey, sXStateKeyNew);
-                        }
-                        if (sIStateKeyNew !== undefined) {
-                            sFLPUrl = sFLPUrl.replace(sIStateKey, sIStateKeyNew);
-                        }
-                        //check if the subject or the body of the email contain the IFrame URL
-                        replaceIframeUrlToFLPUrl(sIFrameURL, sFLPUrl, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew);
-                        // Send the email
-                        URLHelper.triggerEmail(sTo, sSubject, sBody, sCc, sBcc);
-                    })
-                    .fail(Log.error);
-            });
+            const oAppStateService = await Container.getServiceAsync("AppState");
+            oAppStateService.setAppStateToPublic(sIFrameURL).then((sNewURL, sXStateKey, sIStateKey, sXStateKeyNew = "", sIStateKeyNew = "") => {
+                if (sXStateKeyNew) {
+                    sFLPUrl = sFLPUrl.replace(sXStateKey, sXStateKeyNew);
+                }
+                if (sIStateKeyNew) {
+                    sFLPUrl = sFLPUrl.replace(sIStateKey, sIStateKeyNew);
+                }
+                //check if the subject or the body of the email contain the IFrame URL
+                replaceIframeUrlToFLPUrl(sIFrameURL, sFLPUrl, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew);
+                URLHelper.triggerEmail(sTo, sSubject, sBody, sCc, sBcc);
+            }, Log.error);
         } else {
             //check if the subject or the body of the email contain the IFrame URL
             replaceIframeUrlToFLPUrl(sIFrameURL, sFLPUrl);
-            //Send the email
             URLHelper.triggerEmail(sTo, sSubject, sBody, sCc, sBcc);
         }
     };
@@ -1747,7 +1938,7 @@ sap.ui.define([
      *   a string identifying the origin where the message is sent from
      */
     PostMessageAPI.prototype._backButtonPressedCallback = function (oSourceWindow, sServiceName, sOrigin) {
-        var sRequestData = JSON.stringify({
+        const sRequestData = JSON.stringify({
             type: "request",
             service: sServiceName,
             request_id: fnGetUid(),