@microsoft/teams-js 2.20.0-beta.4 → 2.20.1-beta.0

package/dist/MicrosoftTeams.js

@@ -969,14 +969,12 @@ function isFollowingApiVersionTagFormat(apiVersionTag) {
 }
 /**
  * Use enum to set or update API version number
- * Note: V_0 = 'v0' is used for APIs who needs to be passed with correct version number
- * but haven't been implemented yet.
+ * v3 will be used for next beta version of APIs if they have used v2
  * @internal
  * Limited to Microsoft-internal use
  */
 var ApiVersionNumber;
 (function (ApiVersionNumber) {
-    ApiVersionNumber["V_0"] = "v0";
     ApiVersionNumber["V_1"] = "v1";
     ApiVersionNumber["V_2"] = "v2";
     ApiVersionNumber["V_3"] = "v3";
@@ -1001,6 +999,15 @@ var ApiName;
     ApiName["AppWindow_ChildAppWindow_PostMessage"] = "appWindow.childAppWindow.postMessage";
     ApiName["AppWindow_ParentAppWindow_AddEventListener"] = "appWindow.parentAppWindow.addEventListener";
     ApiName["AppWindow_ParentAppWindow_PostMessage"] = "appWindow.parentAppWindow.postMessage";
+    ApiName["Authentication_AuthenticationWindow_RegisterInitializeHandler"] = "authentication.authenticationWindow.registerInitializeHandler";
+    ApiName["Authentication_AuthenticationWindow_RegisterNavigateCrossDomainHandler"] = "authentication.authenticationWindow.registerNavigateCrossDomainHandler";
+    ApiName["Authentication_Authenticate"] = "authentication.authenticate";
+    ApiName["Authentication_GetAuthToken"] = "authentication.getAuthToken";
+    ApiName["Authentication_GetUser"] = "authentication.getUser";
+    ApiName["Authentication_NotifyFailure"] = "authentication.notifyFailure";
+    ApiName["Authentication_NotifySuccess"] = "authentication.notifySuccess";
+    ApiName["Authentication_RegisterAuthenticateFailureHandler"] = "authentication.registerAuthenticateFailureHandler";
+    ApiName["Authentication_RegisterAuthenticateSuccessHandler"] = "authentication.registerAuthenticateSuccessHandler";
     ApiName["BarCode_HasPermission"] = "barCode.hasPermission";
     ApiName["BarCode_RequestPermission"] = "barCode.requestPermission";
     ApiName["BarCode_ScanBarCode"] = "barCode.scanBarCode";
@@ -1018,12 +1025,21 @@ var ApiName;
     ApiName["Conversations_RegisterStartConversationHandler"] = "conversations.registerStartConversationHandler";
     ApiName["Dialog_AdaptiveCard_Bot_Open"] = "dialog.adaptiveCard.bot.open";
     ApiName["Dialog_AdaptiveCard_Open"] = "dialog.adaptiveCard.open";
+    ApiName["Dialog_RegisterMessageForChildHandler"] = "dialog.registerMessageForChildHandler";
     ApiName["Dialog_Update_Resize"] = "dialog.update.resize";
     ApiName["Dialog_Url_Bot_Open"] = "dialog.url.bot.open";
+    ApiName["Dialog_Url_Bot_RegisterMessageForParentHandler"] = "dialog.url.bot.registerMessageForParentHandler";
     ApiName["Dialog_Url_Open"] = "dialog.url.open";
+    ApiName["Dialog_Url_RegisterMessageForParentHandler"] = "dialog.url.registerMessageForParentHandler";
     ApiName["Dialog_Url_Submit"] = "dialog.url.submit";
+    ApiName["Dialog_Url_ParentCommunication_RegisterMessageForChildHandler"] = "dialog.url.parentCommunication.registerMessageForChildHandler";
     ApiName["Dialog_Url_ParentCommunication_SendMessageToParentFromDialog"] = "dialog.url.parentCommunication.sendMessageToParentFromDialog";
     ApiName["Dialog_Url_ParentCommunication_SendMessageToDialog"] = "dialog.url.parentCommunication.sendMessageToDialog";
+    ApiName["ExternalAppAuthentication_AuthenticateAndResendRequest"] = "externalAppAuthentication.authenticateAndResendRequest";
+    ApiName["ExternalAppAuthentication_AuthenticateWithSSO"] = "externalAppAuthentication.authenticateWithSSO";
+    ApiName["ExternalAppAuthentication_AuthenticateWithSSOAndResendRequest"] = "externalAppAuthentication.authenticateWithSSOAndResendRequest";
+    ApiName["ExternalAppCardActions_ProcessActionOpenUrl"] = "externalAppCardActions.processActionOpenUrl";
+    ApiName["ExternalAppCardActions_ProcessActionSubmit"] = "externalAppCardActions.processActionSubmit";
     ApiName["Files_AddCloudStorageFolder"] = "files.addCloudStorageFolder";
     ApiName["Files_AddCloudStorageProvider"] = "files.addCloudStorageProvider";
     ApiName["Files_AddCloudStorageProviderFile"] = "files.addCloudStorageProviderFile";
@@ -1047,6 +1063,7 @@ var ApiName;
     ApiName["GeoLocation_Map_ChooseLocation"] = "geoLocation.map.chooseLocation";
     ApiName["GeoLocation_RequestPermission"] = "geoLocation.requestPermission";
     ApiName["GeoLocation_ShowLocation"] = "geoLocation.showLocation";
+    ApiName["HandleBeforeUnload"] = "handleBeforeUnload";
     ApiName["Interactive_GetClientInfo"] = "interactive.getClientInfo";
     ApiName["Interactive_GetClientRoles"] = "interactive.getClientRoles";
     ApiName["Interactive_GetFluidContainerId"] = "interactive.getFluidContainerId";
@@ -1069,6 +1086,7 @@ var ApiName;
     ApiName["Media_Controller"] = "media.controller";
     ApiName["Media_GetMedia"] = "media.getMedia";
     ApiName["Media_HasPermission"] = "media.hasPermission";
+    ApiName["Media_RegisterGetMediaRequestHandler"] = "media.registerGetMediaRequestHandler";
     ApiName["Media_RequestPermission"] = "media.requestPermission";
     ApiName["Media_ScanBarCode"] = "media.scanBarCode";
     ApiName["Media_SelectMedia"] = "media.selectMedia";
@@ -1118,13 +1136,17 @@ var ApiName;
     ApiName["Pages_AppButton_OnHoverLeave"] = "pages.appButton.onHoverLeave";
     ApiName["Pages_BackStack_NavigateBack"] = "pages.backStack.navigateBack";
     ApiName["Pages_BackStack_RegisterBackButtonHandler"] = "pages.backStack.registerBackButtonHandler";
+    ApiName["Pages_BackStack_RegisterBackButtonPressHandler"] = "pages.backStack.registerBackButtonPressHandler";
     ApiName["Pages_Config_RegisterChangeConfigHandler"] = "pages.config.registerChangeConfigHandler";
     ApiName["Pages_Config_RegisterOnRemoveHandler"] = "pages.config.registerOnRemoveHandler";
     ApiName["Pages_Config_RegisterOnSaveHandler"] = "pages.config.registerOnSaveHandler";
+    ApiName["Pages_Config_RegisterSettingsRemoveHandler"] = "pages.config.registerSettingsRemoveHandler";
+    ApiName["Pages_Config_RegisterSettingsSaveHandler"] = "pages.config.registerSettingsSaveHandler";
     ApiName["Pages_Config_SetConfig"] = "pages.config.setConfig";
     ApiName["Pages_Config_SetValidityState"] = "pages.config.setValidityState";
     ApiName["Pages_CurrentApp_NavigateTo"] = "pages.currentApp.navigateTo";
     ApiName["Pages_CurrentApp_NavigateToDefaultPage"] = "pages.currentApp.navigateToDefaultPage";
+    ApiName["Pages_InitializeWithFrameContext"] = "pages.initializeWithFrameContext";
     ApiName["Pages_FullTrust_EnterFullscreen"] = "pages.fullTrust.enterFullscreen";
     ApiName["Pages_FullTrust_ExitFullscreen"] = "pages.fullTrust.exitFullscreen";
     ApiName["Pages_GetConfig"] = "pages.getConfig.";
@@ -1154,10 +1176,12 @@ var ApiName;
     ApiName["PublicAPIs_GetMruTabInstances"] = "getMruTabInstances";
     ApiName["PublicAPIs_GetTabInstances"] = "getTabInstances";
     ApiName["PublicAPIs_Initialize"] = "initialize";
+    ApiName["PublicAPIs_InitializeWithFrameContext"] = "initializeWithFrameContext";
     ApiName["PublicAPIs_RegisterAppButtonClickHandler"] = "registerAppButtonClickHandler";
     ApiName["PublicAPIs_RegisterAppButtonHoverEnterHandler"] = "registerAppButtonHoverEnterHandler";
     ApiName["PublicAPIs_RegisterAppButtonHoverLeaveHandler"] = "registerAppButtonHoverLeaveHandler";
     ApiName["PublicAPIs_RegisterBackButtonHandler"] = "registerBackButtonHandler";
+    ApiName["PublicAPIs_RegisterBeforeUnloadHandler"] = "registerBeforeUnloadHandler";
     ApiName["PublicAPIs_RegisterChangeSettingsHandler"] = "registerChangeSettingsHandler";
     ApiName["PublicAPIs_RegisterFocusEnterHandler"] = "registerFocusEnterHandler";
     ApiName["PublicAPIs_RegisterFullScreenHandler"] = "registerFullScreenHandler";
@@ -1165,9 +1189,9 @@ var ApiName;
     ApiName["PublicAPIs_RegisterOnThemeChangeHandlerHelper"] = "registerOnThemeChangeHandlerHelper";
     ApiName["PublicAPIs_SetFrameContext"] = "setFrameContext";
     ApiName["PublicAPIs_ShareDeepLink"] = "shareDeepLink";
+    ApiName["RegisterBeforeSuspendOrTerminateHandler"] = "registerBeforeSuspendOrTerminateHandler";
     ApiName["RegisterHandler"] = "registerHandler";
-    ApiName["RegisterBeforeUnloadHandler"] = "registerBeforeUnloadHandler";
-    ApiName["RegisterLoadHandler"] = "registerLoadHandler";
+    ApiName["RegisterOnResumeHandler"] = "registerOnResumeHandler";
     ApiName["RegisterOnThemeChangeHandler"] = "registerOnThemeChangeHandler";
     ApiName["RemoteCamera_GetCapableParticipants"] = "remoteCamera.getCapableParticipants";
     ApiName["RemoteCamera_RegisterOnCapableParticipantsChangeHandler"] = "remoteCamera.registerOnCapableParticipantsChangeHandler";
@@ -1192,6 +1216,7 @@ var ApiName;
     ApiName["Settings_Save_Success"] = "settings.save.success";
     ApiName["Settings_SetSettings"] = "settings.setSettings";
     ApiName["Settings_SetValidityState"] = "settings.setValidityState";
+    ApiName["Sharing_ShareWebContent"] = "sharing.shareWebContent";
     ApiName["StageView_Open"] = "stageView.open";
     ApiName["Tasks_StartTask"] = "tasks.startTask";
     ApiName["Tasks_SubmitTask"] = "tasks.submitTask";
@@ -1200,6 +1225,9 @@ var ApiName;
     ApiName["Teams_FullTrust_JoinedTeams_GetUserJoinedTeams"] = "teams.fullTrust.joinedTeams.getUserJoinedTeams";
     ApiName["Teams_GetTeamChannels"] = "teams.getTeamChannels";
     ApiName["Teams_RefreshSiteUrl"] = "teams.refreshSiteUrl";
+    ApiName["TeamsAPIs_RegisterBeforeUnloadHandler"] = "teamsAPIs_registerBeforeUnloadHandler";
+    ApiName["TeamsAPIs_RegisterOnLoadHandler"] = "teamsAPIs_registerOnLoadHandler";
+    ApiName["ThirdPartyCloudStorage_GetDragAndDropFiles"] = "thirdPartyCloudStorage.getDragAndDropFiles";
     ApiName["VideoEffects_MediaStream_RegisterForVideoFrame"] = "videoEffects.mediaStream.registerForVideoFrame";
     ApiName["VideoEffects_NotifySelectedVideoEffectChanged"] = "videoEffects.notifySelectedVideoEffectChanged";
     ApiName["VideoEffects_NotifyError"] = "videoEffects.notifyError";
@@ -1520,7 +1548,7 @@ var ActionObjectType;
 })(ActionObjectType || (ActionObjectType = {}));
 /**
  * These correspond with field names in the MSGraph.
- * See (commonly accessed resources)[https://learn.microsoft.com/en-us/graph/api/resources/onedrive?view=graph-rest-1.0#commonly-accessed-resources].
+ * See [commonly accessed resources](https://learn.microsoft.com/graph/api/resources/onedrive?view=graph-rest-1.0#commonly-accessed-resources).
  * @beta
  */
 var SecondaryM365ContentIdName;
@@ -2213,7 +2241,7 @@ function isRuntimeInitialized(runtime) {
         throw new Error(errorRuntimeNotSupported);
     }
 }
-let runtime_runtime = _uninitializedRuntime;
+let runtime = _uninitializedRuntime;
 const versionAndPlatformAgnosticTeamsRuntimeConfig = {
     apiVersion: 4,
     hostVersionsInfo: teamsMinAdaptiveCardVersion,
@@ -2487,10 +2515,10 @@ function applyRuntimeConfig(runtimeConfig) {
     applyRuntimeConfigLogger('Fast-forwarding runtime %o', runtimeConfig);
     const ffRuntimeConfig = fastForwardRuntime(runtimeConfig);
     applyRuntimeConfigLogger('Applying runtime %o', ffRuntimeConfig);
-    runtime_runtime = utils_deepFreeze(ffRuntimeConfig);
+    runtime = utils_deepFreeze(ffRuntimeConfig);
 }
 function setUnitializedRuntime() {
-    runtime_runtime = deepFreeze(_uninitializedRuntime);
+    runtime = deepFreeze(_uninitializedRuntime);
 }
 /**
  * @hidden
@@ -2520,7 +2548,7 @@ const _minRuntimeConfigToUninitialize = {
  * @hidden
  *  Package version.
  */
-const version = "2.20.0-beta.4";
+const version = "2.20.1-beta.0";
 
 ;// CONCATENATED MODULE: ./src/internal/internalAPIs.ts
 
@@ -2559,7 +2587,7 @@ function ensureInitializeCalled() {
  * @internal
  * Limited to Microsoft-internal use
  */
-function internalAPIs_ensureInitialized(runtime, ...expectedFrameContexts) {
+function ensureInitialized(runtime, ...expectedFrameContexts) {
     // This global var can potentially be removed in the future if we use the initialization status of the runtime object as our source of truth
     if (!GlobalVars.initializeCompleted) {
         ensureInitializedLogger('%s. initializeCalled: %s', errorLibraryNotInitialized, GlobalVars.initializeCalled.toString());
@@ -2794,11 +2822,17 @@ function validateOrigin(messageOrigin) {
 
 
 
+
 /**
  * Namespace to interact with the authentication-specific part of the SDK.
  *
  * This object is used for starting or completing authentication flows.
  */
+/**
+ * Exceptional APIs telemetry versioning file: v1 and v2 APIs are mixed together in this file
+ */
+const authenticationTelemetryVersionNumber_v1 = ApiVersionNumber.V_1;
+const authenticationTelemetryVersionNumber_v2 = ApiVersionNumber.V_2;
 var authentication;
 (function (authentication) {
     let authHandlers;
@@ -2809,8 +2843,8 @@ var authentication;
      * Limited to Microsoft-internal use; automatically called when library is initialized
      */
     function initialize() {
-        registerHandler('authentication.authenticate.success', handleSuccess, false);
-        registerHandler('authentication.authenticate.failure', handleFailure, false);
+        registerHandler(getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_RegisterAuthenticateSuccessHandler), 'authentication.authenticate.success', handleSuccess, false);
+        registerHandler(getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_RegisterAuthenticateFailureHandler), 'authentication.authenticate.failure', handleFailure, false);
     }
     authentication.initialize = initialize;
     let authParams;
@@ -2834,8 +2868,11 @@ var authentication;
         if (!authenticateParams) {
             throw new Error('No parameters are provided for authentication');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.remove, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
-        return authenticateHelper(authenticateParams)
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.remove, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+        const apiVersionTag = authenticateParams.successCallback || authenticateParams.failureCallback
+            ? getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_Authenticate)
+            : getApiVersionTag(authenticationTelemetryVersionNumber_v2, ApiName.Authentication_Authenticate);
+        return authenticateHelper(apiVersionTag, authenticateParams)
             .then((value) => {
             try {
                 if (authenticateParams && authenticateParams.successCallback) {
@@ -2866,7 +2903,7 @@ var authentication;
         });
     }
     authentication.authenticate = authenticate;
-    function authenticateHelper(authenticateParameters) {
+    function authenticateHelper(apiVersionTag, authenticateParameters) {
         return new Promise((resolve, reject) => {
             if (GlobalVars.hostClientType === HostClientType.desktop ||
                 GlobalVars.hostClientType === HostClientType.android ||
@@ -2883,7 +2920,7 @@ var authentication;
                 const link = document.createElement('a');
                 link.href = authenticateParameters.url;
                 // Ask the parent window to open an authentication window with the parameters provided by the caller.
-                resolve(sendMessageToParentAsync('authentication.authenticate', [
+                resolve(sendMessageToParentAsync(apiVersionTag, 'authentication.authenticate', [
                     link.href,
                     authenticateParameters.width,
                     authenticateParameters.height,
@@ -2909,7 +2946,10 @@ var authentication;
     }
     function getAuthToken(authTokenRequest) {
         ensureInitializeCalled();
-        return getAuthTokenHelper(authTokenRequest)
+        const apiVersionTag = authTokenRequest && (authTokenRequest.successCallback || authTokenRequest.failureCallback)
+            ? getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_GetAuthToken)
+            : getApiVersionTag(authenticationTelemetryVersionNumber_v2, ApiName.Authentication_GetAuthToken);
+        return getAuthTokenHelper(apiVersionTag, authTokenRequest)
             .then((value) => {
             if (authTokenRequest && authTokenRequest.successCallback) {
                 authTokenRequest.successCallback(value);
@@ -2926,9 +2966,9 @@ var authentication;
         });
     }
     authentication.getAuthToken = getAuthToken;
-    function getAuthTokenHelper(authTokenRequest) {
+    function getAuthTokenHelper(apiVersionTag, authTokenRequest) {
         return new Promise((resolve) => {
-            resolve(sendMessageToParentAsync('authentication.getAuthToken', [
+            resolve(sendMessageToParentAsync(apiVersionTag, 'authentication.getAuthToken', [
                 authTokenRequest === null || authTokenRequest === void 0 ? void 0 : authTokenRequest.resources,
                 authTokenRequest === null || authTokenRequest === void 0 ? void 0 : authTokenRequest.claims,
                 authTokenRequest === null || authTokenRequest === void 0 ? void 0 : authTokenRequest.silent,
@@ -2945,7 +2985,10 @@ var authentication;
     }
     function getUser(userRequest) {
         ensureInitializeCalled();
-        return getUserHelper()
+        const apiVersionTag = userRequest && (userRequest.successCallback || userRequest.failureCallback)
+            ? getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_GetUser)
+            : getApiVersionTag(authenticationTelemetryVersionNumber_v2, ApiName.Authentication_GetUser);
+        return getUserHelper(apiVersionTag)
             .then((value) => {
             if (userRequest && userRequest.successCallback) {
                 userRequest.successCallback(value);
@@ -2962,9 +3005,9 @@ var authentication;
         });
     }
     authentication.getUser = getUser;
-    function getUserHelper() {
+    function getUserHelper(apiVersionTag) {
         return new Promise((resolve) => {
-            resolve(sendMessageToParentAsync('authentication.getUser'));
+            resolve(sendMessageToParentAsync(apiVersionTag, 'authentication.getUser'));
         }).then(([success, result]) => {
             if (success) {
                 return result;
@@ -3059,14 +3102,14 @@ var authentication;
             }
         }, 100);
         // Set up an initialize-message handler that gives the authentication window its frame context
-        registerHandler('initialize', () => {
+        registerHandler(getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_AuthenticationWindow_RegisterInitializeHandler), 'initialize', () => {
             return [FrameContexts.authentication, GlobalVars.hostClientType];
         });
         // Set up a navigateCrossDomain message handler that blocks cross-domain re-navigation attempts
         // in the authentication window. We could at some point choose to implement this method via a call to
         // authenticationWindow.location.href = url; however, we would first need to figure out how to
         // validate the URL against the tab's list of valid domains.
-        registerHandler('navigateCrossDomain', () => {
+        registerHandler(getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_AuthenticationWindow_RegisterNavigateCrossDomainHandler), 'navigateCrossDomain', () => {
             return false;
         });
     }
@@ -3076,8 +3119,11 @@ var authentication;
      * Please use the {@link authentication.notifySuccess authentication.notifySuccess(result?: string): void} instead.
      */
     function notifySuccess(result, _callbackUrl) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.authentication);
-        sendMessageToParent('authentication.authenticate.success', [result]);
+        ensureInitialized(runtime, FrameContexts.authentication);
+        const apiVersionTag = _callbackUrl
+            ? getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_NotifySuccess)
+            : getApiVersionTag(authenticationTelemetryVersionNumber_v2, ApiName.Authentication_NotifySuccess);
+        sendMessageToParent(apiVersionTag, 'authentication.authenticate.success', [result]);
         // Wait for the message to be sent before closing the window
         waitForMessageQueue(Communication.parentWindow, () => setTimeout(() => Communication.currentWindow.close(), 200));
     }
@@ -3088,8 +3134,11 @@ var authentication;
      * Please use the {@link authentication.notifyFailure authentication.notifyFailure(result?: string): void} instead.
      */
     function notifyFailure(reason, _callbackUrl) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.authentication);
-        sendMessageToParent('authentication.authenticate.failure', [reason]);
+        ensureInitialized(runtime, FrameContexts.authentication);
+        const apiVersionTag = _callbackUrl
+            ? getApiVersionTag(authenticationTelemetryVersionNumber_v1, ApiName.Authentication_NotifyFailure)
+            : getApiVersionTag(authenticationTelemetryVersionNumber_v2, ApiName.Authentication_NotifyFailure);
+        sendMessageToParent(apiVersionTag, 'authentication.authenticate.failure', [reason]);
         // Wait for the message to be sent before closing the window
         waitForMessageQueue(Communication.parentWindow, () => setTimeout(() => Communication.currentWindow.close(), 200));
     }
@@ -3157,36 +3206,36 @@ var authentication;
  */
 const dialogTelemetryVersionNumber = ApiVersionNumber.V_2;
 function updateResizeHelper(apiVersionTag, dimensions) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.task, FrameContexts.meetingStage);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.task, FrameContexts.meetingStage);
     if (!dialog.update.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
-    sendMessageToParentWithVersion(apiVersionTag, 'tasks.updateTask', [dimensions]);
+    sendMessageToParent(apiVersionTag, 'tasks.updateTask', [dimensions]);
 }
 function urlOpenHelper(apiVersionTag, urlDialogInfo, submitHandler, messageFromChildHandler) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
     if (!dialog.url.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
     if (messageFromChildHandler) {
-        registerHandler('messageForParent', messageFromChildHandler);
+        registerHandler(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_RegisterMessageForParentHandler), 'messageForParent', messageFromChildHandler);
     }
     const dialogInfo = dialog.url.getDialogInfoFromUrlDialogInfo(urlDialogInfo);
-    sendMessageToParentWithVersion(apiVersionTag, 'tasks.startTask', [dialogInfo], (err, result) => {
+    sendMessageToParent(apiVersionTag, 'tasks.startTask', [dialogInfo], (err, result) => {
         submitHandler === null || submitHandler === void 0 ? void 0 : submitHandler({ err, result });
         removeHandler('messageForParent');
     });
 }
 function botUrlOpenHelper(apiVersionTag, urlDialogInfo, submitHandler, messageFromChildHandler) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
     if (!dialog.url.bot.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
     if (messageFromChildHandler) {
-        registerHandler('messageForParent', messageFromChildHandler);
+        registerHandler(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_Bot_RegisterMessageForParentHandler), 'messageForParent', messageFromChildHandler);
     }
     const dialogInfo = dialog.url.getDialogInfoFromBotUrlDialogInfo(urlDialogInfo);
-    sendMessageToParentWithVersion(apiVersionTag, 'tasks.startTask', [dialogInfo], (err, result) => {
+    sendMessageToParent(apiVersionTag, 'tasks.startTask', [dialogInfo], (err, result) => {
         submitHandler === null || submitHandler === void 0 ? void 0 : submitHandler({ err, result });
         removeHandler('messageForParent');
     });
@@ -3195,12 +3244,12 @@ function urlSubmitHelper(apiVersionTag, result, appIds) {
     // FrameContext content should not be here because dialog.submit can be called only from inside of a dialog (FrameContext task)
     // but it's here because Teams mobile incorrectly returns FrameContext.content when calling app.getFrameContext().
     // FrameContexts.content will be removed once the bug is fixed.
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
     if (!dialog.url.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
     // Send tasks.completeTask instead of tasks.submitTask message for backward compatibility with Mobile clients
-    sendMessageToParentWithVersion(apiVersionTag, 'tasks.completeTask', [
+    sendMessageToParent(apiVersionTag, 'tasks.completeTask', [
         result,
         appIds ? (Array.isArray(appIds) ? appIds : [appIds]) : [],
     ]);
@@ -3233,7 +3282,7 @@ var dialog;
      * @beta
      */
     function initialize() {
-        registerHandler('messageForChild', handleDialogMessage, false);
+        registerHandler(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_RegisterMessageForChildHandler), 'messageForChild', handleDialogMessage, false);
     }
     dialog.initialize = initialize;
     function handleDialogMessage(message) {
@@ -3307,11 +3356,11 @@ var dialog;
             function sendMessageToParentFromDialog(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             message) {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.task);
+                ensureInitialized(runtime, FrameContexts.task);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
-                sendMessageToParentWithVersion(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_ParentCommunication_SendMessageToParentFromDialog), 'messageForParent', [message]);
+                sendMessageToParent(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_ParentCommunication_SendMessageToParentFromDialog), 'messageForParent', [message]);
             }
             parentCommunication.sendMessageToParentFromDialog = sendMessageToParentFromDialog;
             /**
@@ -3324,11 +3373,11 @@ var dialog;
             function sendMessageToDialog(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             message) {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
-                sendMessageToParentWithVersion(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_ParentCommunication_SendMessageToDialog), 'messageForChild', [message]);
+                sendMessageToParent(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_ParentCommunication_SendMessageToDialog), 'messageForChild', [message]);
             }
             parentCommunication.sendMessageToDialog = sendMessageToDialog;
             /**
@@ -3342,7 +3391,7 @@ var dialog;
              * @beta
              */
             function registerOnMessageFromParent(listener) {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.task);
+                ensureInitialized(runtime, FrameContexts.task);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
@@ -3350,7 +3399,7 @@ var dialog;
                 // handler since the original does not allow for post messages.
                 // It is replaced by the user specified listener that is passed in.
                 removeHandler('messageForChild');
-                registerHandler('messageForChild', listener);
+                registerHandler(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_Url_ParentCommunication_RegisterMessageForChildHandler), 'messageForChild', listener);
                 storedMessages.reverse();
                 while (storedMessages.length > 0) {
                     const message = storedMessages.pop();
@@ -3369,7 +3418,7 @@ var dialog;
              */
             function isSupported() {
                 var _a, _b;
-                return internalAPIs_ensureInitialized(runtime_runtime) && !!((_b = (_a = runtime_runtime.supports.dialog) === null || _a === void 0 ? void 0 : _a.url) === null || _b === void 0 ? void 0 : _b.parentCommunication);
+                return ensureInitialized(runtime) && !!((_b = (_a = runtime.supports.dialog) === null || _a === void 0 ? void 0 : _a.url) === null || _b === void 0 ? void 0 : _b.parentCommunication);
             }
             parentCommunication.isSupported = isSupported;
         })(parentCommunication = url.parentCommunication || (url.parentCommunication = {}));
@@ -3383,7 +3432,7 @@ var dialog;
          * @beta
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && (runtime_runtime.supports.dialog && runtime_runtime.supports.dialog.url) !== undefined;
+            return ensureInitialized(runtime) && (runtime.supports.dialog && runtime.supports.dialog.url) !== undefined;
         }
         url.isSupported = isSupported;
         /**
@@ -3418,8 +3467,8 @@ var dialog;
              * @beta
              */
             function isSupported() {
-                return (internalAPIs_ensureInitialized(runtime_runtime) &&
-                    (runtime_runtime.supports.dialog && runtime_runtime.supports.dialog.url && runtime_runtime.supports.dialog.url.bot) !== undefined);
+                return (ensureInitialized(runtime) &&
+                    (runtime.supports.dialog && runtime.supports.dialog.url && runtime.supports.dialog.url.bot) !== undefined);
             }
             bot.isSupported = isSupported;
         })(bot = url.bot || (url.bot = {}));
@@ -3465,7 +3514,7 @@ var dialog;
      * @hidden
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.dialog ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.dialog ? true : false;
     }
     dialog.isSupported = isSupported;
     /**
@@ -3495,8 +3544,8 @@ var dialog;
          * @beta
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.dialog
-                ? runtime_runtime.supports.dialog.update
+            return ensureInitialized(runtime) && runtime.supports.dialog
+                ? runtime.supports.dialog.update
                     ? true
                     : false
                 : false;
@@ -3521,12 +3570,12 @@ var dialog;
          * @beta
          */
         function open(adaptiveCardDialogInfo, submitHandler) {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
             const dialogInfo = getDialogInfoFromAdaptiveCardDialogInfo(adaptiveCardDialogInfo);
-            sendMessageToParentWithVersion(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_AdaptiveCard_Open), 'tasks.startTask', [dialogInfo], (err, result) => {
+            sendMessageToParent(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_AdaptiveCard_Open), 'tasks.startTask', [dialogInfo], (err, result) => {
                 submitHandler === null || submitHandler === void 0 ? void 0 : submitHandler({ err, result });
             });
         }
@@ -3541,11 +3590,11 @@ var dialog;
          * @beta
          */
         function isSupported() {
-            const isAdaptiveCardVersionSupported = runtime_runtime.hostVersionsInfo &&
-                runtime_runtime.hostVersionsInfo.adaptiveCardSchemaVersion &&
-                !isHostAdaptiveCardSchemaVersionUnsupported(runtime_runtime.hostVersionsInfo.adaptiveCardSchemaVersion);
-            return (internalAPIs_ensureInitialized(runtime_runtime) &&
-                (isAdaptiveCardVersionSupported && runtime_runtime.supports.dialog && runtime_runtime.supports.dialog.card) !== undefined);
+            const isAdaptiveCardVersionSupported = runtime.hostVersionsInfo &&
+                runtime.hostVersionsInfo.adaptiveCardSchemaVersion &&
+                !isHostAdaptiveCardSchemaVersionUnsupported(runtime.hostVersionsInfo.adaptiveCardSchemaVersion);
+            return (ensureInitialized(runtime) &&
+                (isAdaptiveCardVersionSupported && runtime.supports.dialog && runtime.supports.dialog.card) !== undefined);
         }
         adaptiveCard.isSupported = isSupported;
         /**
@@ -3564,12 +3613,12 @@ var dialog;
              * @beta
              */
             function open(botAdaptiveCardDialogInfo, submitHandler) {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
                 const dialogInfo = getDialogInfoFromBotAdaptiveCardDialogInfo(botAdaptiveCardDialogInfo);
-                sendMessageToParentWithVersion(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_AdaptiveCard_Bot_Open), 'tasks.startTask', [dialogInfo], (err, result) => {
+                sendMessageToParent(getApiVersionTag(dialogTelemetryVersionNumber, ApiName.Dialog_AdaptiveCard_Bot_Open), 'tasks.startTask', [dialogInfo], (err, result) => {
                     submitHandler === null || submitHandler === void 0 ? void 0 : submitHandler({ err, result });
                 });
             }
@@ -3584,14 +3633,14 @@ var dialog;
              * @beta
              */
             function isSupported() {
-                const isAdaptiveCardVersionSupported = runtime_runtime.hostVersionsInfo &&
-                    runtime_runtime.hostVersionsInfo.adaptiveCardSchemaVersion &&
-                    !isHostAdaptiveCardSchemaVersionUnsupported(runtime_runtime.hostVersionsInfo.adaptiveCardSchemaVersion);
-                return (internalAPIs_ensureInitialized(runtime_runtime) &&
+                const isAdaptiveCardVersionSupported = runtime.hostVersionsInfo &&
+                    runtime.hostVersionsInfo.adaptiveCardSchemaVersion &&
+                    !isHostAdaptiveCardSchemaVersionUnsupported(runtime.hostVersionsInfo.adaptiveCardSchemaVersion);
+                return (ensureInitialized(runtime) &&
                     (isAdaptiveCardVersionSupported &&
-                        runtime_runtime.supports.dialog &&
-                        runtime_runtime.supports.dialog.card &&
-                        runtime_runtime.supports.dialog.card.bot) !== undefined);
+                        runtime.supports.dialog &&
+                        runtime.supports.dialog.card &&
+                        runtime.supports.dialog.card.bot) !== undefined);
             }
             bot.isSupported = isSupported;
         })(bot = adaptiveCard.bot || (adaptiveCard.bot = {}));
@@ -3700,9 +3749,9 @@ var menus;
      * Limited to Microsoft-internal use.
      */
     function initialize() {
-        registerHandlerWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_RegisterNavBarMenuItemPressHandler), 'navBarMenuItemPress', handleNavBarMenuItemPress, false);
-        registerHandlerWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_RegisterActionMenuItemPressHandler), 'actionMenuItemPress', handleActionMenuItemPress, false);
-        registerHandlerWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_RegisterSetModuleViewHandler), 'setModuleView', handleViewConfigItemPress, false);
+        registerHandler(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_RegisterNavBarMenuItemPressHandler), 'navBarMenuItemPress', handleNavBarMenuItemPress, false);
+        registerHandler(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_RegisterActionMenuItemPressHandler), 'actionMenuItemPress', handleActionMenuItemPress, false);
+        registerHandler(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_RegisterSetModuleViewHandler), 'setModuleView', handleViewConfigItemPress, false);
     }
     menus.initialize = initialize;
     /**
@@ -3714,18 +3763,20 @@ var menus;
      * @param handler - The handler to invoke when the user selects view configuration.
      */
     function setUpViews(viewConfig, handler) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         viewConfigItemPressHandler = handler;
-        sendMessageToParentWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_SetUpViews), 'setUpViews', [viewConfig]);
+        sendMessageToParent(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_SetUpViews), 'setUpViews', [
+            viewConfig,
+        ]);
     }
     menus.setUpViews = setUpViews;
     function handleViewConfigItemPress(id) {
         if (!viewConfigItemPressHandler || !viewConfigItemPressHandler(id)) {
-            internalAPIs_ensureInitialized(runtime_runtime);
-            sendMessageToParentWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_HandleViewConfigItemPress), 'viewConfigItemPress', [id]);
+            ensureInitialized(runtime);
+            sendMessageToParent(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_HandleViewConfigItemPress), 'viewConfigItemPress', [id]);
         }
     }
     /**
@@ -3736,18 +3787,20 @@ var menus;
      * @param handler The handler to invoke when the user selects menu item.
      */
     function setNavBarMenu(items, handler) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         navBarMenuItemPressHandler = handler;
-        sendMessageToParentWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_SetNavBarMenu), 'setNavBarMenu', [items]);
+        sendMessageToParent(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_SetNavBarMenu), 'setNavBarMenu', [
+            items,
+        ]);
     }
     menus.setNavBarMenu = setNavBarMenu;
     function handleNavBarMenuItemPress(id) {
         if (!navBarMenuItemPressHandler || !navBarMenuItemPressHandler(id)) {
-            internalAPIs_ensureInitialized(runtime_runtime);
-            sendMessageToParentWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_HandleNavBarMenuItemPress), 'handleNavBarMenuItemPress', [id]);
+            ensureInitialized(runtime);
+            sendMessageToParent(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_HandleNavBarMenuItemPress), 'handleNavBarMenuItemPress', [id]);
         }
     }
     /**
@@ -3758,18 +3811,20 @@ var menus;
      * @param handler - The handler to invoke when the user selects menu item.
      */
     function showActionMenu(params, handler) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         actionMenuItemPressHandler = handler;
