diff --git a/PlayFabSdk/package.json b/PlayFabSdk/package.json
index e6728216..b104c0fb 100644
--- a/PlayFabSdk/package.json
+++ b/PlayFabSdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playfab-web-sdk",
-  "version": "1.216.260526",
+  "version": "1.217.260605",
   "description": "Playfab SDK for JS client applications",
   "license": "Apache-2.0",
   "repository": {
diff --git a/PlayFabSdk/src/PlayFab/PlayFabAddonApi.js b/PlayFabSdk/src/PlayFab/PlayFabAddonApi.js
index 588e29ee..0680fa3e 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabAddonApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabAddonApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js b/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js
index 6b9fd704..5b4f9aef 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js b/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js
index 9f4835aa..9ec5b672 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabClientApi.js b/PlayFabSdk/src/PlayFab/PlayFabClientApi.js
index af9c8f98..d079ce97 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabClientApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabClientApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js b/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js
index 01f4af6c..950a2bf7 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabDataApi.js b/PlayFabSdk/src/PlayFab/PlayFabDataApi.js
index 9a531c93..9b7aebbc 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabDataApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabDataApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabEconomyApi.js b/PlayFabSdk/src/PlayFab/PlayFabEconomyApi.js
index 9324b47c..f0d972c4 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabEconomyApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabEconomyApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js b/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js
index 6751c191..3e2f69e6 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js b/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js
index 576296b6..83c1e8f5 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js b/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js
index 075c63a3..a7bc069a 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js b/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js
index c6df6f78..82e192c3 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js b/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js
index 54c0b289..4d6e370f 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js b/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js
index 69ec7d0d..5296503e 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js b/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js
index 4940164a..4458cc60 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabProgressionApi.js b/PlayFabSdk/src/PlayFab/PlayFabProgressionApi.js
index 7b75ceb4..18a54ef9 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabProgressionApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabProgressionApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabSdk/src/PlayFab/PlayFabServerApi.js b/PlayFabSdk/src/PlayFab/PlayFabServerApi.js
index 5fff049c..b57d0ebd 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabServerApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabServerApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -449,6 +449,10 @@ PlayFab.ServerApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/GetPlayFabIDsFromPSNOnlineIDs", request, "X-SecretKey", callback, customData, extraHeaders);
     },
 