-        sendMessageToParentWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_ShowActionMenu), 'showActionMenu', [params]);
+        sendMessageToParent(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_ShowActionMenu), 'showActionMenu', [
+            params,
+        ]);
     }
     menus.showActionMenu = showActionMenu;
     function handleActionMenuItemPress(id) {
         if (!actionMenuItemPressHandler || !actionMenuItemPressHandler(id)) {
-            internalAPIs_ensureInitialized(runtime_runtime);
-            sendMessageToParentWithVersion(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_HandleActionMenuItemPress), 'handleActionMenuItemPress', [id]);
+            ensureInitialized(runtime);
+            sendMessageToParent(getApiVersionTag(menuTelemetryVersionNumber, ApiName.Menus_HandleActionMenuItemPress), 'handleActionMenuItemPress', [id]);
         }
     }
     /**
@@ -3779,7 +3834,7 @@ var menus;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.menus ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.menus ? true : false;
     }
     menus.isSupported = isSupported;
 })(menus || (menus = {}));
@@ -3827,22 +3882,22 @@ function appInitializeHelper(apiVersionTag, validMessageOrigins) {
     }
 }
 function notifyAppLoadedHelper(apiVersionTag) {
-    sendMessageToParentWithVersion(apiVersionTag, app.Messages.AppLoaded, [version]);
+    sendMessageToParent(apiVersionTag, app.Messages.AppLoaded, [version]);
 }
 function notifyExpectedFailureHelper(apiVersionTag, expectedFailureRequest) {
-    sendMessageToParentWithVersion(apiVersionTag, app.Messages.ExpectedFailure, [
+    sendMessageToParent(apiVersionTag, app.Messages.ExpectedFailure, [
         expectedFailureRequest.reason,
         expectedFailureRequest.message,
     ]);
 }
 function notifyFailureHelper(apiVersiontag, appInitializationFailedRequest) {
-    sendMessageToParentWithVersion(apiVersiontag, app.Messages.Failure, [
+    sendMessageToParent(apiVersiontag, app.Messages.Failure, [
         appInitializationFailedRequest.reason,
         appInitializationFailedRequest.message,
     ]);
 }
 function notifySuccessHelper(apiVersionTag) {
-    sendMessageToParentWithVersion(apiVersionTag, app.Messages.Success, [version]);
+    sendMessageToParent(apiVersionTag, app.Messages.Success, [version]);
 }
 const initializeHelperLogger = appLogger.extend('initializeHelper');
 function initializeHelper(apiVersionTag, validMessageOrigins) {
@@ -3935,8 +3990,8 @@ function registerOnThemeChangeHandlerHelper(apiVersionTag, handler) {
 }
 function openLinkHelper(apiVersionTag, deepLink) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
-        resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'executeDeepLink', deepLink));
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+        resolve(sendAndHandleStatusAndReason(apiVersionTag, 'executeDeepLink', deepLink));
     });
 }
 /**
@@ -4092,7 +4147,7 @@ var app;
     function getContext() {
         return new Promise((resolve) => {
             ensureInitializeCalled();
-            resolve(sendAndUnwrapWithVersion(getApiVersionTag(appTelemetryVersionNumber, ApiName.App_GetContext), 'getContext'));
+            resolve(sendAndUnwrap(getApiVersionTag(appTelemetryVersionNumber, ApiName.App_GetContext), 'getContext'));
         }).then((legacyContext) => transformLegacyContextToAppContext(legacyContext)); // converts globalcontext to app.context
     }
     app.getContext = getContext;
@@ -4178,7 +4233,7 @@ var app;
             if (!handler) {
                 throw new Error('[app.lifecycle.registerBeforeSuspendOrTerminateHandler] Handler cannot be null');
             }
-            internalAPIs_ensureInitialized(runtime_runtime);
+            ensureInitialized(runtime);
             handlers_registerBeforeSuspendOrTerminateHandler(handler);
         }
         lifecycle.registerBeforeSuspendOrTerminateHandler = registerBeforeSuspendOrTerminateHandler;
@@ -4194,7 +4249,7 @@ var app;
             if (!handler) {
                 throw new Error('[app.lifecycle.registerOnResumeHandler] Handler cannot be null');
             }
-            internalAPIs_ensureInitialized(runtime_runtime);
+            ensureInitialized(runtime);
             handlers_registerOnResumeHandler(handler);
         }
         lifecycle.registerOnResumeHandler = registerOnResumeHandler;
@@ -4314,108 +4369,109 @@ function transformLegacyContextToAppContext(legacyContext) {
 
 
 
+
 /**
  * v2 APIs telemetry file: All of APIs in this capability file should send out API version v2 ONLY
  */
 const pagesTelemetryVersionNumber = ApiVersionNumber.V_2;
 function navigateCrossDomainHelper(apiVersionTag, url) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.remove, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.remove, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
         if (!pages.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const errorMessage = 'Cross-origin navigation is only supported for URLs matching the pattern registered in the manifest.';
-        resolve(sendAndHandleStatusAndReasonWithDefaultErrorWithVersion(apiVersionTag, 'navigateCrossDomain', errorMessage, url));
+        resolve(sendAndHandleStatusAndReasonWithDefaultError(apiVersionTag, 'navigateCrossDomain', errorMessage, url));
     });
 }
 function backStackNavigateBackHelper(apiVersionTag) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!pages.backStack.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const errorMessage = 'Back navigation is not supported in the current client or context.';
-        resolve(sendAndHandleStatusAndReasonWithDefaultErrorWithVersion(apiVersionTag, 'navigateBack', errorMessage));
+        resolve(sendAndHandleStatusAndReasonWithDefaultError(apiVersionTag, 'navigateBack', errorMessage));
     });
 }
 function tabsNavigateToTabHelper(apiVersionTag, tabInstance) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!pages.tabs.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const errorMessage = 'Invalid internalTabInstanceId and/or channelId were/was provided';
-        resolve(sendAndHandleStatusAndReasonWithDefaultErrorWithVersion(apiVersionTag, 'navigateToTab', errorMessage, tabInstance));
+        resolve(sendAndHandleStatusAndReasonWithDefaultError(apiVersionTag, 'navigateToTab', errorMessage, tabInstance));
     });
 }
 function returnFocusHelper(apiVersionTag, navigateForward) {
-    internalAPIs_ensureInitialized(runtime_runtime);
+    ensureInitialized(runtime);
     if (!pages.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
-    sendMessageToParentWithVersion(apiVersionTag, 'returnFocus', [navigateForward]);
+    sendMessageToParent(apiVersionTag, 'returnFocus', [navigateForward]);
 }
 function getTabInstancesHelper(apiVersionTag, tabInstanceParameters) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!pages.tabs.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
-        resolve(sendAndUnwrapWithVersion(apiVersionTag, 'getTabInstances', tabInstanceParameters));
+        resolve(sendAndUnwrap(apiVersionTag, 'getTabInstances', tabInstanceParameters));
     });
 }
 function getMruTabInstancesHelper(apiVersionTag, tabInstanceParameters) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!pages.tabs.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
-        resolve(sendAndUnwrapWithVersion(apiVersionTag, 'getMruTabInstances', tabInstanceParameters));
+        resolve(sendAndUnwrap(apiVersionTag, 'getMruTabInstances', tabInstanceParameters));
     });
 }
 function shareDeepLinkHelper(apiVersionTag, deepLinkParameters) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
     if (!pages.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
-    sendMessageToParentWithVersion(apiVersionTag, 'shareDeepLink', [
+    sendMessageToParent(apiVersionTag, 'shareDeepLink', [
         deepLinkParameters.subPageId,
         deepLinkParameters.subPageLabel,
         deepLinkParameters.subPageWebUrl,
     ]);
 }
 function setCurrentFrameHelper(apiVersionTag, frameInfo) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+    ensureInitialized(runtime, FrameContexts.content);
     if (!pages.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
-    sendMessageToParentWithVersion(apiVersionTag, 'setFrameContext', [frameInfo]);
+    sendMessageToParent(apiVersionTag, 'setFrameContext', [frameInfo]);
 }
 function configSetValidityStateHelper(apiVersionTag, validityState) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.settings, FrameContexts.remove);
+    ensureInitialized(runtime, FrameContexts.settings, FrameContexts.remove);
     if (!pages.config.isSupported()) {
         throw errorNotSupportedOnPlatform;
     }
-    sendMessageToParentWithVersion(apiVersionTag, 'settings.setValidityState', [validityState]);
+    sendMessageToParent(apiVersionTag, 'settings.setValidityState', [validityState]);
 }
 function getConfigHelper(apiVersionTag) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.remove, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.remove, FrameContexts.sidePanel);
         if (!pages.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        resolve(sendAndUnwrapWithVersion(apiVersionTag, 'settings.getSettings'));
+        resolve(sendAndUnwrap(apiVersionTag, 'settings.getSettings'));
     });
 }
 function configSetConfigHelper(apiVersionTag, instanceConfig) {
     return new Promise((resolve) => {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.sidePanel);
         if (!pages.config.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'settings.setSettings', instanceConfig));
+        resolve(sendAndHandleStatusAndReason(apiVersionTag, 'settings.setSettings', instanceConfig));
     });
 }
 /**
@@ -4447,7 +4503,7 @@ var pages;
      * Limited to Microsoft-internal use
      */
     function registerFocusEnterHandler(handler) {
-        registerHandlerHelperWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RegisterFocusEnterHandler), 'focusEnter', handler, [], () => {
+        registerHandlerHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RegisterFocusEnterHandler), 'focusEnter', handler, [], () => {
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
@@ -4474,7 +4530,8 @@ var pages;
      * https: protocol otherwise they will be ignored. Example: https:www.example.com
      */
     function initializeWithFrameContext(frameInfo, callback, validMessageOrigins) {
-        app.initialize(validMessageOrigins).then(() => callback && callback());
+        prefetchOriginsFromCDN();
+        appInitializeHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_InitializeWithFrameContext), validMessageOrigins).then(() => callback && callback());
         setCurrentFrame(frameInfo);
     }
     pages.initializeWithFrameContext = initializeWithFrameContext;
@@ -4510,16 +4567,16 @@ var pages;
      */
     function navigateToApp(params) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
             const apiVersionTag = getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_NavigateCrossDomain);
-            if (runtime_runtime.isLegacyTeams) {
-                resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'executeDeepLink', createTeamsAppLink(params)));
+            if (runtime.isLegacyTeams) {
+                resolve(sendAndHandleStatusAndReason(apiVersionTag, 'executeDeepLink', createTeamsAppLink(params)));
             }
             else {
-                resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'pages.navigateToApp', params));
+                resolve(sendAndHandleStatusAndReason(apiVersionTag, 'pages.navigateToApp', params));
             }
         });
     }
@@ -4542,7 +4599,7 @@ var pages;
      * @param handler - The handler to invoke when the user toggles full-screen view for a tab.
      */
     function registerFullScreenHandler(handler) {
-        registerHandlerHelperWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RegisterFullScreenHandler), 'fullScreenChange', handler, [], () => {
+        registerHandlerHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RegisterFullScreenHandler), 'fullScreenChange', handler, [], () => {
             if (!isNullOrUndefined(handler) && !isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
@@ -4556,7 +4613,7 @@ var pages;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.pages ? true : false;
     }
     pages.isSupported = isSupported;
     /**
@@ -4600,8 +4657,8 @@ var pages;
          * @throws Error if {@linkcode app.initialize} has not successfully completed
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages
-                ? runtime_runtime.supports.pages.tabs
+            return ensureInitialized(runtime) && runtime.supports.pages
+                ? runtime.supports.pages.tabs
                     ? true
                     : false
                 : false;
@@ -4625,8 +4682,8 @@ var pages;
          * Limited to Microsoft-internal use
          */
         function initialize() {
-            registerHandler('settings.save', handleSave, false);
-            registerHandler('settings.remove', handleRemove, false);
+            registerHandler(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_Config_RegisterSettingsSaveHandler), 'settings.save', handleSave, false);
+            registerHandler(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_Config_RegisterSettingsRemoveHandler), 'settings.remove', handleRemove, false);
         }
         config.initialize = initialize;
         /**
@@ -4676,12 +4733,12 @@ var pages;
          */
         function registerOnSaveHandlerHelper(apiVersionTag, handler, versionSpecificHelper) {
             // allow for registration cleanup even when not finished initializing
-            !isNullOrUndefined(handler) && internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.settings);
+            !isNullOrUndefined(handler) && ensureInitialized(runtime, FrameContexts.settings);
             if (versionSpecificHelper) {
                 versionSpecificHelper();
             }
             saveHandler = handler;
-            !isNullOrUndefined(handler) && sendMessageToParentWithVersion(apiVersionTag, 'registerHandler', ['save']);
+            !isNullOrUndefined(handler) && sendMessageToParent(apiVersionTag, 'registerHandler', ['save']);
         }
         config.registerOnSaveHandlerHelper = registerOnSaveHandlerHelper;
         /**
@@ -4712,12 +4769,12 @@ var pages;
          */
         function registerOnRemoveHandlerHelper(apiVersionTag, handler, versionSpecificHelper) {
             // allow for registration cleanup even when not finished initializing
-            !isNullOrUndefined(handler) && internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.remove, FrameContexts.settings);
+            !isNullOrUndefined(handler) && ensureInitialized(runtime, FrameContexts.remove, FrameContexts.settings);
             if (versionSpecificHelper) {
                 versionSpecificHelper();
             }
             removeHandler = handler;
-            !isNullOrUndefined(handler) && sendMessageToParentWithVersion(apiVersionTag, 'registerHandler', ['remove']);
+            !isNullOrUndefined(handler) && sendMessageToParent(apiVersionTag, 'registerHandler', ['remove']);
         }
         config.registerOnRemoveHandlerHelper = registerOnRemoveHandlerHelper;
         function handleSave(result) {
@@ -4738,7 +4795,7 @@ var pages;
          * @param handler - The handler to invoke when the user clicks on Settings.
          */
         function registerChangeConfigHandler(handler) {
-            registerHandlerHelperWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_Config_RegisterChangeConfigHandler), 'changeSettings', handler, [FrameContexts.content], () => {
+            registerHandlerHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_Config_RegisterChangeConfigHandler), 'changeSettings', handler, [FrameContexts.content], () => {
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
@@ -4756,12 +4813,12 @@ var pages;
             }
             notifySuccess() {
                 this.ensureNotNotified();
-                sendMessageToParentWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_SaveEvent_NotifySuccess), 'settings.save.success');
+                sendMessageToParent(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_SaveEvent_NotifySuccess), 'settings.save.success');
                 this.notified = true;
             }
             notifyFailure(reason) {
                 this.ensureNotNotified();
-                sendMessageToParentWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_SaveEvent_NotifyFailure), 'settings.save.failure', [reason]);
+                sendMessageToParent(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_SaveEvent_NotifyFailure), 'settings.save.failure', [reason]);
                 this.notified = true;
             }
             ensureNotNotified() {
@@ -4793,12 +4850,12 @@ var pages;
             }
             notifySuccess() {
                 this.ensureNotNotified();
-                sendMessageToParentWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RemoveEvent_NotifySuccess), 'settings.remove.success');
+                sendMessageToParent(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RemoveEvent_NotifySuccess), 'settings.remove.success');
                 this.notified = true;
             }
             notifyFailure(reason) {
                 this.ensureNotNotified();
-                sendMessageToParentWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RemoveEvent_NotifyFailure), 'settings.remove.failure', [reason]);
+                sendMessageToParent(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_RemoveEvent_NotifyFailure), 'settings.remove.failure', [reason]);
                 this.notified = true;
             }
             ensureNotNotified() {
@@ -4814,8 +4871,8 @@ var pages;
          * @throws Error if {@linkcode app.initialize} has not successfully completed
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages
-                ? runtime_runtime.supports.pages.config
+            return ensureInitialized(runtime) && runtime.supports.pages
+                ? runtime.supports.pages.config
                     ? true
                     : false
                 : false;
@@ -4836,7 +4893,7 @@ var pages;
          * Limited to Microsoft-internal use.
          */
         function _initialize() {
-            registerHandler('backButtonPress', handleBackButtonPress, false);
+            registerHandler(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_BackStack_RegisterBackButtonPressHandler), 'backButtonPress', handleBackButtonPress, false);
         }
         backStack._initialize = _initialize;
         /**
@@ -4874,12 +4931,12 @@ var pages;
          */
         function registerBackButtonHandlerHelper(apiVersionTag, handler, versionSpecificHelper) {
             // allow for registration cleanup even when not finished initializing
-            !isNullOrUndefined(handler) && internalAPIs_ensureInitialized(runtime_runtime);
+            !isNullOrUndefined(handler) && ensureInitialized(runtime);
             if (versionSpecificHelper) {
                 versionSpecificHelper();
             }
             backButtonPressHandler = handler;
-            !isNullOrUndefined(handler) && sendMessageToParentWithVersion(apiVersionTag, 'registerHandler', ['backButton']);
+            !isNullOrUndefined(handler) && sendMessageToParent(apiVersionTag, 'registerHandler', ['backButton']);
         }
         backStack.registerBackButtonHandlerHelper = registerBackButtonHandlerHelper;
         function handleBackButtonPress() {
@@ -4900,8 +4957,8 @@ var pages;
          * @throws Error if {@linkcode app.initialize} has not successfully completed
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages
-                ? runtime_runtime.supports.pages.backStack
+            return ensureInitialized(runtime) && runtime.supports.pages
+                ? runtime.supports.pages.backStack
                     ? true
                     : false
                 : false;
@@ -4926,11 +4983,11 @@ var pages;
          *
          */
         function enterFullscreen() {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            sendMessageToParentWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_FullTrust_EnterFullscreen), 'enterFullscreen', []);
+            sendMessageToParent(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_FullTrust_EnterFullscreen), 'enterFullscreen', []);
         }
         fullTrust.enterFullscreen = enterFullscreen;
         /**
@@ -4940,11 +4997,11 @@ var pages;
          * Reverts the tab into normal-screen mode.
          */
         function exitFullscreen() {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            sendMessageToParentWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_FullTrust_ExitFullscreen), 'exitFullscreen', []);
+            sendMessageToParent(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_FullTrust_ExitFullscreen), 'exitFullscreen', []);
         }
         fullTrust.exitFullscreen = exitFullscreen;
         /**
@@ -4956,8 +5013,8 @@ var pages;
          * @throws Error if {@linkcode app.initialize} has not successfully completed
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages
-                ? runtime_runtime.supports.pages.fullTrust
+            return ensureInitialized(runtime) && runtime.supports.pages
+                ? runtime.supports.pages.fullTrust
                     ? true
                     : false
                 : false;
@@ -4975,7 +5032,7 @@ var pages;
          * @param handler - The handler to invoke when the personal app button is clicked in the app bar.
          */
         function onClick(handler) {
-            registerHandlerHelperWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_AppButton_OnClick), 'appButtonClick', handler, [FrameContexts.content], () => {
+            registerHandlerHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_AppButton_OnClick), 'appButtonClick', handler, [FrameContexts.content], () => {
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
@@ -4988,7 +5045,7 @@ var pages;
          * @param handler - The handler to invoke when entering hover of the personal app button in the app bar.
          */
         function onHoverEnter(handler) {
-            registerHandlerHelperWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_AppButton_OnHoverEnter), 'appButtonHoverEnter', handler, [FrameContexts.content], () => {
+            registerHandlerHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_AppButton_OnHoverEnter), 'appButtonHoverEnter', handler, [FrameContexts.content], () => {
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
@@ -5001,7 +5058,7 @@ var pages;
          * @param handler - The handler to invoke when exiting hover of the personal app button in the app bar.
          */
         function onHoverLeave(handler) {
-            registerHandlerHelperWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_AppButton_OnHoverLeave), 'appButtonHoverLeave', handler, [FrameContexts.content], () => {
+            registerHandlerHelper(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_AppButton_OnHoverLeave), 'appButtonHoverLeave', handler, [FrameContexts.content], () => {
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
@@ -5015,8 +5072,8 @@ var pages;
          * @throws Error if {@linkcode app.initialize} has not successfully completed
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages
-                ? runtime_runtime.supports.pages.appButton
+            return ensureInitialized(runtime) && runtime.supports.pages
+                ? runtime.supports.pages.appButton
                     ? true
                     : false
                 : false;
@@ -5040,11 +5097,11 @@ var pages;
          */
         function navigateTo(params) {
             return new Promise((resolve) => {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
-                resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_CurrentApp_NavigateTo), 'pages.currentApp.navigateTo', params));
+                resolve(sendAndHandleSdkError(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_CurrentApp_NavigateTo), 'pages.currentApp.navigateTo', params));
             });
         }
         currentApp.navigateTo = navigateTo;
@@ -5055,11 +5112,11 @@ var pages;
          */
         function navigateToDefaultPage() {
             return new Promise((resolve) => {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
-                resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_CurrentApp_NavigateToDefaultPage), 'pages.currentApp.navigateToDefaultPage'));
+                resolve(sendAndHandleSdkError(getApiVersionTag(pagesTelemetryVersionNumber, ApiName.Pages_CurrentApp_NavigateToDefaultPage), 'pages.currentApp.navigateToDefaultPage'));
             });
         }
         currentApp.navigateToDefaultPage = navigateToDefaultPage;
@@ -5072,8 +5129,8 @@ var pages;
          * @beta
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.pages
-                ? runtime_runtime.supports.pages.currentApp
+            return ensureInitialized(runtime) && runtime.supports.pages
+                ? runtime.supports.pages.currentApp
                     ? true
                     : false
                 : false;
@@ -5174,24 +5231,10 @@ function callHandler(name, args) {
  * @internal
  * Limited to Microsoft-internal use
  */
-function registerHandlerWithVersion(getApiVersionTag, name, handler, sendMessage = true, args = []) {
+function registerHandler(apiVersionTag, name, handler, sendMessage = true, args = []) {
     if (handler) {
         HandlersPrivate.handlers[name] = handler;
-        sendMessage && sendMessageToParentWithVersion(getApiVersionTag, 'registerHandler', [name, ...args]);
-    }
-    else {
-        delete HandlersPrivate.handlers[name];
-    }
-}
-/**
- * @internal
- * Limited to Microsoft-internal use
- */
-function registerHandler(name, handler, sendMessage = true, args = []) {
-    if (handler) {
-        HandlersPrivate.handlers[name] = handler;
-        sendMessage &&
-            sendMessageToParentWithVersion(getApiVersionTag(ApiVersionNumber.V_0, ApiName.RegisterHandler), 'registerHandler', [name, ...args]);
+        sendMessage && sendMessageToParent(apiVersionTag, 'registerHandler', [name, ...args]);
     }
     else {
         delete HandlersPrivate.handlers[name];
@@ -5218,39 +5261,19 @@ function doesHandlerExist(name) {
  * @internal
  * Limited to Microsoft-internal use
  *
- * @param apiVersionTag - The tag to indicate API version number with name
- * @param name - The name of the handler to register.
- * @param handler - The handler to invoke.
- * @param contexts - The context within which it is valid to register this handler.
- * @param registrationHelper - The helper function containing logic pertaining to a specific version of the API.
- */
-function registerHandlerHelperWithVersion(apiVersionTag, name, handler, contexts, registrationHelper) {
-    // allow for registration cleanup even when not finished initializing
-    handler && internalAPIs_ensureInitialized(runtime_runtime, ...contexts);
-    if (registrationHelper) {
-        registrationHelper();
-    }
-    registerHandler(name, handler);
-}
-/**
- * @hidden
- * Undocumented helper function with shared code between deprecated version and current version of register*Handler APIs
- *
- * @internal
- * Limited to Microsoft-internal use
- *
+ * @param apiVersionTag - The tag of the api version and name
  * @param name - The name of the handler to register.
  * @param handler - The handler to invoke.
  * @param contexts - The context within which it is valid to register this handler.
  * @param registrationHelper - The helper function containing logic pertaining to a specific version of the API.
  */
-function registerHandlerHelper(name, handler, contexts, registrationHelper) {
+function registerHandlerHelper(apiVersionTag, name, handler, contexts, registrationHelper) {
     // allow for registration cleanup even when not finished initializing
     handler && ensureInitialized(runtime, ...contexts);
     if (registrationHelper) {
         registrationHelper();
     }
-    registerHandler(name, handler);
+    registerHandler(apiVersionTag, name, handler);
 }
 /**
  * @internal
@@ -5258,7 +5281,7 @@ function registerHandlerHelper(name, handler, contexts, registrationHelper) {
  */
 function registerOnThemeChangeHandler(apiVersionTag, handler) {
     HandlersPrivate.themeChangeHandler = handler;
-    !isNullOrUndefined(handler) && sendMessageToParentWithVersion(apiVersionTag, 'registerHandler', ['themeChange']);
+    !isNullOrUndefined(handler) && sendMessageToParent(apiVersionTag, 'registerHandler', ['themeChange']);
 }
 /**
  * @internal
@@ -5278,12 +5301,9 @@ function handleThemeChange(theme) {
  *
  * @deprecated
  */
-function handlers_registerOnLoadHandler(handler) {
+function handlers_registerOnLoadHandler(apiVersionTag, handler) {
     HandlersPrivate.loadHandler = handler;
-    !isNullOrUndefined(handler) &&
-        sendMessageToParentWithVersion(getApiVersionTag(ApiVersionNumber.V_2, ApiName.RegisterHandler), 'registerHandler', [
-            'load',
-        ]);
+    !isNullOrUndefined(handler) && sendMessageToParent(apiVersionTag, 'registerHandler', ['load']);
 }
 /**
  * @internal
@@ -5306,12 +5326,9 @@ function handleLoad(context) {
  *
  * @deprecated
  */
-function handlers_registerBeforeUnloadHandler(handler) {
+function handlers_registerBeforeUnloadHandler(apiVersionTag, handler) {
     HandlersPrivate.beforeUnloadHandler = handler;
-    !isNullOrUndefined(handler) &&
-        sendMessageToParentWithVersion(getApiVersionTag(ApiVersionNumber.V_2, ApiName.RegisterHandler), 'registerHandler', [
-            'beforeUnload',
-        ]);
+    !isNullOrUndefined(handler) && sendMessageToParent(apiVersionTag, 'registerHandler', ['beforeUnload']);
 }
 /**
  * @internal
@@ -5319,7 +5336,7 @@ function handlers_registerBeforeUnloadHandler(handler) {
  */
 function handleBeforeUnload() {
     const readyToUnload = () => {
-        sendMessageToParent('readyToUnload', []);
+        sendMessageToParent(getApiVersionTag(ApiVersionNumber.V_2, ApiName.HandleBeforeUnload), 'readyToUnload', []);
     };
     if (HandlersPrivate.beforeSuspendOrTerminateHandler) {
         HandlersPrivate.beforeSuspendOrTerminateHandler();
@@ -5346,7 +5363,7 @@ function handleBeforeUnload() {
 function handlers_registerBeforeSuspendOrTerminateHandler(handler) {
     HandlersPrivate.beforeSuspendOrTerminateHandler = handler;
     !isNullOrUndefined(handler) &&
-        sendMessageToParentWithVersion(getApiVersionTag(ApiVersionNumber.V_2, ApiName.RegisterBeforeUnloadHandler), 'registerHandler', ['beforeUnload']);
+        sendMessageToParent(getApiVersionTag(ApiVersionNumber.V_2, ApiName.RegisterBeforeSuspendOrTerminateHandler), 'registerHandler', ['beforeUnload']);
 }
 /**
  * @internal
@@ -5355,7 +5372,9 @@ function handlers_registerBeforeSuspendOrTerminateHandler(handler) {
 function handlers_registerOnResumeHandler(handler) {
     HandlersPrivate.resumeHandler = handler;
     !isNullOrUndefined(handler) &&
-        sendMessageToParentWithVersion(getApiVersionTag(ApiVersionNumber.V_2, ApiName.RegisterLoadHandler), 'registerHandler', ['load']);
+        sendMessageToParent(getApiVersionTag(ApiVersionNumber.V_2, ApiName.RegisterOnResumeHandler), 'registerHandler', [
+            'load',
+        ]);
 }
 
 ;// CONCATENATED MODULE: ./src/internal/nestedAppAuth.ts
@@ -5554,7 +5573,7 @@ function initializeCommunication(validMessageOrigins, apiVersionTag) {
         // Send the initialized message to any origin, because at this point we most likely don't know the origin
         // of the parent window, and this message contains no data that could pose a security risk.
         Communication.parentOrigin = '*';
-        return sendMessageToParentAsyncWithVersion(apiVersionTag, 'initialize', [
+        return sendMessageToParentAsync(apiVersionTag, 'initialize', [
             version,
             latestRuntimeApiVersion,
         ]).then(([context, clientType, runtimeConfig, clientSupportedSDKVersion]) => {
@@ -5593,38 +5612,22 @@ function uninitializeCommunication() {
  * @hidden
  * Send a message to parent and then unwrap result. Uses nativeInterface on mobile to communicate with parent context
  * Additional apiVersionTag parameter is added, which provides the ability to send api version number to parent
- * for telemetry work. The code inside of this function will be used to replace sendAndUnwrap function
- * and this function will be removed when the project is completed.
+ * for telemetry work.
  *
  * @internal
  * Limited to Microsoft-internal use
  */
-function sendAndUnwrapWithVersion(apiVersionTag, actionName, ...args) {
-    return sendMessageToParentAsyncWithVersion(apiVersionTag, actionName, args).then(([result]) => result);
-}
-/**
- * @internal
- * Limited to Microsoft-internal use
- */
-function sendAndUnwrap(actionName, ...args) {
-    return sendMessageToParentAsync(actionName, args).then(([result]) => result);
+function sendAndUnwrap(apiVersionTag, actionName, ...args) {
+    return sendMessageToParentAsync(apiVersionTag, actionName, args).then(([result]) => result);
 }
 /**
  * @hidden
  * Send a message to parent and then handle status and reason. Uses nativeInterface on mobile to communicate with parent context
  * Additional apiVersionTag parameter is added, which provides the ability to send api version number to parent
- * for telemetry work. The code inside of this function will be used to replace sendAndHandleStatusAndReason function
- * and this function will be removed when the project is completed.
+ * for telemetry work.
  */
-function sendAndHandleStatusAndReasonWithVersion(apiVersionTag, actionName, ...args) {
-    return sendMessageToParentAsyncWithVersion(apiVersionTag, actionName, args).then(([wasSuccessful, reason]) => {
-        if (!wasSuccessful) {
-            throw new Error(reason);
-        }
-    });
-}
-function sendAndHandleStatusAndReason(actionName, ...args) {
-    return sendMessageToParentAsync(actionName, args).then(([wasSuccessful, reason]) => {
+function sendAndHandleStatusAndReason(apiVersionTag, actionName, ...args) {
+    return sendMessageToParentAsync(apiVersionTag, actionName, args).then(([wasSuccessful, reason]) => {
         if (!wasSuccessful) {
             throw new Error(reason);
         }
@@ -5634,25 +5637,13 @@ function sendAndHandleStatusAndReason(actionName, ...args) {
  * @hidden
  * Send a message to parent and then handle status and reason with default error. Uses nativeInterface on mobile to communicate with parent context
  * Additional apiVersionTag parameter is added, which provides the ability to send api version number to parent
- * for telemetry work. The code inside of this function will be used to replace sendAndHandleStatusAndReasonWithDefaultError function
- * and this function will be removed when the project is completed.
+ * for telemetry work.
  *
  * @internal
  * Limited to Microsoft-internal use
  */
-function sendAndHandleStatusAndReasonWithDefaultErrorWithVersion(apiVersionTag, actionName, defaultError, ...args) {
-    return sendMessageToParentAsyncWithVersion(apiVersionTag, actionName, args).then(([wasSuccessful, reason]) => {
-        if (!wasSuccessful) {
-            throw new Error(reason ? reason : defaultError);
-        }
-    });
-}
-/**
- * @internal
- * Limited to Microsoft-internal use
- */
-function sendAndHandleStatusAndReasonWithDefaultError(actionName, defaultError, ...args) {
-    return sendMessageToParentAsync(actionName, args).then(([wasSuccessful, reason]) => {
+function sendAndHandleStatusAndReasonWithDefaultError(apiVersionTag, actionName, defaultError, ...args) {
+    return sendMessageToParentAsync(apiVersionTag, actionName, args).then(([wasSuccessful, reason]) => {
         if (!wasSuccessful) {
             throw new Error(reason ? reason : defaultError);
         }
@@ -5662,26 +5653,13 @@ function sendAndHandleStatusAndReasonWithDefaultError(actionName, defaultError,
  * @hidden
  * Send a message to parent and then handle SDK error. Uses nativeInterface on mobile to communicate with parent context
  * Additional apiVersionTag parameter is added, which provides the ability to send api version number to parent
- * for telemetry work. The code inside of this function will be used to replace sendAndHandleSdkError function
- * and this function will be removed when the project is completed.
+ * for telemetry work.
  *
  * @internal
  * Limited to Microsoft-internal use
  */
-function sendAndHandleSdkErrorWithVersion(apiVersionTag, actionName, ...args) {
-    return sendMessageToParentAsyncWithVersion(apiVersionTag, actionName, args).then(([error, result]) => {
-        if (error) {
-            throw error;
-        }
-        return result;
-    });
-}
-/**
- * @internal
- * Limited to Microsoft-internal use
- */
-function sendAndHandleSdkError(actionName, ...args) {
-    return sendMessageToParentAsync(actionName, args).then(([error, result]) => {
+function sendAndHandleSdkError(apiVersionTag, actionName, ...args) {
+    return sendMessageToParentAsync(apiVersionTag, actionName, args).then(([error, result]) => {
         if (error) {
             throw error;
         }
@@ -5692,33 +5670,17 @@ function sendAndHandleSdkError(actionName, ...args) {
  * @hidden
  * Send a message to parent asynchronously. Uses nativeInterface on mobile to communicate with parent context
  * Additional apiVersionTag parameter is added, which provides the ability to send api version number to parent
- * for telemetry work. The code inside of this function will be used to replace sendMessageToParentAsync function
- * and this function will be removed when the project is completed.
+ * for telemetry work.
  *
  * @internal
  * Limited to Microsoft-internal use
  */
-function sendMessageToParentAsyncWithVersion(apiVersionTag, actionName, args = undefined) {
+function sendMessageToParentAsync(apiVersionTag, actionName, args = undefined) {
     if (!isFollowingApiVersionTagFormat(apiVersionTag)) {
         throw Error(`apiVersionTag: ${apiVersionTag} passed in doesn't follow the pattern starting with 'v' followed by digits, then underscore with words, please check.`);
     }
     return new Promise((resolve) => {
         const request = sendMessageToParentHelper(apiVersionTag, actionName, args);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        resolve(waitForResponse(request.id));
-    });
-}
-/**
- * @hidden
- * Send a message to parent. Uses nativeInterface on mobile to communicate with parent context
- *
- * @internal
- * Limited to Microsoft-internal use
- */
-function sendMessageToParentAsync(actionName, args = undefined) {
-    return new Promise((resolve) => {
-        const request = sendMessageToParentHelper(getApiVersionTag(ApiVersionNumber.V_0, 'testing'), actionName, args);
         resolve(waitForResponse(request.id));
     });
 }
@@ -5765,10 +5727,10 @@ function waitForResponse(requestId) {
  * @hidden
  * Send a message to parent. Uses nativeInterface on mobile to communicate with parent context
  * Additional apiVersionTag parameter is added, which provides the ability to send api version number to parent
- * for telemetry work. The code inside of this function will be used to replace sendMessageToParent function
- * and this function will be removed when the project is completed.
+ * for telemetry work.
+ *
  */
-function sendMessageToParentWithVersion(apiVersionTag, actionName, argsOrCallback, callback) {
+function sendMessageToParent(apiVersionTag, actionName, argsOrCallback, callback) {
     let args;
     if (argsOrCallback instanceof Function) {
         callback = argsOrCallback;
@@ -5779,9 +5741,6 @@ function sendMessageToParentWithVersion(apiVersionTag, actionName, argsOrCallbac
     if (!isFollowingApiVersionTagFormat(apiVersionTag)) {
         throw Error(`apiVersionTag: ${apiVersionTag} passed in doesn't follow the pattern starting with 'v' followed by digits, then underscore with words, please check.`);
     }
-    // APIs with v0 represents beta changes haven't been implemented on them
-    // Otherwise, minimum version number will be v1
-    /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
     const request = sendMessageToParentHelper(apiVersionTag, actionName, args);
     if (callback) {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -5789,25 +5748,6 @@ function sendMessageToParentWithVersion(apiVersionTag, actionName, argsOrCallbac
         CommunicationPrivate.callbacks[request.id] = callback;
     }
 }
-/**
- * @internal
- * Limited to Microsoft-internal use
- */
-function sendMessageToParent(actionName, argsOrCallback, callback) {
-    let args;
-    if (argsOrCallback instanceof Function) {
-        callback = argsOrCallback;
-    }
-    else if (argsOrCallback instanceof Array) {
-        args = argsOrCallback;
-    }
-    const request = sendMessageToParentHelper(getApiVersionTag(ApiVersionNumber.V_0, 'testing'), actionName, args);
-    if (callback) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        CommunicationPrivate.callbacks[request.id] = callback;
-    }
-}
 const sendNestedAuthRequestToTopWindowLogger = communicationLogger.extend('sendNestedAuthRequestToTopWindow');
 /**
  * @internal
@@ -6097,7 +6037,7 @@ function handleChildMessage(evt) {
         }
         else {
             // No handler, proxy to parent
-            sendMessageToParent(message.func, message.args, (...args) => {
+            sendMessageToParent(getApiVersionTag(ApiVersionNumber.V_2, ApiName.Tasks_StartTask), message.func, message.args, (...args) => {
                 if (Communication.childWindow) {
                     const isPartialResponse = args.pop();
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -6335,14 +6275,14 @@ var logs;
      */
     function registerGetLogHandler(handler) {
         // allow for registration cleanup even when not finished initializing
-        !isNullOrUndefined(handler) && internalAPIs_ensureInitialized(runtime_runtime);
+        !isNullOrUndefined(handler) && ensureInitialized(runtime);
         if (!isNullOrUndefined(handler) && !isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         if (handler) {
-            registerHandlerWithVersion(getApiVersionTag(logsTelemetryVersionNumber, ApiName.Logs_RegisterLogRequestHandler), 'log.request', () => {
+            registerHandler(getApiVersionTag(logsTelemetryVersionNumber, ApiName.Logs_RegisterLogRequestHandler), 'log.request', () => {
                 const log = handler();
-                sendMessageToParentWithVersion(getApiVersionTag(logsTelemetryVersionNumber, ApiName.Logs_Receive), 'log.receive', [log]);
+                sendMessageToParent(getApiVersionTag(logsTelemetryVersionNumber, ApiName.Logs_Receive), 'log.receive', [log]);
             });
         }
         else {
@@ -6362,7 +6302,7 @@ var logs;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.logs ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.logs ? true : false;
     }
     logs.isSupported = isSupported;
 })(logs || (logs = {}));
@@ -6437,8 +6377,8 @@ var UserSettingTypes;
  */
 const privateAPIsTelemetryVersionNumber = ApiVersionNumber.V_1;
 function uploadCustomApp(manifestBlob, onComplete) {
-    internalAPIs_ensureInitialized(runtime_runtime);
-    sendMessageToParentWithVersion(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_UploadCustomApp), 'uploadCustomApp', [manifestBlob], onComplete ? onComplete : getGenericOnCompleteHandler());
+    ensureInitialized(runtime);
+    sendMessageToParent(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_UploadCustomApp), 'uploadCustomApp', [manifestBlob], onComplete ? onComplete : getGenericOnCompleteHandler());
 }
 /**
  * @hidden
@@ -6453,8 +6393,8 @@ function uploadCustomApp(manifestBlob, onComplete) {
  * Limited to Microsoft-internal use
  */
 function sendCustomMessage(actionName, args, callback) {
-    internalAPIs_ensureInitialized(runtime_runtime);
-    sendMessageToParentWithVersion(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_SendCustomMessage), actionName, args, callback);
+    ensureInitialized(runtime);
+    sendMessageToParent(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_SendCustomMessage), actionName, args, callback);
 }
 /**
  * @hidden
@@ -6469,7 +6409,7 @@ function sendCustomMessage(actionName, args, callback) {
  * Limited to Microsoft-internal use
  */
 function sendCustomEvent(actionName, args) {
-    internalAPIs_ensureInitialized(runtime_runtime);
+    ensureInitialized(runtime);
     //validate childWindow
     if (!Communication.childWindow) {
         throw new Error('The child window has not yet been initialized or is not present');
@@ -6487,8 +6427,8 @@ function sendCustomEvent(actionName, args) {
  * Limited to Microsoft-internal use
  */
 function registerCustomHandler(actionName, customHandler) {
-    internalAPIs_ensureInitialized(runtime_runtime);
-    registerHandlerWithVersion(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_RegisterCustomHandler), actionName, (...args) => {
+    ensureInitialized(runtime);
+    registerHandler(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_RegisterCustomHandler), actionName, (...args) => {
         return customHandler.apply(this, args);
     });
 }
@@ -6503,8 +6443,8 @@ function registerCustomHandler(actionName, customHandler) {
  * Limited to Microsoft-internal use
  */
 function registerUserSettingsChangeHandler(settingTypes, handler) {
-    internalAPIs_ensureInitialized(runtime_runtime);
-    registerHandlerWithVersion(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_RegisterUserSettingsChangeHandler), 'userSettingsChange', handler, true, [settingTypes]);
+    ensureInitialized(runtime);
+    registerHandler(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_RegisterUserSettingsChangeHandler), 'userSettingsChange', handler, true, [settingTypes]);
 }
 /**
  * @hidden
@@ -6516,7 +6456,7 @@ function registerUserSettingsChangeHandler(settingTypes, handler) {
  * Limited to Microsoft-internal use
  */
 function openFilePreview(filePreviewParameters) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
     const params = [
         filePreviewParameters.entityId,
         filePreviewParameters.title,
@@ -6534,7 +6474,7 @@ function openFilePreview(filePreviewParameters) {
         filePreviewParameters.conversationId,
         filePreviewParameters.sizeInBytes,
     ];
-    sendMessageToParentWithVersion(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_OpenFilePreview), 'openFilePreview', params);
+    sendMessageToParent(getApiVersionTag(privateAPIsTelemetryVersionNumber, ApiName.PrivateAPIs_OpenFilePreview), 'openFilePreview', params);
 }
 
 ;// CONCATENATED MODULE: ./src/private/conversations.ts
@@ -6575,11 +6515,11 @@ var conversations;
      */
     function openConversation(openConversationRequest) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            const sendPromise = sendAndHandleStatusAndReasonWithVersion(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_OpenConversation), 'conversations.openConversation', {
+            const sendPromise = sendAndHandleStatusAndReason(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_OpenConversation), 'conversations.openConversation', {
                 title: openConversationRequest.title,
                 subEntityId: openConversationRequest.subEntityId,
                 conversationId: openConversationRequest.conversationId,
@@ -6587,7 +6527,7 @@ var conversations;
                 entityId: openConversationRequest.entityId,
             });
             if (openConversationRequest.onStartConversation) {
-                registerHandlerWithVersion(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_RegisterStartConversationHandler), 'startConversation', (subEntityId, conversationId, channelId, entityId) => {
+                registerHandler(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_RegisterStartConversationHandler), 'startConversation', (subEntityId, conversationId, channelId, entityId) => {
                     var _a;
                     return (_a = openConversationRequest.onStartConversation) === null || _a === void 0 ? void 0 : _a.call(openConversationRequest, {
                         subEntityId,
@@ -6598,7 +6538,7 @@ var conversations;
                 });
             }
             if (openConversationRequest.onCloseConversation) {
-                registerHandlerWithVersion(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_RegisterCloseConversationHandler), 'closeConversation', (subEntityId, conversationId, channelId, entityId) => {
+                registerHandler(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_RegisterCloseConversationHandler), 'closeConversation', (subEntityId, conversationId, channelId, entityId) => {
                     var _a;
                     return (_a = openConversationRequest.onCloseConversation) === null || _a === void 0 ? void 0 : _a.call(openConversationRequest, {
                         subEntityId,
@@ -6621,11 +6561,11 @@ var conversations;
      * Limited to Microsoft-internal use
      */
     function closeConversation() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_CloseConversation), 'conversations.closeConversation');
+        sendMessageToParent(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_CloseConversation), 'conversations.closeConversation');
         removeHandler('startConversation');
         removeHandler('closeConversation');
     }
@@ -6645,11 +6585,11 @@ var conversations;
      */
     function getChatMembers() {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime);
+            ensureInitialized(runtime);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            resolve(sendAndUnwrapWithVersion(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_GetChatMember), 'getChatMembers'));
+            resolve(sendAndUnwrap(getApiVersionTag(conversationsTelemetryVersionNumber, ApiName.Conversations_GetChatMember), 'getChatMembers'));
         });
     }
     conversations.getChatMembers = getChatMembers;
@@ -6663,7 +6603,7 @@ var conversations;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.conversations ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.conversations ? true : false;
     }
     conversations.isSupported = isSupported;
 })(conversations || (conversations = {}));
@@ -6742,7 +6682,6 @@ function createTeamsDeepLinkForAppInstallDialog(appId) {
 
 
 
-
 /**
  * v1 APIs telemetry file: All of APIs in this capability file should send out API version v1 ONLY
  */
@@ -6756,18 +6695,16 @@ var appInstallDialog;
      */
     function openAppInstallDialog(openAPPInstallDialogParams) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
             if (!isSupported()) {
                 throw new Error('Not supported');
             }
             const apiVersionTag = getApiVersionTag(appInstallDialogTelemetryVersionNumber, ApiName.AppInstallDialog_OpenAppInstallDialog);
-            if (runtime_runtime.isLegacyTeams) {
-                resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForAppInstallDialog(openAPPInstallDialogParams.appId)));
+            if (runtime.isLegacyTeams) {
+                resolve(sendAndHandleStatusAndReason(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForAppInstallDialog(openAPPInstallDialogParams.appId)));
             }
             else {
-                sendMessageToParentWithVersion(apiVersionTag, 'appInstallDialog.openAppInstallDialog', [
-                    openAPPInstallDialogParams,
-                ]);
+                sendMessageToParent(apiVersionTag, 'appInstallDialog.openAppInstallDialog', [openAPPInstallDialogParams]);
                 resolve();
             }
         });
@@ -6780,7 +6717,7 @@ var appInstallDialog;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.appInstallDialog ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.appInstallDialog ? true : false;
     }
     appInstallDialog.isSupported = isSupported;
 })(appInstallDialog || (appInstallDialog = {}));
@@ -6839,7 +6776,7 @@ var media;
         if (!callback) {
             throw new Error('[captureImage] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!GlobalVars.isFramelessWindow) {
             const notSupportedError = { errorCode: ErrorCode.NOT_SUPPORTED_ON_PLATFORM };
             /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
@@ -6852,7 +6789,7 @@ var media;
             callback(oldPlatformError, []);
             return;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_CaptureImage), 'captureImage', callback);
+        sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_CaptureImage), 'captureImage', callback);
     }
     media.captureImage = captureImage;
     /**
@@ -6864,13 +6801,13 @@ var media;
      * @beta
      */
     function hasPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isPermissionSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.Media;
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_HasPermission), 'permissions.has', permissions));
+            resolve(sendAndHandleSdkError(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_HasPermission), 'permissions.has', permissions));
         });
     }
     media.hasPermission = hasPermission;
@@ -6883,13 +6820,13 @@ var media;
      * @beta
      */
     function requestPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isPermissionSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.Media;
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_RequestPermission), 'permissions.request', permissions));
+            resolve(sendAndHandleSdkError(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_RequestPermission), 'permissions.request', permissions));
         });
     }
     media.requestPermission = requestPermission;
@@ -6900,7 +6837,7 @@ var media;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isPermissionSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.permissions ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.permissions ? true : false;
     }
     /**
      * Media object returned by the select Media API
@@ -6926,7 +6863,7 @@ var media;
             if (!callback) {
                 throw new Error('[get Media] Callback cannot be null');
             }
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             if (!isCurrentSDKVersionAtLeast(mediaAPISupportVersion)) {
                 const oldPlatformError = { errorCode: ErrorCode.OLD_PLATFORM };
                 callback(oldPlatformError, new Blob());
@@ -6982,7 +6919,7 @@ var media;
                     }
                 }
             }
-            sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_GetMedia), 'getMedia', localUriId, handleGetMediaCallbackRequest);
+            sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_GetMedia), 'getMedia', localUriId, handleGetMediaCallbackRequest);
         }
         /** Function to retrieve media content, such as images or videos, via handler. */
         getMediaViaHandler(callback) {
@@ -6994,7 +6931,7 @@ var media;
             const params = [actionName, this.content];
             this.content &&
                 !isNullOrUndefined(callback) &&
-                sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_GetMedia), 'getMedia', params);
+                sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_GetMedia), 'getMedia', params);
             function handleGetMediaRequest(response) {
                 if (callback) {
                     /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
@@ -7027,7 +6964,7 @@ var media;
                     }
                 }
             }
-            registerHandler('getMedia' + actionName, handleGetMediaRequest);
+            registerHandler(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_RegisterGetMediaRequestHandler), 'getMedia' + actionName, handleGetMediaRequest);
         }
     }
     media.Media = Media;
@@ -7050,7 +6987,7 @@ var media;
          * Optional; @param callback is used to send app if host client has successfully handled the notification event or not
          */
         notifyEventToHost(mediaEvent, callback) {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             try {
                 throwExceptionIfMobileApiIsNotSupported(nonFullScreenVideoModeAPISupportVersion);
             }
@@ -7061,7 +6998,7 @@ var media;
                 return;
             }
             const params = { mediaType: this.getMediaType(), mediaControllerEvent: mediaEvent };
-            sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_Controller), 'media.controller', [params], (err) => {
+            sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_Controller), 'media.controller', [params], (err) => {
                 if (callback) {
                     callback(err);
                 }
@@ -7178,7 +7115,7 @@ var media;
         if (!callback) {
             throw new Error('[select Media] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isCurrentSDKVersionAtLeast(mediaAPISupportVersion)) {
             const oldPlatformError = { errorCode: ErrorCode.OLD_PLATFORM };
             callback(oldPlatformError, []);
@@ -7198,7 +7135,7 @@ var media;
         }
         const params = [mediaInputs];
         // What comes back from native as attachments would just be objects and will be missing getMedia method on them
-        sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_SelectMedia), 'selectMedia', params, (err, localAttachments, mediaEvent) => {
+        sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_SelectMedia), 'selectMedia', params, (err, localAttachments, mediaEvent) => {
             var _a, _b;
             // MediaControllerEvent response is used to notify the app about events and is a partial response to selectMedia
             if (mediaEvent) {
@@ -7230,7 +7167,7 @@ var media;
         if (!callback) {
             throw new Error('[view images] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isCurrentSDKVersionAtLeast(mediaAPISupportVersion)) {
             const oldPlatformError = { errorCode: ErrorCode.OLD_PLATFORM };
             callback(oldPlatformError);
@@ -7242,7 +7179,7 @@ var media;
             return;
         }
         const params = [uriList];
-        sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_ViewImages), 'viewImages', params, callback);
+        sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_ViewImages), 'viewImages', params, callback);
     }
     media.viewImages = viewImages;
     /**
@@ -7261,7 +7198,7 @@ var media;
         if (!callback) {
             throw new Error('[media.scanBarCode] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (GlobalVars.hostClientType === HostClientType.desktop ||
             GlobalVars.hostClientType === HostClientType.web ||
             GlobalVars.hostClientType === HostClientType.rigel ||
@@ -7283,7 +7220,7 @@ var media;
             callback(invalidInput, '');
             return;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_ScanBarCode), 'media.scanBarCode', [config], callback);
+        sendMessageToParent(getApiVersionTag(mediaTelemetryVersionNumber, ApiName.Media_ScanBarCode), 'media.scanBarCode', [config], callback);
     }
     media.scanBarCode = scanBarCode;
 })(media || (media = {}));
@@ -7535,14 +7472,14 @@ var barCode;
      */
     function scanBarCode(barCodeConfig) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
             if (!validateScanBarCodeInput(barCodeConfig)) {
                 throw { errorCode: ErrorCode.INVALID_ARGUMENTS };
             }
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(barCodeTelemetryVersionNumber, ApiName.BarCode_ScanBarCode), 'media.scanBarCode', barCodeConfig));
+            resolve(sendAndHandleSdkError(getApiVersionTag(barCodeTelemetryVersionNumber, ApiName.BarCode_ScanBarCode), 'media.scanBarCode', barCodeConfig));
         });
     }
     barCode.scanBarCode = scanBarCode;