+    GetPlayFabIDsFromServerCustomIDs: function (request, callback, customData, extraHeaders) {
+        return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/GetPlayFabIDsFromServerCustomIDs", request, "X-SecretKey", callback, customData, extraHeaders);
+    },
+
     GetPlayFabIDsFromSteamIDs: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/GetPlayFabIDsFromSteamIDs", request, "X-SecretKey", callback, customData, extraHeaders);
     },
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabAddonApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabAddonApi.d.ts
index d8d47bd6..0abfa783 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabAddonApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabAddonApi.d.ts
@@ -641,6 +641,8 @@ declare module PlayFabAddonModels {
         Created: boolean;
         /** List of Nintendo Environments, currently supporting up to 4. */
         Environments?: NintendoEnvironment[];
+        /** List of Nintendo Subscription Environments associated to a secondary AppId, currently supporting up to 4. */
+        SecondarySubscriptionEnvironments?: NintendoEnvironment[];
         /** List of Nintendo Subscription Environments, currently supporting up to 4. */
         SubscriptionEnvironments?: NintendoEnvironment[];
 
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts
index ac9ca0c9..8a96312d 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts
@@ -5064,7 +5064,7 @@ declare module PlayFabAdminModels {
     }
 
     export interface SetPlayerSecretRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** Unique PlayFab assigned ID of the user on whom the operation will be performed. */
         PlayFabId: string;
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts
index 39be01d0..3819a54d 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts
@@ -3669,13 +3669,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Specific Operating System version for the user's device. */
         OS?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3690,7 +3690,7 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /**
          * The JSON Web token (JWT) returned by Apple after login. Represented as the identityToken field in the authorization
@@ -3700,7 +3700,7 @@ declare module PlayFabClientModels {
         IdentityToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3715,13 +3715,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** The JSON Web Token (JWT) returned by Battle.net after login */
         IdentityToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3738,11 +3738,11 @@ declare module PlayFabClientModels {
         CustomId?: string;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3774,13 +3774,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Facebook Instant Games signature for the user. */
         FacebookInstantGamesSignature: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3799,11 +3799,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3818,13 +3818,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Unique Game Center player id. */
         PlayerId?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** The URL for the public encryption key that will be used to verify the signature. */
         PublicKeyUrl?: string;
@@ -3850,11 +3850,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * OAuth 2.0 server authentication code obtained on the client by calling the getServerAuthCode()
@@ -3876,11 +3876,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * OAuth 2.0 server authentication code obtained on the client by calling the requestServerSideAccess()
@@ -3904,13 +3904,13 @@ declare module PlayFabClientModels {
         DeviceId?: string;
         /** Specific model of the user's device. */
         DeviceModel?: string;
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Specific Operating System version for the user's device. */
         OS?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3927,13 +3927,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Numeric user ID assigned by Kongregate */
         KongregateId?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3948,13 +3948,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** The JSON Web token (JWT) returned by Nintendo after login. */
         IdentityToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3969,13 +3969,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Nintendo Switch unique identifier for the user's device. */
         NintendoSwitchDeviceId?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3992,7 +3992,7 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /**
          * The JSON Web token (JWT) returned by the identity provider after login. Represented as the id_token field in the
@@ -4001,7 +4001,7 @@ declare module PlayFabClientModels {
         IdToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -4035,13 +4035,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Id of the PlayStation :tm: Network issuer environment. If null, defaults to production environment. */
         IssuerId?: number;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** Redirect URI supplied to PlayStation :tm: Network when requesting an auth code */
         RedirectUri?: string;
@@ -4058,11 +4058,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Authentication token for the user, returned as a byte array from Steam, and converted to a string (for example, the byte
@@ -4089,11 +4089,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -4108,11 +4108,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -4541,13 +4541,13 @@ declare module PlayFabClientModels {
         DisplayName?: string;
         /** User email address attached to their account */
         Email?: string;
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Password for the PlayFab account (6-100 characters) */
         Password?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * An optional parameter that specifies whether both the username and email parameters are required. If true, both
@@ -4745,9 +4745,9 @@ declare module PlayFabClientModels {
     }
 
     export interface SetPlayerSecretRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
 
     }
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts
index e9a22a2e..47884a40 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts
@@ -302,6 +302,11 @@ declare module PlayFabServerModule {
          * https://docs.microsoft.com/rest/api/playfab/server/account-management/getplayfabidsfrompsnonlineids
          */
         GetPlayFabIDsFromPSNOnlineIDs(request: PlayFabServerModels.GetPlayFabIDsFromPSNOnlineIDsRequest, callback: PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromPSNOnlineIDsResult>, customData?: any, extraHeaders?: { [key: string]: string }): Promise<PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromPSNOnlineIDsResult>>;
+        /**
+         * Retrieves the associated PlayFab account identifiers for the given set of server custom player identifiers.
+         * https://docs.microsoft.com/rest/api/playfab/server/account-management/getplayfabidsfromservercustomids
+         */
+        GetPlayFabIDsFromServerCustomIDs(request: PlayFabServerModels.GetPlayFabIDsFromServerCustomIDsRequest, callback: PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromServerCustomIDsResult>, customData?: any, extraHeaders?: { [key: string]: string }): Promise<PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromServerCustomIDsResult>>;
         /**
          * Retrieves the unique PlayFab identifiers for the given set of Steam identifiers. The Steam identifiers are the profile
          * IDs for the user accounts, available as SteamId in the Steamworks Community API calls.
@@ -3605,6 +3610,21 @@ declare module PlayFabServerModels {
 
     }
 
+    export interface GetPlayFabIDsFromServerCustomIDsRequest extends PlayFabModule.IPlayFabRequestCommon {
+        /**
+         * Array of unique server custom player identifiers for which the title needs to get PlayFab identifiers. Cannot contain
+         * more than 25 identifiers.
+         */
+        ServerCustomIds: string[];
+
+    }
+
+    export interface GetPlayFabIDsFromServerCustomIDsResult extends PlayFabModule.IPlayFabResultCommon  {
+        /** Mapping of server custom identifiers to PlayFab identifiers. */
+        Data?: ServerCustomIDPlayFabIDPair[];
+
+    }
+
     export interface GetPlayFabIDsFromSteamIDsRequest extends PlayFabModule.IPlayFabRequestCommon {
         /**
          * Array of unique Steam identifiers (Steam profile IDs) for which the title needs to get PlayFab identifiers. The array
@@ -4414,7 +4434,7 @@ declare module PlayFabServerModels {
         CustomTags?: { [key: string]: string | null };
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** The backend server identifier for this player. */
         ServerCustomId: string;
@@ -5107,7 +5127,7 @@ declare module PlayFabServerModels {
     }
 
     export interface SetPlayerSecretRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** Unique PlayFab assigned ID of the user on whom the operation will be performed. */
         PlayFabId: string;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabAddonApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabAddonApi.js
index 588e29ee..0680fa3e 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabAddonApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabAddonApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js
index 6b9fd704..5b4f9aef 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js
index 9f4835aa..9ec5b672 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js
index af9c8f98..d079ce97 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js
index 01f4af6c..950a2bf7 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js
index 9a531c93..9b7aebbc 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabEconomyApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabEconomyApi.js
index 9324b47c..f0d972c4 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabEconomyApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabEconomyApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js
index 6751c191..3e2f69e6 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js
index 576296b6..83c1e8f5 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js
index 075c63a3..a7bc069a 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js
index c6df6f78..82e192c3 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js
index 54c0b289..4d6e370f 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js
index 69ec7d0d..5296503e 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js
index 4940164a..4458cc60 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabProgressionApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabProgressionApi.js
index 7b75ceb4..18a54ef9 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabProgressionApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabProgressionApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js
index 5fff049c..b57d0ebd 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js
@@ -14,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.216.260526",
+        sdkVersion: "1.217.260605",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.216.260526"
+            sdk: "JavaScriptSDK-1.217.260605"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -223,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "adobuild_javascriptsdk_115";
-PlayFab.sdkVersion = "1.216.260526";
+PlayFab.buildIdentifier = "adobuild_javascriptsdk_114";
+PlayFab.sdkVersion = "1.217.260605";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -449,6 +449,10 @@ PlayFab.ServerApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/GetPlayFabIDsFromPSNOnlineIDs", request, "X-SecretKey", callback, customData, extraHeaders);
     },
 
+    GetPlayFabIDsFromServerCustomIDs: function (request, callback, customData, extraHeaders) {
+        return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/GetPlayFabIDsFromServerCustomIDs", request, "X-SecretKey", callback, customData, extraHeaders);
+    },
+
     GetPlayFabIDsFromSteamIDs: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/GetPlayFabIDsFromSteamIDs", request, "X-SecretKey", callback, customData, extraHeaders);
     },
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabAddonApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabAddonApi.d.ts
index d8d47bd6..0abfa783 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabAddonApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabAddonApi.d.ts
@@ -641,6 +641,8 @@ declare module PlayFabAddonModels {
         Created: boolean;
         /** List of Nintendo Environments, currently supporting up to 4. */
         Environments?: NintendoEnvironment[];
+        /** List of Nintendo Subscription Environments associated to a secondary AppId, currently supporting up to 4. */
+        SecondarySubscriptionEnvironments?: NintendoEnvironment[];
         /** List of Nintendo Subscription Environments, currently supporting up to 4. */
         SubscriptionEnvironments?: NintendoEnvironment[];
 
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts
index ac9ca0c9..8a96312d 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts
@@ -5064,7 +5064,7 @@ declare module PlayFabAdminModels {
     }
 
     export interface SetPlayerSecretRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** Unique PlayFab assigned ID of the user on whom the operation will be performed. */
         PlayFabId: string;
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts
index 39be01d0..3819a54d 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts
@@ -3669,13 +3669,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Specific Operating System version for the user's device. */
         OS?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3690,7 +3690,7 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /**
          * The JSON Web token (JWT) returned by Apple after login. Represented as the identityToken field in the authorization
@@ -3700,7 +3700,7 @@ declare module PlayFabClientModels {
         IdentityToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3715,13 +3715,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** The JSON Web Token (JWT) returned by Battle.net after login */
         IdentityToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3738,11 +3738,11 @@ declare module PlayFabClientModels {
         CustomId?: string;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3774,13 +3774,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Facebook Instant Games signature for the user. */
         FacebookInstantGamesSignature: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3799,11 +3799,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3818,13 +3818,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Unique Game Center player id. */
         PlayerId?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** The URL for the public encryption key that will be used to verify the signature. */
         PublicKeyUrl?: string;
@@ -3850,11 +3850,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * OAuth 2.0 server authentication code obtained on the client by calling the getServerAuthCode()
@@ -3876,11 +3876,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * OAuth 2.0 server authentication code obtained on the client by calling the requestServerSideAccess()
@@ -3904,13 +3904,13 @@ declare module PlayFabClientModels {
         DeviceId?: string;
         /** Specific model of the user's device. */
         DeviceModel?: string;
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Specific Operating System version for the user's device. */
         OS?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3927,13 +3927,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Numeric user ID assigned by Kongregate */
         KongregateId?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3948,13 +3948,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** The JSON Web token (JWT) returned by Nintendo after login. */
         IdentityToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3969,13 +3969,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Nintendo Switch unique identifier for the user's device. */
         NintendoSwitchDeviceId?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -3992,7 +3992,7 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /**
          * The JSON Web token (JWT) returned by the identity provider after login. Represented as the id_token field in the
@@ -4001,7 +4001,7 @@ declare module PlayFabClientModels {
         IdToken: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -4035,13 +4035,13 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Id of the PlayStation :tm: Network issuer environment. If null, defaults to production environment. */
         IssuerId?: number;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** Redirect URI supplied to PlayStation :tm: Network when requesting an auth code */
         RedirectUri?: string;
@@ -4058,11 +4058,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Authentication token for the user, returned as a byte array from Steam, and converted to a string (for example, the byte
@@ -4089,11 +4089,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -4108,11 +4108,11 @@ declare module PlayFabClientModels {
         CreateAccount?: boolean;
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
@@ -4541,13 +4541,13 @@ declare module PlayFabClientModels {
         DisplayName?: string;
         /** User email address attached to their account */
         Email?: string;
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
         /** Password for the PlayFab account (6-100 characters) */
         Password?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /**
          * An optional parameter that specifies whether both the username and email parameters are required. If true, both
@@ -4745,9 +4745,9 @@ declare module PlayFabClientModels {
     }
 
     export interface SetPlayerSecretRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
+        /** Base64 encoded body that is encrypted with the Title's public RSA key. */
         EncryptedRequest?: string;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
 
     }
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts
index e9a22a2e..47884a40 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts
@@ -302,6 +302,11 @@ declare module PlayFabServerModule {
          * https://docs.microsoft.com/rest/api/playfab/server/account-management/getplayfabidsfrompsnonlineids
          */
         GetPlayFabIDsFromPSNOnlineIDs(request: PlayFabServerModels.GetPlayFabIDsFromPSNOnlineIDsRequest, callback: PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromPSNOnlineIDsResult>, customData?: any, extraHeaders?: { [key: string]: string }): Promise<PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromPSNOnlineIDsResult>>;
+        /**
+         * Retrieves the associated PlayFab account identifiers for the given set of server custom player identifiers.
+         * https://docs.microsoft.com/rest/api/playfab/server/account-management/getplayfabidsfromservercustomids
+         */
+        GetPlayFabIDsFromServerCustomIDs(request: PlayFabServerModels.GetPlayFabIDsFromServerCustomIDsRequest, callback: PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromServerCustomIDsResult>, customData?: any, extraHeaders?: { [key: string]: string }): Promise<PlayFabModule.ApiCallback<PlayFabServerModels.GetPlayFabIDsFromServerCustomIDsResult>>;
         /**
          * Retrieves the unique PlayFab identifiers for the given set of Steam identifiers. The Steam identifiers are the profile
          * IDs for the user accounts, available as SteamId in the Steamworks Community API calls.
@@ -3605,6 +3610,21 @@ declare module PlayFabServerModels {
 
     }
 
+    export interface GetPlayFabIDsFromServerCustomIDsRequest extends PlayFabModule.IPlayFabRequestCommon {
+        /**
+         * Array of unique server custom player identifiers for which the title needs to get PlayFab identifiers. Cannot contain
+         * more than 25 identifiers.
+         */
+        ServerCustomIds: string[];
+
+    }
+
+    export interface GetPlayFabIDsFromServerCustomIDsResult extends PlayFabModule.IPlayFabResultCommon  {
+        /** Mapping of server custom identifiers to PlayFab identifiers. */
+        Data?: ServerCustomIDPlayFabIDPair[];
+
+    }
+
     export interface GetPlayFabIDsFromSteamIDsRequest extends PlayFabModule.IPlayFabRequestCommon {
         /**
          * Array of unique Steam identifiers (Steam profile IDs) for which the title needs to get PlayFab identifiers. The array
@@ -4414,7 +4434,7 @@ declare module PlayFabServerModels {
         CustomTags?: { [key: string]: string | null };
         /** Flags for which pieces of info to return for the user. */
         InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** The backend server identifier for this player. */
         ServerCustomId: string;
@@ -5107,7 +5127,7 @@ declare module PlayFabServerModels {
     }
 
     export interface SetPlayerSecretRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** Player secret that is used to verify API request signatures (Enterprise Only). */
+        /** Player secret that is used to verify API request signatures. */
         PlayerSecret?: string;
         /** Unique PlayFab assigned ID of the user on whom the operation will be performed. */
         PlayFabId: string;