@@ -7554,13 +7491,13 @@ var barCode;
      * @beta
      */
     function hasPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.Media;
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(barCodeTelemetryVersionNumber, ApiName.BarCode_HasPermission), 'permissions.has', permissions));
+            resolve(sendAndHandleSdkError(getApiVersionTag(barCodeTelemetryVersionNumber, ApiName.BarCode_HasPermission), 'permissions.has', permissions));
         });
     }
     barCode.hasPermission = hasPermission;
@@ -7572,13 +7509,13 @@ var barCode;
      * @beta
      */
     function requestPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.Media;
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(barCodeTelemetryVersionNumber, ApiName.BarCode_RequestPermission), 'permissions.request', permissions));
+            resolve(sendAndHandleSdkError(getApiVersionTag(barCodeTelemetryVersionNumber, ApiName.BarCode_RequestPermission), 'permissions.request', permissions));
         });
     }
     barCode.requestPermission = requestPermission;
@@ -7591,7 +7528,7 @@ var barCode;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.barCode && runtime_runtime.supports.permissions ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.barCode && runtime.supports.permissions ? true : false;
     }
     barCode.isSupported = isSupported;
 })(barCode || (barCode = {}));
@@ -7636,15 +7573,15 @@ var chat;
     chat.openChat = openChat;
     function openChatHelper(apiVersionTag, openChatRequest) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            if (runtime_runtime.isLegacyTeams) {
-                resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForChat([openChatRequest.user], undefined /*topic*/, openChatRequest.message)));
+            if (runtime.isLegacyTeams) {
+                resolve(sendAndHandleStatusAndReason(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForChat([openChatRequest.user], undefined /*topic*/, openChatRequest.message)));
             }
             else {
-                const sendPromise = sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'chat.openChat', {
+                const sendPromise = sendAndHandleStatusAndReason(apiVersionTag, 'chat.openChat', {
                     members: [openChatRequest.user],
                     message: openChatRequest.message,
                 });
@@ -7677,15 +7614,15 @@ var chat;
                 resolve(openChatHelper(apiVersionTag, chatRequest));
             }
             else {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
-                if (runtime_runtime.isLegacyTeams) {
-                    resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForChat(openChatRequest.users, openChatRequest.topic, openChatRequest.message)));
+                if (runtime.isLegacyTeams) {
+                    resolve(sendAndHandleStatusAndReason(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForChat(openChatRequest.users, openChatRequest.topic, openChatRequest.message)));
                 }
                 else {
-                    const sendPromise = sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'chat.openChat', {
+                    const sendPromise = sendAndHandleStatusAndReason(apiVersionTag, 'chat.openChat', {
                         members: openChatRequest.users,
                         message: openChatRequest.message,
                         topic: openChatRequest.topic,
@@ -7705,7 +7642,7 @@ var chat;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.chat ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.chat ? true : false;
     }
     chat.isSupported = isSupported;
 })(chat || (chat = {}));
@@ -7752,7 +7689,7 @@ var clipboard;
      */
     function write(blob) {
         return clipboard_awaiter(this, void 0, void 0, function* () {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.meetingStage, FrameContexts.task, FrameContexts.settings, FrameContexts.stage, FrameContexts.sidePanel);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.meetingStage, FrameContexts.task, FrameContexts.settings, FrameContexts.stage, FrameContexts.sidePanel);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
@@ -7764,7 +7701,7 @@ var clipboard;
                 mimeType: blob.type,
                 content: base64StringContent,
             };
-            return sendAndHandleSdkErrorWithVersion(getApiVersionTag(clipboardTelemetryVersionNumber, ApiName.Clipboard_Write), 'clipboard.writeToClipboard', writeParams);
+            return sendAndHandleSdkError(getApiVersionTag(clipboardTelemetryVersionNumber, ApiName.Clipboard_Write), 'clipboard.writeToClipboard', writeParams);
         });
     }
     clipboard.write = write;
@@ -7777,16 +7714,17 @@ var clipboard;
      */
     function read() {
         return clipboard_awaiter(this, void 0, void 0, function* () {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.meetingStage, FrameContexts.task, FrameContexts.settings, FrameContexts.stage, FrameContexts.sidePanel);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.meetingStage, FrameContexts.task, FrameContexts.settings, FrameContexts.stage, FrameContexts.sidePanel);
+            const apiVersionTag = getApiVersionTag(clipboardTelemetryVersionNumber, ApiName.Clipboard_Read);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
             if (isHostClientMobile() || GlobalVars.hostClientType === HostClientType.macos) {
-                const response = JSON.parse(yield sendAndHandleSdkError('clipboard.readFromClipboard'));
+                const response = JSON.parse(yield sendAndHandleSdkError(apiVersionTag, 'clipboard.readFromClipboard'));
                 return base64ToBlob(response.mimeType, response.content);
             }
             else {
-                return sendAndHandleSdkErrorWithVersion(getApiVersionTag(clipboardTelemetryVersionNumber, ApiName.Clipboard_Read), 'clipboard.readFromClipboard');
+                return sendAndHandleSdkError(apiVersionTag, 'clipboard.readFromClipboard');
             }
         });
     }
@@ -7800,7 +7738,7 @@ var clipboard;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && navigator && navigator.clipboard && runtime_runtime.supports.clipboard ? true : false;
+        return ensureInitialized(runtime) && navigator && navigator.clipboard && runtime.supports.clipboard ? true : false;
     }
     clipboard.isSupported = isSupported;
 })(clipboard || (clipboard = {}));
@@ -7830,11 +7768,11 @@ var geoLocation;
      * @beta
      */
     function getCurrentLocation() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_GetCurrentLocation), 'location.getLocation', {
+        return sendAndHandleSdkError(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_GetCurrentLocation), 'location.getLocation', {
             allowChooseLocation: false,
             showMap: false,
         });
@@ -7849,13 +7787,13 @@ var geoLocation;
      * @beta
      */
     function hasPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.GeoLocation;
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_HasPermission), 'permissions.has', permissions));
+            resolve(sendAndHandleSdkError(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_HasPermission), 'permissions.has', permissions));
         });
     }
     geoLocation.hasPermission = hasPermission;
@@ -7869,13 +7807,13 @@ var geoLocation;
      * @beta
      */
     function requestPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.GeoLocation;
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_RequestPermission), 'permissions.request', permissions));
+            resolve(sendAndHandleSdkError(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_RequestPermission), 'permissions.request', permissions));
         });
     }
     geoLocation.requestPermission = requestPermission;
@@ -7888,7 +7826,7 @@ var geoLocation;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.geoLocation && runtime_runtime.supports.permissions ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.geoLocation && runtime.supports.permissions ? true : false;
     }
     geoLocation.isSupported = isSupported;
     /**
@@ -7906,11 +7844,11 @@ var geoLocation;
          * @beta
          */
         function chooseLocation() {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            return sendAndHandleSdkErrorWithVersion(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_Map_ChooseLocation), 'location.getLocation', {
+            return sendAndHandleSdkError(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_Map_ChooseLocation), 'location.getLocation', {
                 allowChooseLocation: true,
                 showMap: true,
             });
@@ -7925,14 +7863,14 @@ var geoLocation;
          * @beta
          */
         function showLocation(location) {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
             if (!location) {
                 throw { errorCode: ErrorCode.INVALID_ARGUMENTS };
             }
-            return sendAndHandleSdkErrorWithVersion(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_ShowLocation), 'location.showLocation', location);
+            return sendAndHandleSdkError(getApiVersionTag(geoLocationTelemetryVersionNumber, ApiName.GeoLocation_ShowLocation), 'location.showLocation', location);
         }
         map.showLocation = showLocation;
         /**
@@ -7944,10 +7882,10 @@ var geoLocation;
          * @beta
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) &&
-                runtime_runtime.supports.geoLocation &&
-                runtime_runtime.supports.geoLocation.map &&
-                runtime_runtime.supports.permissions
+            return ensureInitialized(runtime) &&
+                runtime.supports.geoLocation &&
+                runtime.supports.geoLocation.map &&
+                runtime.supports.permissions
                 ? true
                 : false;
         }
@@ -7962,11 +7900,11 @@ var geoLocation;
  * version supported by the host, or undefined if the host does not support Adaptive Cards
  */
 function getAdaptiveCardSchemaVersion() {
-    if (!runtime_runtime.hostVersionsInfo) {
+    if (!runtime.hostVersionsInfo) {
         return undefined;
     }
     else {
-        return runtime_runtime.hostVersionsInfo.adaptiveCardSchemaVersion;
+        return runtime.hostVersionsInfo.adaptiveCardSchemaVersion;
     }
 }
 
@@ -7997,8 +7935,8 @@ class ChildAppWindow {
      * @param onComplete - The callback to know if the postMessage has been success/failed.
      */
     postMessage(message, onComplete) {
-        internalAPIs_ensureInitialized(runtime_runtime);
-        sendMessageToParentWithVersion(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ChildAppWindow_PostMessage), 'messageForChild', [message], onComplete ? onComplete : getGenericOnCompleteHandler());
+        ensureInitialized(runtime);
+        sendMessageToParent(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ChildAppWindow_PostMessage), 'messageForChild', [message], onComplete ? onComplete : getGenericOnCompleteHandler());
     }
     /**
      * Add a listener that will be called when an event is received from the ChildAppWindow.
@@ -8007,9 +7945,9 @@ class ChildAppWindow {
      * @param listener - The listener that will be called
      */
     addEventListener(type, listener) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (type === 'message') {
-            registerHandlerWithVersion(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ChildAppWindow_AddEventListener), 'messageForParent', listener);
+            registerHandler(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ChildAppWindow_AddEventListener), 'messageForParent', listener);
         }
     }
 }
@@ -8031,8 +7969,8 @@ class ParentAppWindow {
      * @param onComplete - The callback to know if the postMessage has been success/failed.
      */
     postMessage(message, onComplete) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.task);
-        sendMessageToParentWithVersion(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ParentAppWindow_PostMessage), 'messageForParent', [message], onComplete ? onComplete : getGenericOnCompleteHandler());
+        ensureInitialized(runtime, FrameContexts.task);
+        sendMessageToParent(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ParentAppWindow_PostMessage), 'messageForParent', [message], onComplete ? onComplete : getGenericOnCompleteHandler());
     }
     /**
      * Add a listener that will be called when an event is received from the ParentAppWindow.
@@ -8041,9 +7979,9 @@ class ParentAppWindow {
      * @param listener - The listener that will be called
      */
     addEventListener(type, listener) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.task);
         if (type === 'message') {
-            registerHandlerWithVersion(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ParentAppWindow_AddEventListener), 'messageForChild', listener);
+            registerHandler(getApiVersionTag(appWindowTelemetryVersionNumber, ApiName.AppWindow_ParentAppWindow_AddEventListener), 'messageForChild', listener);
         }
     }
 }
@@ -8083,14 +8021,14 @@ var secondaryBrowser;
      * @beta
      */
     function open(url) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         if (!url || !isValidHttpsURL(url)) {
             throw { errorCode: ErrorCode.INVALID_ARGUMENTS, message: 'Invalid Url: Only https URL is allowed' };
         }
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(secondaryBrowserTelemetryVersionNumber, ApiName.SecondaryBrowser_OpenUrl), 'secondaryBrowser.open', url.toString());
+        return sendAndHandleSdkError(getApiVersionTag(secondaryBrowserTelemetryVersionNumber, ApiName.SecondaryBrowser_OpenUrl), 'secondaryBrowser.open', url.toString());
     }
     secondaryBrowser.open = open;
     /**
@@ -8102,7 +8040,7 @@ var secondaryBrowser;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.secondaryBrowser ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.secondaryBrowser ? true : false;
     }
     secondaryBrowser.isSupported = isSupported;
 })(secondaryBrowser || (secondaryBrowser = {}));
@@ -8141,7 +8079,7 @@ var location_location;
         if (!callback) {
             throw new Error('[location.getLocation] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isCurrentSDKVersionAtLeast(locationAPIsRequiredVersion)) {
             throw { errorCode: ErrorCode.OLD_PLATFORM };
         }
@@ -8151,7 +8089,7 @@ var location_location;
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(locationTelemetryVersionNumber, ApiName.Location_GetLocation), 'location.getLocation', [props], callback);
+        sendMessageToParent(getApiVersionTag(locationTelemetryVersionNumber, ApiName.Location_GetLocation), 'location.getLocation', [props], callback);
     }
     location_1.getLocation = getLocation;
     /**
@@ -8167,7 +8105,7 @@ var location_location;
         if (!callback) {
             throw new Error('[location.showLocation] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isCurrentSDKVersionAtLeast(locationAPIsRequiredVersion)) {
             throw { errorCode: ErrorCode.OLD_PLATFORM };
         }
@@ -8177,7 +8115,7 @@ var location_location;
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(locationTelemetryVersionNumber, ApiName.Location_ShowLocation), 'location.showLocation', [location], callback);
+        sendMessageToParent(getApiVersionTag(locationTelemetryVersionNumber, ApiName.Location_ShowLocation), 'location.showLocation', [location], callback);
     }
     location_1.showLocation = showLocation;
     /**
@@ -8191,7 +8129,7 @@ var location_location;
      * @returns boolean to represent whether Location is supported
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.location ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.location ? true : false;
     }
     location_1.isSupported = isSupported;
 })(location_location || (location_location = {}));
@@ -8369,8 +8307,8 @@ var meeting;
         if (!callback) {
             throw new Error('[get incoming client audio state] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetIncomingClientAudioState), 'getIncomingClientAudioState', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetIncomingClientAudioState), 'getIncomingClientAudioState', callback);
     }
     meeting.getIncomingClientAudioState = getIncomingClientAudioState;
     /**
@@ -8391,8 +8329,8 @@ var meeting;
         if (!callback) {
             throw new Error('[toggle incoming client audio] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_ToggleIncomingClientAudio), 'toggleIncomingClientAudio', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_ToggleIncomingClientAudio), 'toggleIncomingClientAudio', callback);
     }
     meeting.toggleIncomingClientAudio = toggleIncomingClientAudio;
     /**
@@ -8410,8 +8348,8 @@ var meeting;
         if (!callback) {
             throw new Error('[get meeting details] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage, FrameContexts.settings, FrameContexts.content);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetMeetingDetails), 'meeting.getMeetingDetails', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage, FrameContexts.settings, FrameContexts.content);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetMeetingDetails), 'meeting.getMeetingDetails', callback);
     }
     meeting.getMeetingDetails = getMeetingDetails;
     /**
@@ -8429,8 +8367,8 @@ var meeting;
         if (!callback) {
             throw new Error('[get Authentication Token For AnonymousUser] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage, FrameContexts.task);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetAuthenticationTokenForAnonymousUser), 'meeting.getAuthenticationTokenForAnonymousUser', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage, FrameContexts.task);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetAuthenticationTokenForAnonymousUser), 'meeting.getAuthenticationTokenForAnonymousUser', callback);
     }
     meeting.getAuthenticationTokenForAnonymousUser = getAuthenticationTokenForAnonymousUser;
     /**
@@ -8450,8 +8388,8 @@ var meeting;
         if (!callback) {
             throw new Error('[get live stream state] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetLiveStreamState), 'meeting.getLiveStreamState', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetLiveStreamState), 'meeting.getLiveStreamState', callback);
     }
     meeting.getLiveStreamState = getLiveStreamState;
     /**
@@ -8474,8 +8412,8 @@ var meeting;
         if (!callback) {
             throw new Error('[request start live streaming] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestStartLiveStreaming), 'meeting.requestStartLiveStreaming', [streamUrl, streamKey], callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestStartLiveStreaming), 'meeting.requestStartLiveStreaming', [streamUrl, streamKey], callback);
     }
     meeting.requestStartLiveStreaming = requestStartLiveStreaming;
     /**
@@ -8493,8 +8431,8 @@ var meeting;
         if (!callback) {
             throw new Error('[request stop live streaming] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestStopLiveStreaming), 'meeting.requestStopLiveStreaming', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestStopLiveStreaming), 'meeting.requestStopLiveStreaming', callback);
     }
     meeting.requestStopLiveStreaming = requestStopLiveStreaming;
     /**
@@ -8513,8 +8451,8 @@ var meeting;
         if (!handler) {
             throw new Error('[register live stream changed handler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
-        registerHandlerWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterLiveStreamChangedHandler), 'meeting.liveStreamChanged', handler);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
+        registerHandler(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterLiveStreamChangedHandler), 'meeting.liveStreamChanged', handler);
     }
     meeting.registerLiveStreamChangedHandler = registerLiveStreamChangedHandler;
     /**
@@ -8541,8 +8479,8 @@ var meeting;
         if (!callback) {
             throw new Error('[share app content to stage] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_ShareAppContentToStage), 'meeting.shareAppContentToStage', [appContentUrl, shareOptions], callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_ShareAppContentToStage), 'meeting.shareAppContentToStage', [appContentUrl, shareOptions], callback);
     }
     meeting.shareAppContentToStage = shareAppContentToStage;
     /**
@@ -8566,8 +8504,8 @@ var meeting;
         if (!callback) {
             throw new Error('[get app content stage sharing capabilities] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetAppContentStageSharingCapabilities), 'meeting.getAppContentStageSharingCapabilities', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetAppContentStageSharingCapabilities), 'meeting.getAppContentStageSharingCapabilities', callback);
     }
     meeting.getAppContentStageSharingCapabilities = getAppContentStageSharingCapabilities;
     /**
@@ -8583,8 +8521,8 @@ var meeting;
         if (!callback) {
             throw new Error('[stop sharing app content to stage] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_StopSharingAppContentToStage), 'meeting.stopSharingAppContentToStage', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_StopSharingAppContentToStage), 'meeting.stopSharingAppContentToStage', callback);
     }
     meeting.stopSharingAppContentToStage = stopSharingAppContentToStage;
     /**
@@ -8605,8 +8543,8 @@ var meeting;
         if (!callback) {
             throw new Error('[get app content stage sharing state] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetAppContentStageSharingState), 'meeting.getAppContentStageSharingState', callback);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_GetAppContentStageSharingState), 'meeting.getAppContentStageSharingState', callback);
     }
     meeting.getAppContentStageSharingState = getAppContentStageSharingState;
     /**
@@ -8628,8 +8566,8 @@ var meeting;
         if (!handler) {
             throw new Error('[registerSpeakingStateChangeHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        registerHandlerWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterSpeakingStateChangeHandler), 'meeting.speakingStateChanged', handler);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        registerHandler(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterSpeakingStateChangeHandler), 'meeting.speakingStateChanged', handler);
     }
     meeting.registerSpeakingStateChangeHandler = registerSpeakingStateChangeHandler;
     /**
@@ -8652,8 +8590,8 @@ var meeting;
         if (!handler) {
             throw new Error('[registerRaiseHandStateChangedHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        registerHandlerWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterRaiseHandStateChangedHandler), 'meeting.raiseHandStateChanged', handler);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        registerHandler(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterRaiseHandStateChangedHandler), 'meeting.raiseHandStateChanged', handler);
     }
     meeting.registerRaiseHandStateChangedHandler = registerRaiseHandStateChangedHandler;
     /**
@@ -8674,8 +8612,8 @@ var meeting;
         if (!handler) {
             throw new Error('[registerMeetingReactionReceivedHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        registerHandlerWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterMeetingReactionReceivedHandler), 'meeting.meetingReactionReceived', handler);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        registerHandler(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterMeetingReactionReceivedHandler), 'meeting.meetingReactionReceived', handler);
     }
     meeting.registerMeetingReactionReceivedHandler = registerMeetingReactionReceivedHandler;
     /**
@@ -8709,11 +8647,11 @@ var meeting;
          * @beta
          */
         function setOptions(shareInformation) {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+            ensureInitialized(runtime, FrameContexts.sidePanel);
             if (shareInformation.contentUrl) {
                 new URL(shareInformation.contentUrl);
             }
-            sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_AppShareButton_SetOptions), 'meeting.appShareButton.setOptions', [shareInformation]);
+            sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_AppShareButton_SetOptions), 'meeting.appShareButton.setOptions', [shareInformation]);
         }
         appShareButton.setOptions = setOptions;
     })(appShareButton = meeting.appShareButton || (meeting.appShareButton = {}));
@@ -8749,7 +8687,7 @@ var meeting;
         if (!requestAppAudioHandlingParams.micMuteStateChangedCallback) {
             throw new Error('[requestAppAudioHandling] Callback Mic mute state handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
         if (requestAppAudioHandlingParams.isAppHandlingAudio) {
             startAppAudioHandling(requestAppAudioHandlingParams, callback);
         }
@@ -8779,15 +8717,15 @@ var meeting;
                     setMicStateWithReason(micState, MicStateChangeReason.AppFailedToChange);
                 }
             });
-            registerHandlerWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterMicStateChangeHandler), 'meeting.micStateChanged', micStateChangedCallback);
+            registerHandler(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterMicStateChangeHandler), 'meeting.micStateChanged', micStateChangedCallback);
             const audioDeviceSelectionChangedCallback = (selectedDevicesInHost) => {
                 var _a;
                 (_a = requestAppAudioHandlingParams.audioDeviceSelectionChangedCallback) === null || _a === void 0 ? void 0 : _a.call(requestAppAudioHandlingParams, selectedDevicesInHost);
             };
-            registerHandlerWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterAudioDeviceSelectionChangedHandler), 'meeting.audioDeviceSelectionChanged', audioDeviceSelectionChangedCallback);
+            registerHandler(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RegisterAudioDeviceSelectionChangedHandler), 'meeting.audioDeviceSelectionChanged', audioDeviceSelectionChangedCallback);
             callback(isHostAudioless);
         };
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestAppAudioHandling), 'meeting.requestAppAudioHandling', [requestAppAudioHandlingParams.isAppHandlingAudio], callbackInternalRequest);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestAppAudioHandling), 'meeting.requestAppAudioHandling', [requestAppAudioHandlingParams.isAppHandlingAudio], callbackInternalRequest);
     }
     function stopAppAudioHandling(requestAppAudioHandlingParams, callback) {
         const callbackInternalStop = (error, isHostAudioless) => {
@@ -8808,7 +8746,7 @@ var meeting;
             }
             callback(isHostAudioless);
         };
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestAppAudioHandling), 'meeting.requestAppAudioHandling', [requestAppAudioHandlingParams.isAppHandlingAudio], callbackInternalStop);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_RequestAppAudioHandling), 'meeting.requestAppAudioHandling', [requestAppAudioHandlingParams.isAppHandlingAudio], callbackInternalStop);
     }
     /**
      * Notifies the host that the microphone state has changed in the app.
@@ -8828,8 +8766,8 @@ var meeting;
     }
     meeting.updateMicState = updateMicState;
     function setMicStateWithReason(micState, reason) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
-        sendMessageToParentWithVersion(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_SetMicStateWithReason), 'meeting.updateMicState', [micState, reason]);
+        ensureInitialized(runtime, FrameContexts.sidePanel, FrameContexts.meetingStage);
+        sendMessageToParent(getApiVersionTag(meetingTelemetryVersionNumber, ApiName.Meeting_SetMicStateWithReason), 'meeting.updateMicState', [micState, reason]);
     }
 })(meeting || (meeting = {}));
 
@@ -8882,10 +8820,10 @@ var monetization;
                     throw errorNotSupportedOnPlatform;
                 }
                 /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
-                resolve(sendAndHandleSdkErrorWithVersion(apiVersionTag, 'monetization.openPurchaseExperience', planInfo));
+                resolve(sendAndHandleSdkError(apiVersionTag, 'monetization.openPurchaseExperience', planInfo));
             });
         };
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         return callCallbackWithErrorOrResultOrNullFromPromiseAndReturnPromise(wrappedFunction, callback);
     }
     monetization.openPurchaseExperience = openPurchaseExperience;
@@ -8898,7 +8836,7 @@ var monetization;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.monetization ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.monetization ? true : false;
     }
     monetization.isSupported = isSupported;
 })(monetization || (monetization = {}));
@@ -8926,14 +8864,14 @@ var calendar;
      */
     function openCalendarItem(openCalendarItemParams) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw new Error('Not supported');
             }
             if (!openCalendarItemParams.itemId || !openCalendarItemParams.itemId.trim()) {
                 throw new Error('Must supply an itemId to openCalendarItem');
             }
-            resolve(sendAndHandleStatusAndReasonWithVersion(getApiVersionTag(calendarTelemetryVersionNumber, ApiName.Calendar_OpenCalendarItem), 'calendar.openCalendarItem', openCalendarItemParams));
+            resolve(sendAndHandleStatusAndReason(getApiVersionTag(calendarTelemetryVersionNumber, ApiName.Calendar_OpenCalendarItem), 'calendar.openCalendarItem', openCalendarItemParams));
         });
     }
     calendar.openCalendarItem = openCalendarItem;
@@ -8944,16 +8882,16 @@ var calendar;
      */
     function composeMeeting(composeMeetingParams) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw new Error('Not supported');
             }
             const apiVersionTag = getApiVersionTag(calendarTelemetryVersionNumber, ApiName.Calendar_ComposeMeeting);
-            if (runtime_runtime.isLegacyTeams) {
-                resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForCalendar(composeMeetingParams.attendees, composeMeetingParams.startTime, composeMeetingParams.endTime, composeMeetingParams.subject, composeMeetingParams.content)));
+            if (runtime.isLegacyTeams) {
+                resolve(sendAndHandleStatusAndReason(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForCalendar(composeMeetingParams.attendees, composeMeetingParams.startTime, composeMeetingParams.endTime, composeMeetingParams.subject, composeMeetingParams.content)));
             }
             else {
-                resolve(sendAndHandleStatusAndReasonWithVersion(apiVersionTag, 'calendar.composeMeeting', composeMeetingParams));
+                resolve(sendAndHandleStatusAndReason(apiVersionTag, 'calendar.composeMeeting', composeMeetingParams));
             }
         });
     }
@@ -8965,7 +8903,7 @@ var calendar;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.calendar ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.calendar ? true : false;
     }
     calendar.isSupported = isSupported;
 })(calendar || (calendar = {}));
@@ -8992,14 +8930,14 @@ var mail;
      */
     function openMailItem(openMailItemParams) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw new Error('Not supported');
             }
             if (!openMailItemParams.itemId || !openMailItemParams.itemId.trim()) {
                 throw new Error('Must supply an itemId to openMailItem');
             }
-            resolve(sendAndHandleStatusAndReasonWithVersion(getApiVersionTag(mailTelemetryVersionNumber, ApiName.Mail_OpenMailItem), 'mail.openMailItem', openMailItemParams));
+            resolve(sendAndHandleStatusAndReason(getApiVersionTag(mailTelemetryVersionNumber, ApiName.Mail_OpenMailItem), 'mail.openMailItem', openMailItemParams));
         });
     }
     mail.openMailItem = openMailItem;
@@ -9011,11 +8949,11 @@ var mail;
      */
     function composeMail(composeMailParams) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw new Error('Not supported');
             }
-            resolve(sendAndHandleStatusAndReasonWithVersion(getApiVersionTag(mailTelemetryVersionNumber, ApiName.Mail_ComposeMail), 'mail.composeMail', composeMailParams));
+            resolve(sendAndHandleStatusAndReason(getApiVersionTag(mailTelemetryVersionNumber, ApiName.Mail_ComposeMail), 'mail.composeMail', composeMailParams));
         });
     }
     mail.composeMail = composeMail;
@@ -9026,7 +8964,7 @@ var mail;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.mail ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.mail ? true : false;
     }
     mail.isSupported = isSupported;
     /** Defines compose mail types. */
@@ -9051,9 +8989,13 @@ var mail;
 
 
 
+
 /**
  * Namespace containing the set of APIs that support Teams-specific functionalities.
+ *
+ * v2 APIs telemetry file: All of APIs in this capability file should send out API version v2 ONLY
  */
+const teamsAPIsTelemetryVersionNumber_v2 = ApiVersionNumber.V_2;
 var teamsCore;
 (function (teamsCore) {
     /**
@@ -9061,7 +9003,7 @@ var teamsCore;
      */
     function enablePrintCapability() {
         if (!GlobalVars.printCapabilityEnabled) {
-            internalAPIs_ensureInitialized(runtime_runtime);
+            ensureInitialized(runtime);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
@@ -9088,7 +9030,7 @@ var teamsCore;
     /**
      * Registers a handler to be called when the page has been requested to load.
      *
-     * @remarks Check out [App Caching in Teams](https://learn.microsoft.com/en-us/microsoftteams/platform/tabs/how-to/app-caching)
+     * @remarks Check out [App Caching in Teams](https://learn.microsoft.com/microsoftteams/platform/tabs/how-to/app-caching)
      * for a more detailed explanation about using this API.
      *
      * @param handler - The handler to invoke when the page is loaded.
@@ -9096,7 +9038,7 @@ var teamsCore;
      * @beta
      */
     function registerOnLoadHandler(handler) {
-        registerOnLoadHandlerHelper(handler, () => {
+        registerOnLoadHandlerHelper(getApiVersionTag(teamsAPIsTelemetryVersionNumber_v2, ApiName.TeamsAPIs_RegisterOnLoadHandler), handler, () => {
             if (!isNullOrUndefined(handler) && !isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
@@ -9110,24 +9052,25 @@ var teamsCore;
      * @internal
      * Limited to Microsoft-internal use
      *
+     * @param apiVersionTag - The tag indicating API version number with name
      * @param handler - The handler to invoke when the page is loaded.
      * @param versionSpecificHelper - The helper function containing logic pertaining to a specific version of the API.
      *
      * @deprecated
      */
-    function registerOnLoadHandlerHelper(handler, versionSpecificHelper) {
+    function registerOnLoadHandlerHelper(apiVersionTag, handler, versionSpecificHelper) {
         // allow for registration cleanup even when not finished initializing
-        !isNullOrUndefined(handler) && internalAPIs_ensureInitialized(runtime_runtime);
+        !isNullOrUndefined(handler) && ensureInitialized(runtime);
         if (!isNullOrUndefined(handler) && versionSpecificHelper) {
             versionSpecificHelper();
         }
-        handlers_registerOnLoadHandler(handler);
+        handlers_registerOnLoadHandler(apiVersionTag, handler);
     }
     teamsCore.registerOnLoadHandlerHelper = registerOnLoadHandlerHelper;
     /**
      * Registers a handler to be called before the page is unloaded.
      *
-     * @remarks Check out [App Caching in Teams](https://learn.microsoft.com/en-us/microsoftteams/platform/tabs/how-to/app-caching)
+     * @remarks Check out [App Caching in Teams](https://learn.microsoft.com/microsoftteams/platform/tabs/how-to/app-caching)
      * for a more detailed explanation about using this API.
      *
      * @param handler - The handler to invoke before the page is unloaded. If this handler returns true the page should
@@ -9136,7 +9079,7 @@ var teamsCore;
      * @beta
      */
     function registerBeforeUnloadHandler(handler) {
-        registerBeforeUnloadHandlerHelper(handler, () => {
+        registerBeforeUnloadHandlerHelper(getApiVersionTag(teamsAPIsTelemetryVersionNumber_v2, ApiName.TeamsAPIs_RegisterBeforeUnloadHandler), handler, () => {
             if (!isNullOrUndefined(handler) && !isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
@@ -9156,13 +9099,13 @@ var teamsCore;
      *
      * @deprecated
      */
-    function registerBeforeUnloadHandlerHelper(handler, versionSpecificHelper) {
+    function registerBeforeUnloadHandlerHelper(apiVersionTag, handler, versionSpecificHelper) {
         // allow for registration cleanup even when not finished initializing
-        !isNullOrUndefined(handler) && internalAPIs_ensureInitialized(runtime_runtime);
+        !isNullOrUndefined(handler) && ensureInitialized(runtime);
         if (!isNullOrUndefined(handler) && versionSpecificHelper) {
             versionSpecificHelper();
         }
-        handlers_registerBeforeUnloadHandler(handler);
+        handlers_registerBeforeUnloadHandler(apiVersionTag, handler);
     }
     teamsCore.registerBeforeUnloadHandlerHelper = registerBeforeUnloadHandlerHelper;
     /**
@@ -9174,7 +9117,7 @@ var teamsCore;
      *
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.teamsCore ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.teamsCore ? true : false;
     }
     teamsCore.isSupported = isSupported;
 })(teamsCore || (teamsCore = {}));
@@ -9208,7 +9151,7 @@ var people;
      * @returns Promise of Array of PeoplePickerResult objects.
      */
     function selectPeople(param1, param2) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task, FrameContexts.settings);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task, FrameContexts.settings);
         let callback = undefined;
         let peoplePickerInputs = undefined;
         let apiVersionTag = '';
@@ -9235,7 +9178,7 @@ var people;
                 throw errorNotSupportedOnPlatform;
             }
             /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
-            resolve(sendAndHandleSdkErrorWithVersion(apiVersionTag, 'people.selectPeople', peoplePickerInputs));
+            resolve(sendAndHandleSdkError(apiVersionTag, 'people.selectPeople', peoplePickerInputs));
         });
     }
     /**
@@ -9245,7 +9188,7 @@ var people;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.people ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.people ? true : false;
     }
     people_1.isSupported = isSupported;
 })(people || (people = {}));
@@ -9340,7 +9283,7 @@ var profile;
      * @beta
      */
     function showProfile(showProfileRequest) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         return new Promise((resolve) => {
             const [isValid, message] = validateShowProfileRequest(showProfileRequest);
             if (!isValid) {
@@ -9358,7 +9301,7 @@ var profile;
                     height: showProfileRequest.targetElementBoundingRect.height,
                 },
             };
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(profileTelemetryVersionNumber, ApiName.Profile_ShowProfile), 'profile.showProfile', requestInternal));
+            resolve(sendAndHandleSdkError(getApiVersionTag(profileTelemetryVersionNumber, ApiName.Profile_ShowProfile), 'profile.showProfile', requestInternal));
         });
     }
     profile.showProfile = showProfile;
@@ -9371,7 +9314,7 @@ var profile;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.profile ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.profile ? true : false;
     }
     profile.isSupported = isSupported;
 })(profile || (profile = {}));
@@ -9667,7 +9610,7 @@ class TransformerWithMetadata {
             // The rectangle of pixels to copy from the texture. The first two rows are the header.
             const headerRect = { x: 0, y: 0, width: texture.codedWidth, height: 2 };
             // allocate buffer for the header
-            // The texture is in NV12 format (https://learn.microsoft.com/en-us/windows/win32/medfound/recommended-8-bit-yuv-formats-for-video-rendering#nv12).
+            // The texture is in NV12 format (https://learn.microsoft.com/windows/win32/medfound/recommended-8-bit-yuv-formats-for-video-rendering#nv12).
             // NV12 has one luma "luminance" plane Y and one UV plane with U and V values interleaved.
             // In NV12, chroma planes (blue and red) are subsampled in both the horizontal and vertical dimensions by a factor of 2.
             // So for a 2×2 group of pixels, you have 4 Y samples and 1 U and 1 V sample, each sample being 1 byte.
@@ -9711,7 +9654,7 @@ class TransformerWithMetadata {
                 },
             };
         });
-        registerHandlerWithVersion(getApiVersionTag(videoEffectsUtilTelemetryVersionNumber, ApiName.VideoEffectsUtils_TransformerWithMetadata_Constructor), 'video.mediaStream.audioInferenceDiscardStatusChange', ({ discardAudioInferenceResult }) => {
+        registerHandler(getApiVersionTag(videoEffectsUtilTelemetryVersionNumber, ApiName.VideoEffectsUtils_TransformerWithMetadata_Constructor), 'video.mediaStream.audioInferenceDiscardStatusChange', ({ discardAudioInferenceResult }) => {
             this.shouldDiscardAudioInferenceResult = discardAudioInferenceResult;
         });
     }
@@ -9725,11 +9668,11 @@ function createEffectParameterChangeCallback(callback, videoPerformanceMonitor)
         callback(effectId, effectParam)
             .then(() => {
             videoPerformanceMonitor === null || videoPerformanceMonitor === void 0 ? void 0 : videoPerformanceMonitor.reportVideoEffectChanged(effectId || '', effectParam);
-            sendMessageToParentWithVersion(getApiVersionTag(videoEffectsUtilTelemetryVersionNumber, ApiName.VideoEffectsUtils_ReportVideoEffectChanged), 'video.videoEffectReadiness', [true, effectId, undefined, effectParam]);
+            sendMessageToParent(getApiVersionTag(videoEffectsUtilTelemetryVersionNumber, ApiName.VideoEffectsUtils_ReportVideoEffectChanged), 'video.videoEffectReadiness', [true, effectId, undefined, effectParam]);
         })
             .catch((reason) => {
             const validReason = reason in videoEffects.EffectFailureReason ? reason : videoEffects.EffectFailureReason.InitializationFailure;
-            sendMessageToParentWithVersion(getApiVersionTag(videoEffectsUtilTelemetryVersionNumber, ApiName.VideoEffectsUtils_EffectFailure), 'video.videoEffectReadiness', [false, effectId, validReason, effectParam]);
+            sendMessageToParent(getApiVersionTag(videoEffectsUtilTelemetryVersionNumber, ApiName.VideoEffectsUtils_EffectFailure), 'video.videoEffectReadiness', [false, effectId, validReason, effectParam]);
         });
     };
 }
@@ -10031,7 +9974,7 @@ var videoEffects;
 (function (videoEffects) {
     const videoPerformanceMonitor = inServerSideRenderingEnvironment()
         ? undefined
-        : new VideoPerformanceMonitor(sendMessageToParentWithVersion);
+        : new VideoPerformanceMonitor(sendMessageToParent);
     /**
      * Video frame format enum, currently only support NV12
      * @beta
@@ -10110,14 +10053,14 @@ var videoEffects;
      * ```
      */
     function registerForVideoFrame(parameters) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         if (!parameters.videoFrameHandler || !parameters.videoBufferHandler) {
             throw new Error('Both videoFrameHandler and videoBufferHandler must be provided');
         }
-        registerHandlerWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterSetFrameProcessTimeLimitHandler), 'video.setFrameProcessTimeLimit', (timeLimitInfo) => videoPerformanceMonitor === null || videoPerformanceMonitor === void 0 ? void 0 : videoPerformanceMonitor.setFrameProcessTimeLimit(timeLimitInfo.timeLimit), false);
+        registerHandler(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterSetFrameProcessTimeLimitHandler), 'video.setFrameProcessTimeLimit', (timeLimitInfo) => videoPerformanceMonitor === null || videoPerformanceMonitor === void 0 ? void 0 : videoPerformanceMonitor.setFrameProcessTimeLimit(timeLimitInfo.timeLimit), false);
         if (doesSupportMediaStream()) {
             registerForMediaStream(parameters.videoFrameHandler, parameters.config);
         }
@@ -10140,11 +10083,11 @@ var videoEffects;
      * @param effectId - Newly selected effect id.
      */
     function notifySelectedVideoEffectChanged(effectChangeType, effectId) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_NotifySelectedVideoEffectChanged), 'video.videoEffectChanged', [effectChangeType, effectId]);
+        sendMessageToParent(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_NotifySelectedVideoEffectChanged), 'video.videoEffectChanged', [effectChangeType, effectId]);
     }
     videoEffects.notifySelectedVideoEffectChanged = notifySelectedVideoEffectChanged;
     /**
@@ -10153,12 +10096,12 @@ var videoEffects;
      * @param callback - Function to be called when new video effect is applied.
      */
     function registerForVideoEffect(callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterEffectParameterChangeHandler), 'video.effectParameterChange', createEffectParameterChangeCallback(callback, videoPerformanceMonitor), false);
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterForVideoEffect), 'video.registerForVideoEffect');
+        registerHandler(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterEffectParameterChangeHandler), 'video.effectParameterChange', createEffectParameterChangeCallback(callback, videoPerformanceMonitor), false);
+        sendMessageToParent(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterForVideoEffect), 'video.registerForVideoEffect');
     }
     videoEffects.registerForVideoEffect = registerForVideoEffect;
     /**
@@ -10167,7 +10110,7 @@ var videoEffects;
      * @beta
      */
     function notifyVideoFrameProcessed(timestamp) {
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_NotifyVideoFrameProcessed), 'video.videoFrameProcessed', [timestamp]);
+        sendMessageToParent(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_NotifyVideoFrameProcessed), 'video.videoFrameProcessed', [timestamp]);
     }
     /**
      * Sending error notification to host
@@ -10175,7 +10118,7 @@ var videoEffects;
      * @param errorMessage - The error message that will be sent to the host
      */
     function notifyError(errorMessage) {
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_NotifyError), 'video.notifyError', [errorMessage]);
+        sendMessageToParent(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_NotifyError), 'video.notifyError', [errorMessage]);
     }
     /**
      * Checks if video capability is supported by the host.
@@ -10186,24 +10129,24 @@ var videoEffects;
      *
      */
     function isSupported() {
-        return (internalAPIs_ensureInitialized(runtime_runtime) &&
-            !!runtime_runtime.supports.video &&
+        return (ensureInitialized(runtime) &&
+            !!runtime.supports.video &&
             /** A host should support either mediaStream or sharedFrame sub-capability to support the video capability */
-            (!!runtime_runtime.supports.video.mediaStream || !!runtime_runtime.supports.video.sharedFrame));
+            (!!runtime.supports.video.mediaStream || !!runtime.supports.video.sharedFrame));
     }
     videoEffects.isSupported = isSupported;
     function registerForMediaStream(videoFrameHandler, config) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported() || !doesSupportMediaStream()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterStartVideoExtensibilityVideoStreamHandler), 'video.startVideoExtensibilityVideoStream', (mediaStreamInfo) => videoEffects_awaiter(this, void 0, void 0, function* () {
+        registerHandler(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterStartVideoExtensibilityVideoStreamHandler), 'video.startVideoExtensibilityVideoStream', (mediaStreamInfo) => videoEffects_awaiter(this, void 0, void 0, function* () {
             // when a new streamId is ready:
             const { streamId } = mediaStreamInfo;
             const monitoredVideoFrameHandler = createMonitoredVideoFrameHandler(videoFrameHandler, videoPerformanceMonitor);
             yield processMediaStream(streamId, monitoredVideoFrameHandler, notifyError, videoPerformanceMonitor);
         }), false);
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_MediaStream_RegisterForVideoFrame), 'video.mediaStream.registerForVideoFrame', [config]);
+        sendMessageToParent(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_MediaStream_RegisterForVideoFrame), 'video.mediaStream.registerForVideoFrame', [config]);
     }
     function createMonitoredVideoFrameHandler(videoFrameHandler, videoPerformanceMonitor) {
         return (videoFrameData) => videoEffects_awaiter(this, void 0, void 0, function* () {
@@ -10216,11 +10159,11 @@ var videoEffects;
         });
     }
     function registerForVideoBuffer(videoBufferHandler, config) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported() || !doesSupportSharedFrame()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterForVideoBufferHandler), 'video.newVideoFrame', 
+        registerHandler(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterForVideoBufferHandler), 'video.newVideoFrame', 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (videoBufferData) => {
             if (videoBufferData) {
@@ -10232,7 +10175,7 @@ var videoEffects;
                 }, notifyError);
             }
         }, false);
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterForVideoFrame), 'video.registerForVideoFrame', [config]);
+        sendMessageToParent(getApiVersionTag(videoEffectsTelemetryVersionNumber, ApiName.VideoEffects_RegisterForVideoFrame), 'video.registerForVideoFrame', [config]);
     }
     function normalizeVideoBufferData(videoBufferData) {
         if ('videoFrameBuffer' in videoBufferData) {
@@ -10246,9 +10189,9 @@ var videoEffects;
     }
     function doesSupportMediaStream() {
         var _a;
-        return (internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel) &&
+        return (ensureInitialized(runtime, FrameContexts.sidePanel) &&
             isTextureStreamAvailable() &&
-            !!((_a = runtime_runtime.supports.video) === null || _a === void 0 ? void 0 : _a.mediaStream));
+            !!((_a = runtime.supports.video) === null || _a === void 0 ? void 0 : _a.mediaStream));
     }
     function isTextureStreamAvailable() {
         var _a, _b, _c, _d;
@@ -10256,7 +10199,7 @@ var videoEffects;
     }
     function doesSupportSharedFrame() {
         var _a;
-        return internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel) && !!((_a = runtime_runtime.supports.video) === null || _a === void 0 ? void 0 : _a.sharedFrame);
+        return ensureInitialized(runtime, FrameContexts.sidePanel) && !!((_a = runtime.supports.video) === null || _a === void 0 ? void 0 : _a.sharedFrame);
     }
 })(videoEffects || (videoEffects = {})); //end of video namespace
 
@@ -10326,14 +10269,14 @@ var search;
      * @beta
      */
     function registerHandlers(onClosedHandler, onExecuteHandler, onChangeHandler) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_RegisterOnClosedHandler), onClosedHandlerName, onClosedHandler);
-        registerHandlerWithVersion(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_RegisterOnExecutedHandler), onExecutedHandlerName, onExecuteHandler);
+        registerHandler(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_RegisterOnClosedHandler), onClosedHandlerName, onClosedHandler);
+        registerHandler(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_RegisterOnExecutedHandler), onExecutedHandlerName, onExecuteHandler);
         if (onChangeHandler) {
-            registerHandlerWithVersion(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_RegisterOnChangeHandler), onChangeHandlerName, onChangeHandler);
+            registerHandler(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_RegisterOnChangeHandler), onChangeHandlerName, onChangeHandler);
         }
     }
     search.registerHandlers = registerHandlers;
@@ -10344,13 +10287,13 @@ var search;
      * @beta
      */
     function unregisterHandlers() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         // This should let the host know to stop making the app scope show up in the search experience
         // Can also be used to clean up handlers on the host if desired
-        sendMessageToParentWithVersion(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_UnregisterHandlers), 'search.unregister');
+        sendMessageToParent(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_UnregisterHandlers), 'search.unregister');
         removeHandler(onChangeHandlerName);
         removeHandler(onClosedHandlerName);
         removeHandler(onExecutedHandlerName);
@@ -10365,7 +10308,7 @@ var search;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.search ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.search ? true : false;
     }
     search.isSupported = isSupported;
     /**
@@ -10375,11 +10318,11 @@ var search;
      */
     function closeSearch() {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw new Error('Not supported');
             }
-            resolve(sendAndHandleStatusAndReasonWithVersion(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_CloseSearch), 'search.closeSearch'));
+            resolve(sendAndHandleStatusAndReason(getApiVersionTag(searchTelemetryVersionNumber, ApiName.Search_CloseSearch), 'search.closeSearch'));
         });
     }
     search.closeSearch = closeSearch;
@@ -10393,7 +10336,6 @@ var search;
 
 
 
-/* eslint-disable @typescript-eslint/no-unused-vars */
 const sharingTelemetryVersionNumber_v1 = ApiVersionNumber.V_1;
 const sharingTelemetryVersionNumber_v2 = ApiVersionNumber.V_2;
 /**
@@ -10411,7 +10353,6 @@ var sharing;
         shareWebContent: 'sharing.shareWebContent',
     };
     function shareWebContent(shareWebContentRequest, callback) {
-        const apiVersionTag = '';
         // validate the given input (synchronous check)
         try {
             validateNonEmptyContent(shareWebContentRequest);
@@ -10423,16 +10364,19 @@ var sharing;
             const wrappedFunction = () => Promise.reject(err);
             return callCallbackWithSdkErrorFromPromiseAndReturnPromise(wrappedFunction, callback);
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
-        return callCallbackWithSdkErrorFromPromiseAndReturnPromise(shareWebContentHelper, callback, shareWebContentRequest);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+        const apiVersionTag = callback
+            ? getApiVersionTag(sharingTelemetryVersionNumber_v1, ApiName.Sharing_ShareWebContent)
+            : getApiVersionTag(sharingTelemetryVersionNumber_v2, ApiName.Sharing_ShareWebContent);
+        return callCallbackWithSdkErrorFromPromiseAndReturnPromise(shareWebContentHelper, callback, apiVersionTag, shareWebContentRequest);
     }
     sharing.shareWebContent = shareWebContent;
-    function shareWebContentHelper(shareWebContentRequest) {
+    function shareWebContentHelper(apiVersionTag, shareWebContentRequest) {
         return new Promise((resolve) => {
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            resolve(sendAndHandleSdkError(sharing.SharingAPIMessages.shareWebContent, shareWebContentRequest));
+            resolve(sendAndHandleSdkError(apiVersionTag, sharing.SharingAPIMessages.shareWebContent, shareWebContentRequest));
         });
     }
     /**
@@ -10490,7 +10434,7 @@ var sharing;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.sharing ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.sharing ? true : false;
     }
     sharing.isSupported = isSupported;
 })(sharing || (sharing = {}));
@@ -10541,14 +10485,14 @@ var stageView;
      */
     function open(stageViewParams) {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+            ensureInitialized(runtime, FrameContexts.content);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
             if (!stageViewParams) {
                 throw new Error('[stageView.open] Stage view params cannot be null');
             }
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(stageViewTelemetryVersionNumber, ApiName.StageView_Open), 'stageView.open', stageViewParams));
+            resolve(sendAndHandleSdkError(getApiVersionTag(stageViewTelemetryVersionNumber, ApiName.StageView_Open), 'stageView.open', stageViewParams));
         });
     }
     stageView.open = open;
@@ -10561,7 +10505,7 @@ var stageView;
      *
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.stageView ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.stageView ? true : false;
     }
     stageView.isSupported = isSupported;
 })(stageView || (stageView = {}));
@@ -10634,12 +10578,12 @@ var visualMedia;
      * @beta
      */
     function hasPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!image.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.Media;
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_HasPermission), 'permissions.has', permissions);
+        return sendAndHandleSdkError(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_HasPermission), 'permissions.has', permissions);
     }
     visualMedia.hasPermission = hasPermission;
     /**
@@ -10652,12 +10596,12 @@ var visualMedia;
      * @beta
      */
     function requestPermission() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!image.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         const permissions = DevicePermission.Media;
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_RequestPermission), 'permissions.request', permissions);
+        return sendAndHandleSdkError(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_RequestPermission), 'permissions.request', permissions);
     }
     visualMedia.requestPermission = requestPermission;
     /**
@@ -10679,10 +10623,10 @@ var visualMedia;
          */
         function captureImages(cameraImageInputs) {
             return visualMedia_awaiter(this, void 0, void 0, function* () {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
                 ensureSupported();
                 ensureImageInputValid(cameraImageInputs);
-                const files = yield sendAndHandleSdkErrorWithVersion(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_Image_CaptureImages), 'visualMedia.image.captureImages', cameraImageInputs);
+                const files = yield sendAndHandleSdkError(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_Image_CaptureImages), 'visualMedia.image.captureImages', cameraImageInputs);
                 ensureResponseValid(cameraImageInputs.maxVisualMediaCount, files);
                 return files;
             });
@@ -10699,10 +10643,10 @@ var visualMedia;
          */
         function retrieveImages(galleryImageInputs) {
             return visualMedia_awaiter(this, void 0, void 0, function* () {
-                internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+                ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
                 ensureSupported();
                 ensureImageInputValid(galleryImageInputs);
-                const files = yield sendAndHandleSdkErrorWithVersion(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_Image_RetrieveImages), 'visualMedia.image.retrieveImages', galleryImageInputs);
+                const files = yield sendAndHandleSdkError(getApiVersionTag(visualMediaTelemetryVersionNumber, ApiName.VisualMedia_Image_RetrieveImages), 'visualMedia.image.retrieveImages', galleryImageInputs);
                 ensureResponseValid(galleryImageInputs.maxVisualMediaCount, files);
                 return files;
             });
@@ -10717,10 +10661,10 @@ var visualMedia;
          * @beta
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) &&
-                runtime_runtime.supports.visualMedia &&
-                runtime_runtime.supports.visualMedia.image &&
-                runtime_runtime.supports.permissions
+            return ensureInitialized(runtime) &&
+                runtime.supports.visualMedia &&
+                runtime.supports.visualMedia.image &&
+                runtime.supports.permissions
                 ? true
                 : false;
         }
@@ -10787,7 +10731,7 @@ var webStorage;
      * @beta
      */
     function isWebStorageClearedOnUserLogOut() {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         return isSupported();
     }
     webStorage.isWebStorageClearedOnUserLogOut = isWebStorageClearedOnUserLogOut;
@@ -10800,7 +10744,7 @@ var webStorage;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.webStorage ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.webStorage ? true : false;
     }
     webStorage.isSupported = isSupported;
 })(webStorage || (webStorage = {}));
@@ -10849,12 +10793,12 @@ var call;
         const apiVersionTag = getApiVersionTag(callTelemetryVersionNumber, ApiName.Call_StartCall);
         return new Promise((resolve) => {
             var _a;
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            if (runtime_runtime.isLegacyTeams) {
-                resolve(sendAndUnwrapWithVersion(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForCall(startCallParams.targets, (_a = startCallParams.requestedModalities) === null || _a === void 0 ? void 0 : _a.includes(CallModalities.Video), startCallParams.source)).then((result) => {
+            if (runtime.isLegacyTeams) {
+                resolve(sendAndUnwrap(apiVersionTag, 'executeDeepLink', createTeamsDeepLinkForCall(startCallParams.targets, (_a = startCallParams.requestedModalities) === null || _a === void 0 ? void 0 : _a.includes(CallModalities.Video), startCallParams.source)).then((result) => {
                     if (!result) {
                         throw new Error(errorCallNotStarted);
                     }
@@ -10862,7 +10806,7 @@ var call;
                 }));
             }
             else {
-                return sendMessageToParentWithVersion(apiVersionTag, 'call.startCall', [startCallParams], resolve);
+                return sendMessageToParent(apiVersionTag, 'call.startCall', [startCallParams], resolve);
             }
         });
     }
@@ -10874,7 +10818,7 @@ var call;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.call ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.call ? true : false;
     }
     call.isSupported = isSupported;
 })(call || (call = {}));
@@ -10963,6 +10907,10 @@ var appInitialization;
 
 
 const Files3PLogger = getLogger('thirdPartyCloudStorage');
+/**
+ * v2 APIs telemetry file: All of APIs in this capability file should send out API version v2 ONLY
+ */
+const thirdPartyCloudStorageTelemetryVersionNumber = ApiVersionNumber.V_2;
 /**
  * Extended files API 3P storage providers, features like sending Blob from Teams to 3P app on user
  * actions like drag and drop to compose
@@ -11001,7 +10949,7 @@ var thirdPartyCloudStorage;
             dragAndDropFileCallback([], invalidInput);
             return;
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -11013,7 +10961,7 @@ var thirdPartyCloudStorage;
             callback = dragAndDropFileCallback;
         }
         lastChunkVal = true;
-        sendMessageToParent('thirdPartyCloudStorage.getDragAndDropFiles', [dragAndDropInput], handleGetDragAndDropFilesCallbackRequest);
+        sendMessageToParent(getApiVersionTag(thirdPartyCloudStorageTelemetryVersionNumber, ApiName.ThirdPartyCloudStorage_GetDragAndDropFiles), 'thirdPartyCloudStorage.getDragAndDropFiles', [dragAndDropInput], handleGetDragAndDropFilesCallbackRequest);
     }
     thirdPartyCloudStorage.getDragAndDropFiles = getDragAndDropFiles;
     function handleGetDragAndDropFilesCallbackRequest(fileResult) {
@@ -11099,7 +11047,7 @@ var thirdPartyCloudStorage;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.thirdPartyCloudStorage ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.thirdPartyCloudStorage ? true : false;
     }
     thirdPartyCloudStorage.isSupported = isSupported;
 })(thirdPartyCloudStorage || (thirdPartyCloudStorage = {}));
@@ -11166,7 +11114,7 @@ function print() {
  */
 function getContext(callback) {
     ensureInitializeCalled();
-    sendMessageToParentWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_GetContext), 'getContext', (context) => {
+    sendMessageToParent(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_GetContext), 'getContext', (context) => {
         if (!context.frameContext) {
             // Fallback logic for frameContext properties
             context.frameContext = GlobalVars.frameContext;
@@ -11196,7 +11144,7 @@ function publicAPIs_registerOnThemeChangeHandler(handler) {
  * @param handler - The handler to invoke when the user toggles full-screen view for a tab.
  */
 function registerFullScreenHandler(handler) {
-    registerHandlerHelperWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterFullScreenHandler), 'fullScreenChange', handler, []);
+    registerHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterFullScreenHandler), 'fullScreenChange', handler, []);
 }
 /**
  * @deprecated
@@ -11208,7 +11156,7 @@ function registerFullScreenHandler(handler) {
  * @param handler - The handler to invoke when the personal app button is clicked in the app bar.
  */
 function registerAppButtonClickHandler(handler) {
-    registerHandlerHelperWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterAppButtonClickHandler), 'appButtonClick', handler, [FrameContexts.content]);
+    registerHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterAppButtonClickHandler), 'appButtonClick', handler, [FrameContexts.content]);
 }
 /**
  * @deprecated
@@ -11220,7 +11168,7 @@ function registerAppButtonClickHandler(handler) {
  * @param handler - The handler to invoke when entering hover of the personal app button in the app bar.
  */
 function registerAppButtonHoverEnterHandler(handler) {
-    registerHandlerHelperWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterAppButtonHoverEnterHandler), 'appButtonHoverEnter', handler, [FrameContexts.content]);
+    registerHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterAppButtonHoverEnterHandler), 'appButtonHoverEnter', handler, [FrameContexts.content]);
 }
 /**
  * @deprecated
@@ -11232,7 +11180,7 @@ function registerAppButtonHoverEnterHandler(handler) {
  *
  */
 function registerAppButtonHoverLeaveHandler(handler) {
-    registerHandlerHelperWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterAppButtonHoverLeaveHandler), 'appButtonHoverLeave', handler, [FrameContexts.content]);
+    registerHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterAppButtonHoverLeaveHandler), 'appButtonHoverLeave', handler, [FrameContexts.content]);
 }
 /**
  * @deprecated
@@ -11258,7 +11206,7 @@ function registerBackButtonHandler(handler) {
  * @param handler - The handler to invoke when the page is loaded.
  */
 function registerOnLoadHandler(handler) {
-    teamsCore.registerOnLoadHandlerHelper(handler);
+    teamsCore.registerOnLoadHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterOnLoadHandler), handler);
 }
 /**
  * @deprecated
@@ -11271,7 +11219,7 @@ function registerOnLoadHandler(handler) {
  * invoke the readyToUnload function provided to it once it's ready to be unloaded.
  */
 function registerBeforeUnloadHandler(handler) {
-    teamsCore.registerBeforeUnloadHandlerHelper(handler);
+    teamsCore.registerBeforeUnloadHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterBeforeUnloadHandler), handler);
 }
 /**
  * @deprecated
@@ -11283,7 +11231,7 @@ function registerBeforeUnloadHandler(handler) {
  * @param handler - The handler to invoked by the app when they want the focus to be in the place of their choice.
  */
 function registerFocusEnterHandler(handler) {
-    registerHandlerHelperWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterFocusEnterHandler), 'focusEnter', handler, []);
+    registerHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterFocusEnterHandler), 'focusEnter', handler, []);
 }
 /**
  * @deprecated
@@ -11294,7 +11242,7 @@ function registerFocusEnterHandler(handler) {
  * @param handler - The handler to invoke when the user click on Settings.
  */
 function registerChangeSettingsHandler(handler) {
-    registerHandlerHelperWithVersion(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterChangeSettingsHandler), 'changeSettings', handler, [FrameContexts.content]);
+    registerHandlerHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_RegisterChangeSettingsHandler), 'changeSettings', handler, [FrameContexts.content]);
 }
 /**
  * @deprecated
@@ -11307,7 +11255,7 @@ function registerChangeSettingsHandler(handler) {
  * @param tabInstanceParameters - OPTIONAL Flags that specify whether to scope call to favorite teams or channels.
  */
 function getTabInstances(callback, tabInstanceParameters) {
-    internalAPIs_ensureInitialized(runtime_runtime);
+    ensureInitialized(runtime);
     getTabInstancesHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_GetTabInstances), tabInstanceParameters).then((tabInfo) => {
         callback(tabInfo);
     });
@@ -11322,7 +11270,7 @@ function getTabInstances(callback, tabInstanceParameters) {
  * @param tabInstanceParameters - OPTIONAL Ignored, kept for future use
  */
 function getMruTabInstances(callback, tabInstanceParameters) {
-    internalAPIs_ensureInitialized(runtime_runtime);
+    ensureInitialized(runtime);
     getMruTabInstancesHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_GetMruTabInstances), tabInstanceParameters).then((tabInfo) => {
         callback(tabInfo);
     });
@@ -11351,7 +11299,7 @@ function shareDeepLink(deepLinkParameters) {
  * @param deepLink - deep link.
  */
 function executeDeepLink(deepLink, onComplete) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
     const completionHandler = onComplete !== null && onComplete !== void 0 ? onComplete : getGenericOnCompleteHandler();
     openLinkHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_ExecuteDeepLink), deepLink)
         .then(() => {
@@ -11384,7 +11332,7 @@ function setFrameContext(frameContext) {
  * They must have https: protocol otherwise they will be ignored. Example: https:www.example.com
  */
 function initializeWithFrameContext(frameContext, callback, validMessageOrigins) {
-    appInitializeHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_Initialize), validMessageOrigins).then(() => callback && callback());
+    appInitializeHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_InitializeWithFrameContext), validMessageOrigins).then(() => callback && callback());
     setCurrentFrameHelper(getApiVersionTag(publicAPIsTelemetryVersionNumber, ApiName.PublicAPIs_SetFrameContext), frameContext);
 }
 
@@ -11420,7 +11368,7 @@ function returnFocus(navigateForward) {
  * @param onComplete - The callback to invoke when the action is complete.
  */
 function navigateToTab(tabInstance, onComplete) {
-    internalAPIs_ensureInitialized(runtime_runtime);
+    ensureInitialized(runtime);
     const completionHandler = onComplete !== null && onComplete !== void 0 ? onComplete : getGenericOnCompleteHandler();
     tabsNavigateToTabHelper(getApiVersionTag(navigationTelemetryVersionNumber, ApiName.Navigation_NavigateToTab), tabInstance)
         .then(() => {
@@ -11444,7 +11392,7 @@ function navigateToTab(tabInstance, onComplete) {
  * @param onComplete - The callback to invoke when the action is complete.
  */
 function navigateCrossDomain(url, onComplete) {
-    internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.remove, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
+    ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.settings, FrameContexts.remove, FrameContexts.task, FrameContexts.stage, FrameContexts.meetingStage);
     const completionHandler = onComplete !== null && onComplete !== void 0 ? onComplete : getGenericOnCompleteHandler();
     navigateCrossDomainHelper(getApiVersionTag(navigationTelemetryVersionNumber, ApiName.Navigation_NavigateCrossDomain), url)
         .then(() => {
@@ -11464,7 +11412,7 @@ function navigateCrossDomain(url, onComplete) {
  * @param onComplete - The callback to invoke when the action is complete.
  */
 function navigateBack(onComplete) {
-    internalAPIs_ensureInitialized(runtime_runtime);
+    ensureInitialized(runtime);
     const completionHandler = onComplete !== null && onComplete !== void 0 ? onComplete : getGenericOnCompleteHandler();
     backStackNavigateBackHelper(getApiVersionTag(navigationTelemetryVersionNumber, ApiName.Navigation_NavigateBack))
         .then(() => {
@@ -11517,7 +11465,7 @@ var settings;
      * @param callback - The callback to invoke when the {@link Settings} object is retrieved.
      */
     function getSettings(callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.remove, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.remove, FrameContexts.sidePanel);
         getConfigHelper(getApiVersionTag(settingsTelemetryVersionNumber, ApiName.Settings_GetSettings)).then((config) => {
             callback(config);
         });
@@ -11533,7 +11481,7 @@ var settings;
      * @param - Set the desired settings for this instance.
      */
     function setSettings(instanceSettings, onComplete) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.settings, FrameContexts.sidePanel);
         const completionHandler = onComplete !== null && onComplete !== void 0 ? onComplete : getGenericOnCompleteHandler();
         configSetConfigHelper(getApiVersionTag(settingsTelemetryVersionNumber, ApiName.Settings_SetSettings), instanceSettings)
             .then(() => {
@@ -11631,12 +11579,12 @@ var tasks;
             ? (sdkResponse) => { var _a, _b; return submitHandler((_a = sdkResponse.err) !== null && _a !== void 0 ? _a : '', (_b = sdkResponse.result) !== null && _b !== void 0 ? _b : ''); }
             : undefined;
         if (taskInfo.card === undefined && taskInfo.url === undefined) {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
-            sendMessageToParentWithVersion(apiVersionTag, 'tasks.startTask', [taskInfo], submitHandler);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+            sendMessageToParent(apiVersionTag, 'tasks.startTask', [taskInfo], submitHandler);
         }
         else if (taskInfo.card) {
-            internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
-            sendMessageToParentWithVersion(apiVersionTag, 'tasks.startTask', [taskInfo], submitHandler);
+            ensureInitialized(runtime, FrameContexts.content, FrameContexts.sidePanel, FrameContexts.meetingStage);
+            sendMessageToParent(apiVersionTag, 'tasks.startTask', [taskInfo], submitHandler);
         }
         else if (taskInfo.completionBotId !== undefined) {
             botUrlOpenHelper(apiVersionTag, getBotUrlDialogInfoFromTaskInfo(taskInfo), dialogSubmitHandler);
@@ -11811,8 +11759,8 @@ var liveShare;
      * @throws Error if {@linkcode app.initialize} has not successfully completed
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.meetingStage, FrameContexts.sidePanel) &&
-            runtime_runtime.supports.interactive
+        return ensureInitialized(runtime, FrameContexts.meetingStage, FrameContexts.sidePanel) &&
+            runtime.supports.interactive
             ? true
             : false;
     }
@@ -11835,7 +11783,7 @@ class LiveShareHost {
     getFluidTenantInfo() {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetFluidTenantInfo), 'interactive.getFluidTenantInfo'));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetFluidTenantInfo), 'interactive.getFluidTenantInfo'));
         });
     }
     /**
@@ -11848,7 +11796,7 @@ class LiveShareHost {
     getFluidToken(containerId) {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetFluidToken), 'interactive.getFluidToken', 
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetFluidToken), 'interactive.getFluidToken', 
             // eslint-disable-next-line strict-null-checks/all
             containerId));
         });
@@ -11860,7 +11808,7 @@ class LiveShareHost {
     getFluidContainerId() {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetFluidContainerId), 'interactive.getFluidContainerId'));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetFluidContainerId), 'interactive.getFluidContainerId'));
         });
     }
     /**
@@ -11876,7 +11824,7 @@ class LiveShareHost {
     setFluidContainerId(containerId) {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_SetFluidContainerId), 'interactive.setFluidContainerId', containerId));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_SetFluidContainerId), 'interactive.setFluidContainerId', containerId));
         });
     }
     /**
@@ -11886,7 +11834,7 @@ class LiveShareHost {
     getNtpTime() {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetNtpTime), 'interactive.getNtpTime'));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetNtpTime), 'interactive.getNtpTime'));
         });
     }
     /**
@@ -11899,7 +11847,7 @@ class LiveShareHost {
     registerClientId(clientId) {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_RegisterClientId), 'interactive.registerClientId', clientId));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_RegisterClientId), 'interactive.registerClientId', clientId));
         });
     }
     /**
@@ -11912,7 +11860,7 @@ class LiveShareHost {
     getClientRoles(clientId) {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetClientRoles), 'interactive.getClientRoles', clientId));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetClientRoles), 'interactive.getClientRoles', clientId));
         });
     }
     /**
@@ -11925,7 +11873,7 @@ class LiveShareHost {
     getClientInfo(clientId) {
         ensureSupported();
         return new Promise((resolve) => {
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetClientInfo), 'interactive.getClientInfo', clientId));
+            resolve(sendAndHandleSdkError(getApiVersionTag(interactiveTelemetryVersionNumber, ApiName.Interactive_GetClientInfo), 'interactive.getClientInfo', clientId));
         });
     }
     /**
@@ -12263,11 +12211,11 @@ var marketplace;
      * @beta
      */
     function getCart() {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_GetCart), 'marketplace.getCart', marketplace.cartVersion).then(deserializeCart);
+        return sendAndHandleSdkError(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_GetCart), 'marketplace.getCart', marketplace.cartVersion).then(deserializeCart);
     }
     marketplace.getCart = getCart;
     /**
@@ -12278,7 +12226,7 @@ var marketplace;
      * @beta
      */
     function addOrUpdateCartItems(addOrUpdateCartItemsParams) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -12287,7 +12235,7 @@ var marketplace;
         }
         validateUuid(addOrUpdateCartItemsParams === null || addOrUpdateCartItemsParams === void 0 ? void 0 : addOrUpdateCartItemsParams.cartId);
         validateCartItems(addOrUpdateCartItemsParams === null || addOrUpdateCartItemsParams === void 0 ? void 0 : addOrUpdateCartItemsParams.cartItems);
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_AddOrUpdateCartItems), 'marketplace.addOrUpdateCartItems', Object.assign(Object.assign({}, addOrUpdateCartItemsParams), { cartItems: serializeCartItems(addOrUpdateCartItemsParams.cartItems), cartVersion: marketplace.cartVersion })).then(deserializeCart);
+        return sendAndHandleSdkError(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_AddOrUpdateCartItems), 'marketplace.addOrUpdateCartItems', Object.assign(Object.assign({}, addOrUpdateCartItemsParams), { cartItems: serializeCartItems(addOrUpdateCartItemsParams.cartItems), cartVersion: marketplace.cartVersion })).then(deserializeCart);
     }
     marketplace.addOrUpdateCartItems = addOrUpdateCartItems;
     /**
@@ -12298,7 +12246,7 @@ var marketplace;
      * @beta
      */
     function removeCartItems(removeCartItemsParams) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -12309,7 +12257,7 @@ var marketplace;
         if (!Array.isArray(removeCartItemsParams === null || removeCartItemsParams === void 0 ? void 0 : removeCartItemsParams.cartItemIds) || (removeCartItemsParams === null || removeCartItemsParams === void 0 ? void 0 : removeCartItemsParams.cartItemIds.length) === 0) {
             throw new Error('cartItemIds must be a non-empty array');
         }
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_RemoveCardItems), 'marketplace.removeCartItems', Object.assign(Object.assign({}, removeCartItemsParams), { cartVersion: marketplace.cartVersion })).then(deserializeCart);
+        return sendAndHandleSdkError(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_RemoveCardItems), 'marketplace.removeCartItems', Object.assign(Object.assign({}, removeCartItemsParams), { cartVersion: marketplace.cartVersion })).then(deserializeCart);
     }
     marketplace.removeCartItems = removeCartItems;
     /**
@@ -12320,7 +12268,7 @@ var marketplace;
      * @beta
      */
     function updateCartStatus(updateCartStatusParams) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content, FrameContexts.task);
+        ensureInitialized(runtime, FrameContexts.content, FrameContexts.task);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -12329,7 +12277,7 @@ var marketplace;
         }
         validateUuid(updateCartStatusParams === null || updateCartStatusParams === void 0 ? void 0 : updateCartStatusParams.cartId);
         validateCartStatus(updateCartStatusParams === null || updateCartStatusParams === void 0 ? void 0 : updateCartStatusParams.cartStatus);
-        return sendAndHandleSdkErrorWithVersion(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_UpdateCartStatus), 'marketplace.updateCartStatus', Object.assign(Object.assign({}, updateCartStatusParams), { cartVersion: marketplace.cartVersion })).then(deserializeCart);
+        return sendAndHandleSdkError(getApiVersionTag(marketplaceTelemetryVersionNumber, ApiName.Marketplace_UpdateCartStatus), 'marketplace.updateCartStatus', Object.assign(Object.assign({}, updateCartStatusParams), { cartVersion: marketplace.cartVersion })).then(deserializeCart);
     }
     marketplace.updateCartStatus = updateCartStatus;
     /**
@@ -12340,7 +12288,7 @@ var marketplace;
      * @beta
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.marketplace ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.marketplace ? true : false;
     }
     marketplace.isSupported = isSupported;
 })(marketplace || (marketplace = {}));
@@ -12394,6 +12342,11 @@ var marketplace;
 
 
 
+
+/**
+ * v2 APIs telemetry file: All of APIs in this capability file should send out API version v2 ONLY
+ */
+const externalAppAuthenticationTelemetryVersionNumber = ApiVersionNumber.V_2;
 /**
  * @hidden
  * Namespace to delegate authentication and message extension requests to the host
@@ -12487,14 +12440,14 @@ var externalAppAuthentication;
      * @returns A promise that resolves to the IInvokeResponse from the application backend and rejects with InvokeError if the host encounters an error while authenticating or resending the request
      */
     function authenticateAndResendRequest(appId, authenticateParameters, originalRequestInfo) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         validateAppIdIsGuid(appId);
         validateOriginalRequestInfo(originalRequestInfo);
         // Ask the parent window to open an authentication window with the parameters provided by the caller.
-        return sendMessageToParentAsync('externalAppAuthentication.authenticateAndResendRequest', [
+        return sendMessageToParentAsync(getApiVersionTag(externalAppAuthenticationTelemetryVersionNumber, ApiName.ExternalAppAuthentication_AuthenticateAndResendRequest), 'externalAppAuthentication.authenticateAndResendRequest', [
             appId,
             originalRequestInfo,
             authenticateParameters.url.href,
@@ -12523,16 +12476,12 @@ var externalAppAuthentication;
      * @returns A promise that resolves when authentication and succeeds and rejects with InvokeError on failure
      */
     function authenticateWithSSO(appId, authTokenRequest) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         validateAppIdIsGuid(appId);
-        return sendMessageToParentAsync('externalAppAuthentication.authenticateWithSSO', [
-            appId,
-            authTokenRequest.claims,
-            authTokenRequest.silent,
-        ]).then(([wasSuccessful, error]) => {
+        return sendMessageToParentAsync(getApiVersionTag(externalAppAuthenticationTelemetryVersionNumber, ApiName.ExternalAppAuthentication_AuthenticateWithSSO), 'externalAppAuthentication.authenticateWithSSO', [appId, authTokenRequest.claims, authTokenRequest.silent]).then(([wasSuccessful, error]) => {
             if (!wasSuccessful) {
                 throw error;
             }
@@ -12551,13 +12500,13 @@ var externalAppAuthentication;
      * @returns A promise that resolves to the IInvokeResponse from the application backend and rejects with InvokeError if the host encounters an error while authenticating or resending the request
      */
     function authenticateWithSSOAndResendRequest(appId, authTokenRequest, originalRequestInfo) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         validateAppIdIsGuid(appId);
         validateOriginalRequestInfo(originalRequestInfo);
-        return sendMessageToParentAsync('externalAppAuthentication.authenticateWithSSOAndResendRequest', [appId, originalRequestInfo, authTokenRequest.claims, authTokenRequest.silent]).then(([wasSuccessful, response]) => {
+        return sendMessageToParentAsync(getApiVersionTag(externalAppAuthenticationTelemetryVersionNumber, ApiName.ExternalAppAuthentication_AuthenticateWithSSOAndResendRequest), 'externalAppAuthentication.authenticateWithSSOAndResendRequest', [appId, originalRequestInfo, authTokenRequest.claims, authTokenRequest.silent]).then(([wasSuccessful, response]) => {
             if (wasSuccessful && response.responseType != null) {
                 return response;
             }
@@ -12579,7 +12528,7 @@ var externalAppAuthentication;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.externalAppAuthentication ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.externalAppAuthentication ? true : false;
     }
     externalAppAuthentication.isSupported = isSupported;
 })(externalAppAuthentication || (externalAppAuthentication = {}));
@@ -12591,6 +12540,11 @@ var externalAppAuthentication;
 
 
 
+
+/**
+ * v2 APIs telemetry file: All of APIs in this capability file should send out API version v2 ONLY
+ */
+const externalAppCardActionsTelemetryVersionNumber = ApiVersionNumber.V_2;
 /**
  * @hidden
  * Namespace to delegate adaptive card action execution to the host
@@ -12646,15 +12600,12 @@ var externalAppCardActions;
      * @returns Promise that resolves when the request is completed and rejects with ActionSubmitError if the request fails
      */
     function processActionSubmit(appId, actionSubmitPayload) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         validateAppIdIsGuid(appId);
-        return sendMessageToParentAsync('externalAppCardActions.processActionSubmit', [
-            appId,
-            actionSubmitPayload,
-        ]).then(([wasSuccessful, error]) => {
+        return sendMessageToParentAsync(getApiVersionTag(externalAppCardActionsTelemetryVersionNumber, ApiName.ExternalAppCardActions_ProcessActionSubmit), 'externalAppCardActions.processActionSubmit', [appId, actionSubmitPayload]).then(([wasSuccessful, error]) => {
             if (!wasSuccessful) {
                 throw error;
             }
@@ -12672,12 +12623,12 @@ var externalAppCardActions;
      * @returns Promise that resolves to ActionOpenUrlType indicating the type of URL that was opened on success and rejects with ActionOpenUrlError if the request fails
      */
     function processActionOpenUrl(appId, url) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
         validateAppIdIsGuid(appId);
-        return sendMessageToParentAsync('externalAppCardActions.processActionOpenUrl', [appId, url.href]).then(([error, response]) => {
+        return sendMessageToParentAsync(getApiVersionTag(externalAppCardActionsTelemetryVersionNumber, ApiName.ExternalAppCardActions_ProcessActionOpenUrl), 'externalAppCardActions.processActionOpenUrl', [appId, url.href]).then(([error, response]) => {
             if (error) {
                 throw error;
             }
@@ -12698,7 +12649,7 @@ var externalAppCardActions;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.externalAppCardActions ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.externalAppCardActions ? true : false;
     }
     externalAppCardActions.isSupported = isSupported;
 })(externalAppCardActions || (externalAppCardActions = {}));
@@ -12828,14 +12779,14 @@ var files;
      * Limited to Microsoft-internal use
      */
     function getCloudStorageFolders(channelId, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!channelId || channelId.length === 0) {
             throw new Error('[files.getCloudStorageFolders] channelId name cannot be null or empty');
         }
         if (!callback) {
             throw new Error('[files.getCloudStorageFolders] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetCloudStorageFolders), 'files.getCloudStorageFolders', [channelId], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetCloudStorageFolders), 'files.getCloudStorageFolders', [channelId], callback);
     }
     files_1.getCloudStorageFolders = getCloudStorageFolders;
     /**
@@ -12851,14 +12802,14 @@ var files;
      * Limited to Microsoft-internal use
      */
     function addCloudStorageFolder(channelId, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!channelId || channelId.length === 0) {
             throw new Error('[files.addCloudStorageFolder] channelId name cannot be null or empty');
         }
         if (!callback) {
             throw new Error('[files.addCloudStorageFolder] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_AddCloudStorageFolder), 'files.addCloudStorageFolder', [channelId], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_AddCloudStorageFolder), 'files.addCloudStorageFolder', [channelId], callback);
     }
     files_1.addCloudStorageFolder = addCloudStorageFolder;
     /**
@@ -12876,7 +12827,7 @@ var files;
      * Limited to Microsoft-internal use
      */
     function deleteCloudStorageFolder(channelId, folderToDelete, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!channelId) {
             throw new Error('[files.deleteCloudStorageFolder] channelId name cannot be null or empty');
         }
@@ -12886,7 +12837,7 @@ var files;
         if (!callback) {
             throw new Error('[files.deleteCloudStorageFolder] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_DeleteCloudStorageFolder), 'files.deleteCloudStorageFolder', [channelId, folderToDelete], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_DeleteCloudStorageFolder), 'files.deleteCloudStorageFolder', [channelId, folderToDelete], callback);
     }
     files_1.deleteCloudStorageFolder = deleteCloudStorageFolder;
     /**
@@ -12904,7 +12855,7 @@ var files;
      * Limited to Microsoft-internal use
      */
     function getCloudStorageFolderContents(folder, providerCode, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!folder || !providerCode) {
             throw new Error('[files.getCloudStorageFolderContents] folder/providerCode name cannot be null or empty');
         }
@@ -12914,7 +12865,7 @@ var files;
         if ('isSubdirectory' in folder && !folder.isSubdirectory) {
             throw new Error('[files.getCloudStorageFolderContents] provided folder is not a subDirectory');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetCloudStorageFolderContents), 'files.getCloudStorageFolderContents', [folder, providerCode], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetCloudStorageFolderContents), 'files.getCloudStorageFolderContents', [folder, providerCode], callback);
     }
     files_1.getCloudStorageFolderContents = getCloudStorageFolderContents;
     /**
@@ -12932,14 +12883,14 @@ var files;
      * Limited to Microsoft-internal use
      */
     function openCloudStorageFile(file, providerCode, fileOpenPreference) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!file || !providerCode) {
             throw new Error('[files.openCloudStorageFile] file/providerCode cannot be null or empty');
         }
         if (file.isSubdirectory) {
             throw new Error('[files.openCloudStorageFile] provided file is a subDirectory');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_OpenCloudStorageFile), 'files.openCloudStorageFile', [file, providerCode, fileOpenPreference]);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_OpenCloudStorageFile), 'files.openCloudStorageFile', [file, providerCode, fileOpenPreference]);
     }
     files_1.openCloudStorageFile = openCloudStorageFile;
     /**
@@ -12953,11 +12904,11 @@ var files;
      * Limited to Microsoft-internal use
      */
     function getExternalProviders(excludeAddedProviders = false, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw new Error('[files.getExternalProviders] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetExternalProviders), 'files.getExternalProviders', [excludeAddedProviders], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetExternalProviders), 'files.getExternalProviders', [excludeAddedProviders], callback);
     }
     files_1.getExternalProviders = getExternalProviders;
     /**
@@ -12969,7 +12920,7 @@ var files;
      * Limited to Microsoft-internal use
      */
     function copyMoveFiles(selectedFiles, providerCode, destinationFolder, destinationProviderCode, isMove = false, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!selectedFiles || selectedFiles.length === 0) {
             throw new Error('[files.copyMoveFiles] selectedFiles cannot be null or empty');
         }
@@ -12985,7 +12936,7 @@ var files;
         if (!callback) {
             throw new Error('[files.copyMoveFiles] callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_CopyMoveFiles), 'files.copyMoveFiles', [selectedFiles, providerCode, destinationFolder, destinationProviderCode, isMove], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_CopyMoveFiles), 'files.copyMoveFiles', [selectedFiles, providerCode, destinationFolder, destinationProviderCode, isMove], callback);
     }
     files_1.copyMoveFiles = copyMoveFiles;
     /**
@@ -13000,11 +12951,11 @@ var files;
      * Limited to Microsoft-internal use
      */
     function getFileDownloads(callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw new Error('[files.getFileDownloads] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetFileDownloads), 'files.getFileDownloads', [], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_GetFileDownloads), 'files.getFileDownloads', [], callback);
     }
     files_1.getFileDownloads = getFileDownloads;
     /**
@@ -13019,11 +12970,11 @@ var files;
      * Limited to Microsoft-internal use
      */
     function openDownloadFolder(fileObjectId = undefined, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw new Error('[files.openDownloadFolder] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_OpenDownloadFolder), 'files.openDownloadFolder', [fileObjectId], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_OpenDownloadFolder), 'files.openDownloadFolder', [fileObjectId], callback);
     }
     files_1.openDownloadFolder = openDownloadFolder;
     /**
@@ -13043,11 +12994,11 @@ var files;
      * Limited to Microsoft-internal use
      */
     function addCloudStorageProvider(callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.addCloudStorageProvider] callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_AddCloudStorageProvider), 'files.addCloudStorageProvider', [], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_AddCloudStorageProvider), 'files.addCloudStorageProvider', [], callback);
     }
     files_1.addCloudStorageProvider = addCloudStorageProvider;
     /**
@@ -13065,14 +13016,14 @@ var files;
      * Limited to Microsoft-internal use
      */
     function removeCloudStorageProvider(logoutRequest, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.removeCloudStorageProvider] callback cannot be null');
         }
         if (!(logoutRequest && logoutRequest.content)) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.removeCloudStorageProvider] 3P cloud storage provider request content is missing');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RemoveCloudStorageProvider), 'files.removeCloudStorageProvider', [logoutRequest], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RemoveCloudStorageProvider), 'files.removeCloudStorageProvider', [logoutRequest], callback);
     }
     files_1.removeCloudStorageProvider = removeCloudStorageProvider;
     /**
@@ -13088,14 +13039,14 @@ var files;
      * Limited to Microsoft-internal use
      */
     function addCloudStorageProviderFile(addNewFileRequest, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.addCloudStorageProviderFile] callback cannot be null');
         }
         if (!(addNewFileRequest && addNewFileRequest.content)) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.addCloudStorageProviderFile] 3P cloud storage provider request content is missing');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_AddCloudStorageProviderFile), 'files.addCloudStorageProviderFile', [addNewFileRequest], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_AddCloudStorageProviderFile), 'files.addCloudStorageProviderFile', [addNewFileRequest], callback);
     }
     files_1.addCloudStorageProviderFile = addCloudStorageProviderFile;
     /**
@@ -13111,14 +13062,14 @@ var files;
      * Limited to Microsoft-internal use
      */
     function renameCloudStorageProviderFile(renameFileRequest, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.renameCloudStorageProviderFile] callback cannot be null');
         }
         if (!(renameFileRequest && renameFileRequest.content)) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.renameCloudStorageProviderFile] 3P cloud storage provider request content is missing');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RenameCloudStorageProviderFile), 'files.renameCloudStorageProviderFile', [renameFileRequest], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RenameCloudStorageProviderFile), 'files.renameCloudStorageProviderFile', [renameFileRequest], callback);
     }
     files_1.renameCloudStorageProviderFile = renameCloudStorageProviderFile;
     /**
@@ -13135,7 +13086,7 @@ var files;
      * Limited to Microsoft-internal use
      */
     function deleteCloudStorageProviderFile(deleteFileRequest, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.deleteCloudStorageProviderFile] callback cannot be null');
         }
@@ -13145,7 +13096,7 @@ var files;
             deleteFileRequest.content.itemList.length > 0)) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.deleteCloudStorageProviderFile] 3P cloud storage provider request content details are missing');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_DeleteCloudStorageProviderFile), 'files.deleteCloudStorageProviderFile', [deleteFileRequest], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_DeleteCloudStorageProviderFile), 'files.deleteCloudStorageProviderFile', [deleteFileRequest], callback);
     }
     files_1.deleteCloudStorageProviderFile = deleteCloudStorageProviderFile;
     /**
@@ -13162,7 +13113,7 @@ var files;
      * Limited to Microsoft-internal use
      */
     function downloadCloudStorageProviderFile(downloadFileRequest, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.downloadCloudStorageProviderFile] callback cannot be null');
         }
@@ -13172,7 +13123,7 @@ var files;
             downloadFileRequest.content.itemList.length > 0)) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.downloadCloudStorageProviderFile] 3P cloud storage provider request content details are missing');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_DownloadCloudStorageProviderFile), 'files.downloadCloudStorageProviderFile', [downloadFileRequest], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_DownloadCloudStorageProviderFile), 'files.downloadCloudStorageProviderFile', [downloadFileRequest], callback);
     }
     files_1.downloadCloudStorageProviderFile = downloadCloudStorageProviderFile;
     /**
@@ -13189,7 +13140,7 @@ var files;
      * Limited to Microsoft-internal use
      */
     function uploadCloudStorageProviderFile(uploadFileRequest, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!callback) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.uploadCloudStorageProviderFile] callback cannot be null');
         }
@@ -13202,7 +13153,7 @@ var files;
         if (!uploadFileRequest.content.destinationFolder) {
             throw getSdkError(ErrorCode.INVALID_ARGUMENTS, '[files.uploadCloudStorageProviderFile] Invalid destination folder details');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_UploadCloudStorageProviderFile), 'files.uploadCloudStorageProviderFile', [uploadFileRequest], callback);
+        sendMessageToParent(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_UploadCloudStorageProviderFile), 'files.uploadCloudStorageProviderFile', [uploadFileRequest], callback);
     }
     files_1.uploadCloudStorageProviderFile = uploadCloudStorageProviderFile;
     /**
@@ -13217,11 +13168,11 @@ var files;
      * @internal Limited to Microsoft-internal use
      */
     function registerCloudStorageProviderListChangeHandler(handler) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!handler) {
             throw new Error('[registerCloudStorageProviderListChangeHandler] Handler cannot be null');
         }
-        registerHandlerWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RegisterCloudStorageProviderListChangeHandler), 'files.cloudStorageProviderListChange', handler);
+        registerHandler(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RegisterCloudStorageProviderListChangeHandler), 'files.cloudStorageProviderListChange', handler);
     }
     files_1.registerCloudStorageProviderListChangeHandler = registerCloudStorageProviderListChangeHandler;
     /**
@@ -13237,11 +13188,11 @@ var files;
      * Limited to Microsoft-internal use
      */
     function registerCloudStorageProviderContentChangeHandler(handler) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!handler) {
             throw new Error('[registerCloudStorageProviderContentChangeHandler] Handler cannot be null');
         }
-        registerHandlerWithVersion(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RegisterCloudStorageProviderContentChangeHandler), 'files.cloudStorageProviderContentChange', handler);
+        registerHandler(getApiVersionTag(filesTelemetryVersionNumber, ApiName.Files_RegisterCloudStorageProviderContentChangeHandler), 'files.cloudStorageProviderContentChange', handler);
     }
     files_1.registerCloudStorageProviderContentChangeHandler = registerCloudStorageProviderContentChangeHandler;
     function getSdkError(errorCode, message) {
@@ -13282,11 +13233,11 @@ var meetingRoom;
      */
     function getPairedMeetingRoomInfo() {
         return new Promise((resolve) => {
-            internalAPIs_ensureInitialized(runtime_runtime);
+            ensureInitialized(runtime);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_GetPairedMeetingRoomInfo), 'meetingRoom.getPairedMeetingRoomInfo'));
+            resolve(sendAndHandleSdkError(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_GetPairedMeetingRoomInfo), 'meetingRoom.getPairedMeetingRoomInfo'));
         });
     }
     meetingRoom.getPairedMeetingRoomInfo = getPairedMeetingRoomInfo;
@@ -13305,11 +13256,11 @@ var meetingRoom;
             if (!commandName || commandName.length == 0) {
                 throw new Error('[meetingRoom.sendCommandToPairedMeetingRoom] Command name cannot be null or empty');
             }
-            internalAPIs_ensureInitialized(runtime_runtime);
+            ensureInitialized(runtime);
             if (!isSupported()) {
                 throw errorNotSupportedOnPlatform;
             }
-            resolve(sendAndHandleSdkErrorWithVersion(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_SendCommandToPairedMeetingRoom), 'meetingRoom.sendCommandToPairedMeetingRoom', commandName));
+            resolve(sendAndHandleSdkError(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_SendCommandToPairedMeetingRoom), 'meetingRoom.sendCommandToPairedMeetingRoom', commandName));
         });
     }
     meetingRoom.sendCommandToPairedMeetingRoom = sendCommandToPairedMeetingRoom;
@@ -13327,12 +13278,12 @@ var meetingRoom;
         if (!handler) {
             throw new Error('[meetingRoom.registerMeetingRoomCapabilitiesUpdateHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_RegisterMeetingRoomCapabilitiesUpdateHandler), 'meetingRoom.meetingRoomCapabilitiesUpdate', (capabilities) => {
-            internalAPIs_ensureInitialized(runtime_runtime);
+        registerHandler(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_RegisterMeetingRoomCapabilitiesUpdateHandler), 'meetingRoom.meetingRoomCapabilitiesUpdate', (capabilities) => {
+            ensureInitialized(runtime);
             handler(capabilities);
         });
     }
@@ -13352,12 +13303,12 @@ var meetingRoom;
         if (!handler) {
             throw new Error('[meetingRoom.registerMeetingRoomStatesUpdateHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_RegisterMeetingRoomStatesUpdateHandler), 'meetingRoom.meetingRoomStatesUpdate', (states) => {
-            internalAPIs_ensureInitialized(runtime_runtime);
+        registerHandler(getApiVersionTag(meetingRoomTelemetryVersionNumber, ApiName.MeetingRoom_RegisterMeetingRoomStatesUpdateHandler), 'meetingRoom.meetingRoomStatesUpdate', (states) => {
+            ensureInitialized(runtime);
             handler(states);
         });
     }
@@ -13374,7 +13325,7 @@ var meetingRoom;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.meetingRoom ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.meetingRoom ? true : false;
     }
     meetingRoom.isSupported = isSupported;
 })(meetingRoom || (meetingRoom = {}));
@@ -13452,7 +13403,7 @@ var messageChannels;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.messageChannels ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.messageChannels ? true : false;
     }
     messageChannels.isSupported = isSupported;
     /**
@@ -13499,11 +13450,11 @@ var notifications;
      * Limited to Microsoft-internal use
      */
     function showNotification(showNotificationParameters) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(notificationsTelemetryVersionNumber, ApiName.Notifications_ShowNotification), 'notifications.showNotification', [showNotificationParameters]);
+        sendMessageToParent(getApiVersionTag(notificationsTelemetryVersionNumber, ApiName.Notifications_ShowNotification), 'notifications.showNotification', [showNotificationParameters]);
     }
     notifications.showNotification = showNotification;
     /**
@@ -13518,7 +13469,7 @@ var notifications;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.notifications ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.notifications ? true : false;
     }
     notifications.isSupported = isSupported;
 })(notifications || (notifications = {}));
@@ -13613,11 +13564,11 @@ var remoteCamera;
         if (!callback) {
             throw new Error('[remoteCamera.getCapableParticipants] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_GetCapableParticipants), 'remoteCamera.getCapableParticipants', callback);
+        sendMessageToParent(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_GetCapableParticipants), 'remoteCamera.getCapableParticipants', callback);
     }
     remoteCamera.getCapableParticipants = getCapableParticipants;
     /**
@@ -13640,11 +13591,11 @@ var remoteCamera;
         if (!callback) {
             throw new Error('[remoteCamera.requestControl] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RequestControl), 'remoteCamera.requestControl', [participant], callback);
+        sendMessageToParent(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RequestControl), 'remoteCamera.requestControl', [participant], callback);
     }
     remoteCamera.requestControl = requestControl;
     /**
@@ -13664,11 +13615,11 @@ var remoteCamera;
         if (!callback) {
             throw new Error('[remoteCamera.sendControlCommand] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_SendControlCommand), 'remoteCamera.sendControlCommand', [ControlCommand], callback);
+        sendMessageToParent(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_SendControlCommand), 'remoteCamera.sendControlCommand', [ControlCommand], callback);
     }
     remoteCamera.sendControlCommand = sendControlCommand;
     /**
@@ -13684,11 +13635,11 @@ var remoteCamera;
         if (!callback) {
             throw new Error('[remoteCamera.terminateSession] Callback cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_TerminateSession), 'remoteCamera.terminateSession', callback);
+        sendMessageToParent(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_TerminateSession), 'remoteCamera.terminateSession', callback);
     }
     remoteCamera.terminateSession = terminateSession;
     /**
@@ -13705,11 +13656,11 @@ var remoteCamera;
         if (!handler) {
             throw new Error('[remoteCamera.registerOnCapableParticipantsChangeHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnCapableParticipantsChangeHandler), 'remoteCamera.capableParticipantsChange', handler);
+        registerHandler(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnCapableParticipantsChangeHandler), 'remoteCamera.capableParticipantsChange', handler);
     }
     remoteCamera.registerOnCapableParticipantsChangeHandler = registerOnCapableParticipantsChangeHandler;
     /**
@@ -13726,11 +13677,11 @@ var remoteCamera;
         if (!handler) {
             throw new Error('[remoteCamera.registerOnErrorHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnErrorHandler), 'remoteCamera.handlerError', handler);
+        registerHandler(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnErrorHandler), 'remoteCamera.handlerError', handler);
     }
     remoteCamera.registerOnErrorHandler = registerOnErrorHandler;
     /**
@@ -13747,11 +13698,11 @@ var remoteCamera;
         if (!handler) {
             throw new Error('[remoteCamera.registerOnDeviceStateChangeHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnDeviceStateChangeHandler), 'remoteCamera.deviceStateChange', handler);
+        registerHandler(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnDeviceStateChangeHandler), 'remoteCamera.deviceStateChange', handler);
     }
     remoteCamera.registerOnDeviceStateChangeHandler = registerOnDeviceStateChangeHandler;
     /**
@@ -13768,11 +13719,11 @@ var remoteCamera;
         if (!handler) {
             throw new Error('[remoteCamera.registerOnSessionStatusChangeHandler] Handler cannot be null');
         }
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnSessionStatusChangeHandler), 'remoteCamera.sessionStatusChange', handler);
+        registerHandler(getApiVersionTag(remoteCameraTelemetryVersionNumber, ApiName.RemoteCamera_RegisterOnSessionStatusChangeHandler), 'remoteCamera.sessionStatusChange', handler);
     }
     remoteCamera.registerOnSessionStatusChangeHandler = registerOnSessionStatusChangeHandler;
     /**
@@ -13787,7 +13738,7 @@ var remoteCamera;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.remoteCamera ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.remoteCamera ? true : false;
     }
     remoteCamera.isSupported = isSupported;
 })(remoteCamera || (remoteCamera = {}));
@@ -13829,7 +13780,7 @@ var appEntity;
      * Limited to Microsoft-internal use
      */
     function selectAppEntity(threadId, categories, subEntityId, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -13839,7 +13790,7 @@ var appEntity;
         if (!callback) {
             throw new Error('[appEntity.selectAppEntity] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(appEntityTelemetryVersionNumber, ApiName.AppEntity_SelectAppEntity), 'appEntity.selectAppEntity', [threadId, categories, subEntityId], callback);
+        sendMessageToParent(getApiVersionTag(appEntityTelemetryVersionNumber, ApiName.AppEntity_SelectAppEntity), 'appEntity.selectAppEntity', [threadId, categories, subEntityId], callback);
     }
     appEntity_1.selectAppEntity = selectAppEntity;
     /**
@@ -13854,7 +13805,7 @@ var appEntity;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.appEntity ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.appEntity ? true : false;
     }
     appEntity_1.isSupported = isSupported;
 })(appEntity || (appEntity = {}));
@@ -13896,7 +13847,7 @@ var teams;
      * Limited to Microsoft-internal use
      */
     function getTeamChannels(groupId, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.content);
+        ensureInitialized(runtime, FrameContexts.content);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -13906,7 +13857,7 @@ var teams;
         if (!callback) {
             throw new Error('[teams.getTeamChannels] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_GetTeamChannels), 'teams.getTeamChannels', [groupId], callback);
+        sendMessageToParent(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_GetTeamChannels), 'teams.getTeamChannels', [groupId], callback);
     }
     teams.getTeamChannels = getTeamChannels;
     /**
@@ -13921,7 +13872,7 @@ var teams;
      * Limited to Microsoft-internal use
      */
     function refreshSiteUrl(threadId, callback) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
@@ -13931,7 +13882,7 @@ var teams;
         if (!callback) {
             throw new Error('[teams.refreshSiteUrl] Callback cannot be null');
         }
-        sendMessageToParentWithVersion(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_RefreshSiteUrl), 'teams.refreshSiteUrl', [threadId], callback);
+        sendMessageToParent(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_RefreshSiteUrl), 'teams.refreshSiteUrl', [threadId], callback);
     }
     teams.refreshSiteUrl = refreshSiteUrl;
     /**
@@ -13946,7 +13897,7 @@ var teams;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.teams ? true : false;
+        return ensureInitialized(runtime) && runtime.supports.teams ? true : false;
     }
     teams.isSupported = isSupported;
     /**
@@ -13975,7 +13926,7 @@ var teams;
              */
             function getUserJoinedTeams(teamInstanceParameters) {
                 return new Promise((resolve) => {
-                    internalAPIs_ensureInitialized(runtime_runtime);
+                    ensureInitialized(runtime);
                     if (!isSupported()) {
                         throw errorNotSupportedOnPlatform;
                     }
@@ -13988,7 +13939,7 @@ var teams;
                         throw new Error(JSON.stringify(oldPlatformError));
                     }
                     /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
-                    resolve(sendAndUnwrapWithVersion(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_FullTrust_JoinedTeams_GetUserJoinedTeams), 'getUserJoinedTeams', 
+                    resolve(sendAndUnwrap(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_FullTrust_JoinedTeams_GetUserJoinedTeams), 'getUserJoinedTeams', 
                     /* eslint-disable-next-line strict-null-checks/all */ /* Fix tracked by 5730662 */
                     teamInstanceParameters));
                 });
@@ -14006,9 +13957,9 @@ var teams;
              * Limited to Microsoft-internal use
              */
             function isSupported() {
-                return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.teams
-                    ? runtime_runtime.supports.teams.fullTrust
-                        ? runtime_runtime.supports.teams.fullTrust.joinedTeams
+                return ensureInitialized(runtime) && runtime.supports.teams
+                    ? runtime.supports.teams.fullTrust
+                        ? runtime.supports.teams.fullTrust.joinedTeams
                             ? true
                             : false
                         : false
@@ -14028,11 +13979,11 @@ var teams;
          */
         function getConfigSetting(key) {
             return new Promise((resolve) => {
-                internalAPIs_ensureInitialized(runtime_runtime);
+                ensureInitialized(runtime);
                 if (!isSupported()) {
                     throw errorNotSupportedOnPlatform;
                 }
-                resolve(sendAndUnwrapWithVersion(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_FullTrust_GetConfigSetting), 'getConfigSetting', key));
+                resolve(sendAndUnwrap(getApiVersionTag(teamsTelemetryVersionNumber, ApiName.Teams_FullTrust_GetConfigSetting), 'getConfigSetting', key));
             });
         }
         fullTrust.getConfigSetting = getConfigSetting;
@@ -14048,8 +13999,8 @@ var teams;
          * Limited to Microsoft-internal use
          */
         function isSupported() {
-            return internalAPIs_ensureInitialized(runtime_runtime) && runtime_runtime.supports.teams
-                ? runtime_runtime.supports.teams.fullTrust
+            return ensureInitialized(runtime) && runtime.supports.teams
+                ? runtime.supports.teams.fullTrust
                     ? true
                     : false
                 : false;
@@ -14093,7 +14044,7 @@ var videoEffectsEx;
     videoEffectsEx.frameProcessingTimeoutInMs = 2000;
     const videoPerformanceMonitor = inServerSideRenderingEnvironment()
         ? undefined
-        : new VideoPerformanceMonitor(sendMessageToParentWithVersion);
+        : new VideoPerformanceMonitor(sendMessageToParent);
     /**
      * @hidden
      * Error level when notifying errors to the host, the host will decide what to do acording to the error level.
@@ -14127,10 +14078,10 @@ var videoEffectsEx;
         if (!parameters.videoFrameHandler || !parameters.videoBufferHandler) {
             throw new Error('Both videoFrameHandler and videoBufferHandler must be provided');
         }
-        if (internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel)) {
-            registerHandlerWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterSetFrameProcessTimeLimitHandler), 'video.setFrameProcessTimeLimit', (timeLimit) => videoPerformanceMonitor === null || videoPerformanceMonitor === void 0 ? void 0 : videoPerformanceMonitor.setFrameProcessTimeLimit(timeLimit), false);
-            if ((_a = runtime_runtime.supports.video) === null || _a === void 0 ? void 0 : _a.mediaStream) {
-                registerHandlerWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterStartVideoExtensibilityVideoStreamHandler), 'video.startVideoExtensibilityVideoStream', (mediaStreamInfo) => videoEffectsEx_awaiter(this, void 0, void 0, function* () {
+        if (ensureInitialized(runtime, FrameContexts.sidePanel)) {
+            registerHandler(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterSetFrameProcessTimeLimitHandler), 'video.setFrameProcessTimeLimit', (timeLimit) => videoPerformanceMonitor === null || videoPerformanceMonitor === void 0 ? void 0 : videoPerformanceMonitor.setFrameProcessTimeLimit(timeLimit), false);
+            if ((_a = runtime.supports.video) === null || _a === void 0 ? void 0 : _a.mediaStream) {
+                registerHandler(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterStartVideoExtensibilityVideoStreamHandler), 'video.startVideoExtensibilityVideoStream', (mediaStreamInfo) => videoEffectsEx_awaiter(this, void 0, void 0, function* () {
                     const { streamId, metadataInTexture } = mediaStreamInfo;
                     const handler = videoPerformanceMonitor
                         ? createMonitoredVideoFrameHandler(parameters.videoFrameHandler, videoPerformanceMonitor)
@@ -14139,10 +14090,10 @@ var videoEffectsEx;
                         ? yield processMediaStreamWithMetadata(streamId, handler, notifyError, videoPerformanceMonitor)
                         : yield processMediaStream(streamId, handler, notifyError, videoPerformanceMonitor);
                 }), false);
-                sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_MediaStream_RegisterForVideoFrame), 'video.mediaStream.registerForVideoFrame', [parameters.config]);
+                sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_MediaStream_RegisterForVideoFrame), 'video.mediaStream.registerForVideoFrame', [parameters.config]);
             }
-            else if ((_b = runtime_runtime.supports.video) === null || _b === void 0 ? void 0 : _b.sharedFrame) {
-                registerHandlerWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterNewVideoFrameHandler), 'video.newVideoFrame', (videoBufferData) => {
+            else if ((_b = runtime.supports.video) === null || _b === void 0 ? void 0 : _b.sharedFrame) {
+                registerHandler(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterNewVideoFrameHandler), 'video.newVideoFrame', (videoBufferData) => {
                     if (videoBufferData) {
                         videoPerformanceMonitor === null || videoPerformanceMonitor === void 0 ? void 0 : videoPerformanceMonitor.reportStartFrameProcessing(videoBufferData.width, videoBufferData.height);
                         const clearProcessingTimeout = createFrameProcessingTimeout();
@@ -14154,7 +14105,7 @@ var videoEffectsEx;
                         }, notifyError);
                     }
                 }, false);
-                sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterForVideoFrame), 'video.registerForVideoFrame', [parameters.config]);
+                sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterForVideoFrame), 'video.registerForVideoFrame', [parameters.config]);
             }
             else {
                 // should not happen if isSupported() is true
@@ -14203,11 +14154,11 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function notifySelectedVideoEffectChanged(effectChangeType, effectId, effectParam) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_NotifySelectedVideoEffectChanged), 'video.videoEffectChanged', [effectChangeType, effectId, effectParam]);
+        sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_NotifySelectedVideoEffectChanged), 'video.videoEffectChanged', [effectChangeType, effectId, effectParam]);
     }
     videoEffectsEx.notifySelectedVideoEffectChanged = notifySelectedVideoEffectChanged;
     /**
@@ -14220,12 +14171,12 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function registerForVideoEffect(callback) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        registerHandlerWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterEffectParameterChangeHandler), 'video.effectParameterChange', createEffectParameterChangeCallback(callback, videoPerformanceMonitor), false);
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterForVideoEffect), 'video.registerForVideoEffect');
+        registerHandler(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterEffectParameterChangeHandler), 'video.effectParameterChange', createEffectParameterChangeCallback(callback, videoPerformanceMonitor), false);
+        sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_RegisterForVideoEffect), 'video.registerForVideoEffect');
     }
     videoEffectsEx.registerForVideoEffect = registerForVideoEffect;
     /**
@@ -14237,11 +14188,11 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function updatePersonalizedEffects(effects) {
-        internalAPIs_ensureInitialized(runtime_runtime, FrameContexts.sidePanel);
+        ensureInitialized(runtime, FrameContexts.sidePanel);
         if (!videoEffects.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_UpdatePersonalizedEffects), 'video.personalizedEffectsChanged', [effects]);
+        sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_UpdatePersonalizedEffects), 'video.personalizedEffectsChanged', [effects]);
     }
     videoEffectsEx.updatePersonalizedEffects = updatePersonalizedEffects;
     /**
@@ -14258,7 +14209,7 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function isSupported() {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         return videoEffects.isSupported();
     }
     videoEffectsEx.isSupported = isSupported;
@@ -14272,7 +14223,7 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function notifyVideoFrameProcessed(timestamp) {
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_NotifyVideoFrameProcessed), 'video.videoFrameProcessed', [timestamp]);
+        sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_NotifyVideoFrameProcessed), 'video.videoFrameProcessed', [timestamp]);
     }
     /**
      * @hidden
@@ -14285,7 +14236,7 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function notifyError(errorMessage, errorLevel = ErrorLevel.Warn) {
-        sendMessageToParentWithVersion(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_NotifyError), 'video.notifyError', [errorMessage, errorLevel]);
+        sendMessageToParent(getApiVersionTag(videoEffectsExTelemetryVersionNumber, ApiName.VideoEffectsEx_NotifyError), 'video.notifyError', [errorMessage, errorLevel]);
     }
     /**
      * @hidden
@@ -14298,7 +14249,7 @@ var videoEffectsEx;
      * Limited to Microsoft-internal use
      */
     function notifyFatalError(errorMessage) {
-        internalAPIs_ensureInitialized(runtime_runtime);
+        ensureInitialized(runtime);
         if (!videoEffects.isSupported()) {
             throw errorNotSupportedOnPlatform;
         }