diff --git a/PlayFabSdk/package.json b/PlayFabSdk/package.json
index 9d073791..9c74c542 100644
--- a/PlayFabSdk/package.json
+++ b/PlayFabSdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playfab-web-sdk",
-  "version": "1.86.210511",
+  "version": "1.87.210521",
   "description": "Playfab SDK for JS client applications",
   "license": "Apache-2.0",
   "repository": {
diff --git a/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js b/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js
index b6a79f8e..9cc88608 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabAdminApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -716,6 +708,7 @@ PlayFab.AdminApi = {
     UpdateUserTitleDisplayName: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Admin/UpdateUserTitleDisplayName", request, "X-SecretKey", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabAdminSDK = PlayFab.AdminApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js b/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js
index c6efc814..4b190723 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabAuthenticationApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -265,6 +257,7 @@ PlayFab.AuthenticationApi = {
     ValidateEntityToken: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Authentication/ValidateEntityToken", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabAuthenticationSDK = PlayFab.AuthenticationApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabClientApi.js b/PlayFabSdk/src/PlayFab/PlayFabClientApi.js
index 3e4bfa7d..b5779375 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabClientApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabClientApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -286,14 +278,7 @@ PlayFab.ClientApi = {
     },
 
     AttributeInstall: function (request, callback, customData, extraHeaders) {
-        var overloadCallback = function (result, error) {
-            // Modify advertisingIdType:  Prevents us from sending the id multiple times, and allows automated tests to determine id was sent successfully
-            PlayFab.settings.advertisingIdType += "_Successful";
-
-            if (callback != null && typeof (callback) === "function")
-                callback(result, error);
-        };
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/AttributeInstall", request, "X-Authorization", overloadCallback, customData, extraHeaders);
+        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/AttributeInstall", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
     CancelTrade: function (request, callback, customData, extraHeaders) {
@@ -544,13 +529,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/GetUserReadOnlyData", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    GetWindowsHelloChallenge: function (request, callback, customData, extraHeaders) {
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/GetWindowsHelloChallenge", request, null, callback, customData, extraHeaders);
-    },
-
     GrantCharacterToUser: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/GrantCharacterToUser", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -615,13 +593,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LinkTwitch", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    LinkWindowsHello: function (request, callback, customData, extraHeaders) {
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LinkWindowsHello", request, "X-Authorization", callback, customData, extraHeaders);
-    },
-
     LinkXboxAccount: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LinkXboxAccount", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -641,7 +612,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -666,7 +636,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -691,7 +660,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -716,7 +684,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -741,7 +708,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -766,7 +732,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -791,7 +756,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -816,7 +780,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -841,7 +804,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -866,7 +828,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -891,7 +852,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -916,7 +876,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -941,7 +900,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -966,7 +924,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -991,7 +948,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1016,7 +972,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1041,7 +996,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1051,34 +1005,6 @@ PlayFab.ClientApi = {
         return new Promise(function(resolve){resolve(authenticationContext);});
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    LoginWithWindowsHello: function (request, callback, customData, extraHeaders) {
-        request.TitleId = PlayFab.settings.titleId ? PlayFab.settings.titleId : request.TitleId; if (!request.TitleId) throw PlayFab._internalSettings.errorTitleId;
-        // PlayFab._internalSettings.authenticationContext can be modified by other asynchronous login attempts
-        // Deep-copy the authenticationContext here to safely update it
-        var authenticationContext = JSON.parse(JSON.stringify(PlayFab._internalSettings.authenticationContext));
-        var overloadCallback = function (result, error) {
-            if (result != null) {
-                if(result.data.SessionTicket != null) {
-                    PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
-                }
-                if (result.data.EntityToken != null) {
-                    PlayFab._internalSettings.entityToken = result.data.EntityToken.EntityToken;
-                }
-                // Apply the updates for the AuthenticationContext returned to the client
-                authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
-            }
-            if (callback != null && typeof (callback) === "function")
-                callback(result, error);
-        };
-        PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LoginWithWindowsHello", request, null, overloadCallback, customData, extraHeaders);
-        // Return a Promise so that multiple asynchronous calls to this method can be handled simultaneously with Promise.all()
-        return new Promise(function(resolve){resolve(authenticationContext);});
-    },
-
     LoginWithXbox: function (request, callback, customData, extraHeaders) {
         request.TitleId = PlayFab.settings.titleId ? PlayFab.settings.titleId : request.TitleId; if (!request.TitleId) throw PlayFab._internalSettings.errorTitleId;
         // PlayFab._internalSettings.authenticationContext can be modified by other asynchronous login attempts
@@ -1094,7 +1020,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1140,7 +1065,6 @@ PlayFab.ClientApi = {
         var overloadCallback = function (result, error) {
             if (result != null && result.data.SessionTicket != null) {
                 PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1148,34 +1072,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/RegisterPlayFabUser", request, null, overloadCallback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    RegisterWithWindowsHello: function (request, callback, customData, extraHeaders) {
-        request.TitleId = PlayFab.settings.titleId ? PlayFab.settings.titleId : request.TitleId; if (!request.TitleId) throw PlayFab._internalSettings.errorTitleId;
-        // PlayFab._internalSettings.authenticationContext can be modified by other asynchronous login attempts
-        // Deep-copy the authenticationContext here to safely update it
-        var authenticationContext = JSON.parse(JSON.stringify(PlayFab._internalSettings.authenticationContext));
-        var overloadCallback = function (result, error) {
-            if (result != null) {
-                if(result.data.SessionTicket != null) {
-                    PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
-                }
-                if (result.data.EntityToken != null) {
-                    PlayFab._internalSettings.entityToken = result.data.EntityToken.EntityToken;
-                }
-                // Apply the updates for the AuthenticationContext returned to the client
-                authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
-            }
-            if (callback != null && typeof (callback) === "function")
-                callback(result, error);
-        };
-        PlayFab._internalSettings.ExecuteRequestWrapper("/Client/RegisterWithWindowsHello", request, null, overloadCallback, customData, extraHeaders);
-        // Return a Promise so that multiple asynchronous calls to this method can be handled simultaneously with Promise.all()
-        return new Promise(function(resolve){resolve(authenticationContext);});
-    },
-
     RemoveContactEmail: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/RemoveContactEmail", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -1296,13 +1192,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/UnlinkTwitch", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    UnlinkWindowsHello: function (request, callback, customData, extraHeaders) {
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/UnlinkWindowsHello", request, "X-Authorization", callback, customData, extraHeaders);
-    },
-
     UnlinkXboxAccount: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/UnlinkXboxAccount", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -1375,19 +1264,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/WriteTitleEvent", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    _MultiStepClientLogin: function (needsAttribution) {
-        if (needsAttribution && !PlayFab.settings.disableAdvertising && PlayFab.settings.advertisingIdType !== null && PlayFab.settings.advertisingIdValue !== null) {
-            var request = {};
-            if (PlayFab.settings.advertisingIdType === PlayFab.settings.AD_TYPE_IDFA) {
-                request.Idfa = PlayFab.settings.advertisingIdValue;
-            } else if (PlayFab.settings.advertisingIdType === PlayFab.settings.AD_TYPE_ANDROID_ID) {
-                request.Adid = PlayFab.settings.advertisingIdValue;
-            } else {
-                return;
-            }
-            PlayFab.ClientApi.AttributeInstall(request, null);
-        }
-    }
 };
 
 var PlayFabClientSDK = PlayFab.ClientApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js b/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js
index 5a315761..a0e36c85 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabCloudScriptApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -296,6 +288,7 @@ PlayFab.CloudScriptApi = {
     UnregisterFunction: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/CloudScript/UnregisterFunction", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabCloudScriptSDK = PlayFab.CloudScriptApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabDataApi.js b/PlayFabSdk/src/PlayFab/PlayFabDataApi.js
index 20c16985..e39115be 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabDataApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabDataApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -276,6 +268,7 @@ PlayFab.DataApi = {
     SetObjects: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Object/SetObjects", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabDataSDK = PlayFab.DataApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js b/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js
index 31cb5e1e..113267c7 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabEventsApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -256,6 +248,7 @@ PlayFab.EventsApi = {
     WriteTelemetryEvents: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Event/WriteTelemetryEvents", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabEventsSDK = PlayFab.EventsApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js b/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js
index 36b6220f..bdd3ac11 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabExperimentationApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -300,6 +292,7 @@ PlayFab.ExperimentationApi = {
     UpdateExperiment: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Experimentation/UpdateExperiment", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabExperimentationSDK = PlayFab.ExperimentationApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js b/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js
index 64382364..91cb80f8 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabGroupsApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -348,6 +340,7 @@ PlayFab.GroupsApi = {
     UpdateRole: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Group/UpdateRole", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabGroupsSDK = PlayFab.GroupsApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js b/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js
index 3f4a70e3..29f702ef 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabInsightsApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -272,6 +264,7 @@ PlayFab.InsightsApi = {
     SetStorageRetention: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Insights/SetStorageRetention", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabInsightsSDK = PlayFab.InsightsApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js b/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js
index be36aca6..734e83f7 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabLocalizationApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -252,6 +244,7 @@ PlayFab.LocalizationApi = {
     GetLanguageList: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Locale/GetLanguageList", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabLocalizationSDK = PlayFab.LocalizationApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabMatchmakerApi.js b/PlayFabSdk/src/PlayFab/PlayFabMatchmakerApi.js
index 7b16e38d..a1b0129a 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabMatchmakerApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabMatchmakerApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -268,6 +260,7 @@ PlayFab.MatchmakerApi = {
     UserInfo: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Matchmaker/UserInfo", request, "X-SecretKey", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabMatchmakerSDK = PlayFab.MatchmakerApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js b/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js
index f995af77..a8f4ac5c 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabMultiplayerApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -504,6 +496,7 @@ PlayFab.MultiplayerApi = {
     UploadCertificate: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/MultiplayerServer/UploadCertificate", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabMultiplayerSDK = PlayFab.MultiplayerApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js b/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js
index 36565fbe..01cfeefc 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabProfilesApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -276,6 +268,7 @@ PlayFab.ProfilesApi = {
     SetProfilePolicy: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Profile/SetProfilePolicy", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabProfilesSDK = PlayFab.ProfilesApi;
diff --git a/PlayFabSdk/src/PlayFab/PlayFabServerApi.js b/PlayFabSdk/src/PlayFab/PlayFabServerApi.js
index 4c7412b5..7119dfab 100644
--- a/PlayFabSdk/src/PlayFab/PlayFabServerApi.js
+++ b/PlayFabSdk/src/PlayFab/PlayFabServerApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -780,6 +772,7 @@ PlayFab.ServerApi = {
     WriteTitleEvent: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/WriteTitleEvent", request, "X-SecretKey", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabServerSDK = PlayFab.ServerApi;
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts
index 7d66dc50..371fcec8 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabAdminApi.d.ts
@@ -2505,6 +2505,8 @@ declare module PlayFabAdminModels {
         | "UpdateSegmentRateLimitExceeded"
         | "GetSegmentsRateLimitExceeded"
         | "AsyncExportNotInFlight"
+        | "AsyncExportNotFound"
+        | "AsyncExportRateLimitExceeded"
         | "SnapshotNotFound"
         | "InventoryApiNotImplemented";
 
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts
index a5f4b62d..6bbbfac3 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabClientApi.d.ts
@@ -404,11 +404,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/player-data-management/getuserreadonlydata
          */
         GetUserReadOnlyData(request: PlayFabClientModels.GetUserDataRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.GetUserDataResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate.
-         * https://docs.microsoft.com/rest/api/playfab/client/authentication/getwindowshellochallenge
-         */
-        GetWindowsHelloChallenge(request: PlayFabClientModels.GetWindowsHelloChallengeRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.GetWindowsHelloChallengeResponse>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Grants the specified character type to the user. CharacterIds are not globally unique; characterId must be evaluated
          * with the parent PlayFabId to guarantee uniqueness.
@@ -494,11 +489,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/linktwitch
          */
         LinkTwitch(request: PlayFabClientModels.LinkTwitchAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LinkTwitchAccountResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Link Windows Hello authentication to the current PlayFab Account
-         * https://docs.microsoft.com/rest/api/playfab/client/account-management/linkwindowshello
-         */
-        LinkWindowsHello(request: PlayFabClientModels.LinkWindowsHelloAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LinkWindowsHelloAccountResponse>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Links the Xbox Live account associated with the provided access code to the user's PlayFab account
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/linkxboxaccount
@@ -608,14 +598,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/authentication/loginwithtwitch
          */
         LoginWithTwitch(request: PlayFabClientModels.LoginWithTwitchRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LoginResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge.
-         * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge
-         * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the
-         * server.
-         * https://docs.microsoft.com/rest/api/playfab/client/authentication/loginwithwindowshello
-         */
-        LoginWithWindowsHello(request: PlayFabClientModels.LoginWithWindowsHelloRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LoginResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Signs the user in using a Xbox Live Token, returning a session identifier that can subsequently be used for API calls
          * which require an authenticated user
@@ -670,12 +652,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/authentication/registerplayfabuser
          */
         RegisterPlayFabUser(request: PlayFabClientModels.RegisterPlayFabUserRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.RegisterPlayFabUserResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can
-         * subsequently be used for API calls which require an authenticated user
-         * https://docs.microsoft.com/rest/api/playfab/client/authentication/registerwithwindowshello
-         */
-        RegisterWithWindowsHello(request: PlayFabClientModels.RegisterWithWindowsHelloRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LoginResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Removes a contact email from the player's profile.
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/removecontactemail
@@ -837,11 +813,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/unlinktwitch
          */
         UnlinkTwitch(request: PlayFabClientModels.UnlinkTwitchAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.UnlinkTwitchAccountResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Unlink Windows Hello authentication from the current PlayFab Account
-         * https://docs.microsoft.com/rest/api/playfab/client/account-management/unlinkwindowshello
-         */
-        UnlinkWindowsHello(request: PlayFabClientModels.UnlinkWindowsHelloAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.UnlinkWindowsHelloAccountResponse>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Unlinks the related Xbox Live account from the user's PlayFab account
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/unlinkxboxaccount
@@ -2992,23 +2963,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface GetWindowsHelloChallengeRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** SHA256 hash of the PublicKey generated by Windows Hello. */
-        PublicKeyHint: string;
-        /**
-         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
-         * title has been selected.
-         */
-        TitleId: string;
-
-    }
-
-    export interface GetWindowsHelloChallengeResponse extends PlayFabModule.IPlayFabResultCommon  {
-        /** Server generated challenge to be signed by the user. */
-        Challenge?: string;
-
-    }
-
     export interface GooglePlayFabIdPair {
         /** Unique Google identifier for a user. */
         GoogleId?: string;
@@ -3354,24 +3308,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface LinkWindowsHelloAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** Device name. */
-        DeviceName?: string;
-        /** If another user is already linked to the account, unlink the other user and re-link. */
-        ForceLink?: boolean;
-        /** PublicKey generated by Windows Hello. */
-        PublicKey: string;
-        /** Player's user named used by Windows Hello. */
-        UserName: string;
-
-    }
-
-    export interface LinkWindowsHelloAccountResponse extends PlayFabModule.IPlayFabResultCommon  {
-
-    }
-
     export interface LinkXboxAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
@@ -3845,23 +3781,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface LoginWithWindowsHelloRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The signed response from the user for the Challenge. */
-        ChallengeSignature: string;
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** Flags for which pieces of info to return for the user. */
-        InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** SHA256 hash of the PublicKey generated by Windows Hello. */
-        PublicKeyHint: string;
-        /**
-         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
-         * title has been selected.
-         */
-        TitleId?: string;
-
-    }
-
     export interface LoginWithXboxRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** Automatically create a PlayFab account if one is not currently linked to this ID. */
         CreateAccount?: boolean;
@@ -4365,29 +4284,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface RegisterWithWindowsHelloRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** Device name. */
-        DeviceName?: string;
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
-        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). */
-        PlayerSecret?: string;
-        /** PublicKey generated by Windows Hello. */
-        PublicKey?: string;
-        /**
-         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
-         * title has been selected.
-         */
-        TitleId: string;
-        /** Player's user name used by Windows Hello. */
-        UserName?: string;
-
-    }
-
     export interface RemoveContactEmailRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
@@ -5020,18 +4916,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface UnlinkWindowsHelloAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** SHA256 hash of the PublicKey generated by Windows Hello. */
-        PublicKeyHint: string;
-
-    }
-
-    export interface UnlinkWindowsHelloAccountResponse extends PlayFabModule.IPlayFabResultCommon  {
-
-    }
-
     export interface UnlinkXboxAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
diff --git a/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts b/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts
index 622b4338..58131d79 100644
--- a/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/PlayFabServerApi.d.ts
@@ -2382,6 +2382,8 @@ declare module PlayFabServerModels {
         | "UpdateSegmentRateLimitExceeded"
         | "GetSegmentsRateLimitExceeded"
         | "AsyncExportNotInFlight"
+        | "AsyncExportNotFound"
+        | "AsyncExportRateLimitExceeded"
         | "SnapshotNotFound"
         | "InventoryApiNotImplemented";
 
diff --git a/PlayFabSdk/src/Typings/PlayFab/Playfab.d.ts b/PlayFabSdk/src/Typings/PlayFab/Playfab.d.ts
index 16df5f6f..885a0635 100644
--- a/PlayFabSdk/src/Typings/PlayFab/Playfab.d.ts
+++ b/PlayFabSdk/src/Typings/PlayFab/Playfab.d.ts
@@ -18,11 +18,6 @@ declare module PlayFabModule {
         titleId: string;
         developerSecretKey: string;
         GlobalHeaderInjection?: { [key: string]: string };
-        advertisingIdType: string;
-        advertisingIdValue: string;
-        disableAdvertising: boolean;
-        AD_TYPE_IDFA: string;
-        AD_TYPE_ANDROID_ID: string;
         productionServerUrl: string;
     }
     export interface IPlayFabRequestCommon { }
diff --git a/PlayFabTestingExample/PlayFabApiTest.js b/PlayFabTestingExample/PlayFabApiTest.js
index 74c3eb4a..bf85a8d6 100644
--- a/PlayFabTestingExample/PlayFabApiTest.js
+++ b/PlayFabTestingExample/PlayFabApiTest.js
@@ -36,7 +36,6 @@ var PlayFabApiTests = {
         QUnit.test("InvalidLogin", PlayFabApiTests.InvalidLogin);
         QUnit.test("InvalidRegistration", PlayFabApiTests.InvalidRegistration);
         QUnit.test("LoginOrRegister", PlayFabApiTests.LoginOrRegister);
-        QUnit.test("LoginWithAdvertisingId", PlayFabApiTests.LoginWithAdvertisingId);
         setTimeout(function () { PlayFabApiTests.PostLoginTests(0); }, PlayFabApiTests.testRetryDelay);
         setTimeout(function () { PlayFabApiTests.PostEntityTokenTests(0); }, PlayFabApiTests.testRetryDelay);
     },
@@ -181,34 +180,6 @@ var PlayFabApiTests = {
         // By definition, a promise object should have a .then function, and Promise.resolve(promise) should equal promise
         assert.ok(typeof loginPromise.then === "function" && Promise.resolve(loginPromise) === loginPromise, "Testing whether the login request returned a promise object");
     },
-    /* CLIENT API
-     * Test that the login call sequence sends the AdvertisingId when set
-     */
-    LoginWithAdvertisingId: function (assert) {
-        PlayFab.settings.advertisingIdType = PlayFab.settings.AD_TYPE_ANDROID_ID;
-        PlayFab.settings.advertisingIdValue = "PlayFabTestId";
-        var loginDone = assert.async();
-        var count = -1;
-        var finishAdvertId = function () {
-            count += 1;
-            if (count <= 10 && PlayFab.settings.advertisingIdType !== PlayFab.settings.AD_TYPE_ANDROID_ID + "_Successful") {
-                setTimeout(PlayFabApiTests.SimpleCallbackWrapper("finishAdvertId", finishAdvertId, assert), 200);
-            }
-            else {
-                assert.ok(PlayFab.settings.advertisingIdType === PlayFab.settings.AD_TYPE_ANDROID_ID + "_Successful", "Testing whether advertisingId submitted properly");
-                loginDone();
-            }
-        };
-        var advertLoginCallback = function (result, error) {
-            PlayFabApiTests.VerifyNullError(result, error, assert, "Testing Advert-Login result");
-            setTimeout(PlayFabApiTests.SimpleCallbackWrapper("finishAdvertId", finishAdvertId, assert), 200);
-        };
-        var loginRequest = {
-            CustomId: PlayFab.buildIdentifier,
-            CreateAccount: true
-        };
-        Promise.resolve(PlayFabClientSDK.LoginWithCustomID(loginRequest, PlayFabApiTests.CallbackWrapper("advertLoginCallback", advertLoginCallback, assert)));
-    },
     /* CLIENT API
      * Test a sequence of calls that modifies saved data,
      *   and verifies that the next sequential API call contains updated data.
diff --git a/PlayFabTestingExample/PlayFabApiTest.ts b/PlayFabTestingExample/PlayFabApiTest.ts
index c78f04e6..336ffa7f 100644
--- a/PlayFabTestingExample/PlayFabApiTest.ts
+++ b/PlayFabTestingExample/PlayFabApiTest.ts
@@ -43,7 +43,6 @@ var PlayFabApiTests = {
         QUnit.test("InvalidLogin", PlayFabApiTests.InvalidLogin);
         QUnit.test("InvalidRegistration", PlayFabApiTests.InvalidRegistration);
         QUnit.test("LoginOrRegister", PlayFabApiTests.LoginOrRegister);
-        QUnit.test("LoginWithAdvertisingId", PlayFabApiTests.LoginWithAdvertisingId);
 
         setTimeout(function (): void { PlayFabApiTests.PostLoginTests(0); }, PlayFabApiTests.testRetryDelay);
         setTimeout(function (): void { PlayFabApiTests.PostEntityTokenTests(0); }, PlayFabApiTests.testRetryDelay);
@@ -207,35 +206,6 @@ var PlayFabApiTests = {
         assert.ok(typeof loginPromise.then === "function" && Promise.resolve(loginPromise) === loginPromise, "Testing whether the login request returned a promise object");
     },
 
-    /* CLIENT API
-     * Test that the login call sequence sends the AdvertisingId when set
-     */
-    LoginWithAdvertisingId: function (assert): void {
-        PlayFab.settings.advertisingIdType = PlayFab.settings.AD_TYPE_ANDROID_ID;
-        PlayFab.settings.advertisingIdValue = "PlayFabTestId";
-
-        var loginDone = assert.async();
-        var count = -1;
-        var finishAdvertId = function (): void {
-            count += 1;
-            if (count <= 10 && PlayFab.settings.advertisingIdType !== PlayFab.settings.AD_TYPE_ANDROID_ID + "_Successful") {
-                setTimeout(PlayFabApiTests.SimpleCallbackWrapper("finishAdvertId", finishAdvertId, assert), 200);
-            } else {
-                assert.ok(PlayFab.settings.advertisingIdType === PlayFab.settings.AD_TYPE_ANDROID_ID + "_Successful", "Testing whether advertisingId submitted properly");
-                loginDone();
-            }
-        };
-        var advertLoginCallback = function (result: PlayFabModule.SuccessContainer<PlayFabClientModels.LoginResult>, error: PlayFabModule.IPlayFabError): void {
-            PlayFabApiTests.VerifyNullError(result, error, assert, "Testing Advert-Login result");
-            setTimeout(PlayFabApiTests.SimpleCallbackWrapper("finishAdvertId", finishAdvertId, assert), 200);
-        };
-        var loginRequest = <PlayFabClientModels.LoginWithCustomIDRequest>{
-            CustomId: PlayFab.buildIdentifier,
-            CreateAccount: true
-        };
-        Promise.resolve(PlayFabClientSDK.LoginWithCustomID(loginRequest, PlayFabApiTests.CallbackWrapper("advertLoginCallback", advertLoginCallback, assert)));
-    },
-
     /* CLIENT API
      * Test a sequence of calls that modifies saved data,
      *   and verifies that the next sequential API call contains updated data.
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js
index b6a79f8e..9cc88608 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabAdminApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -716,6 +708,7 @@ PlayFab.AdminApi = {
     UpdateUserTitleDisplayName: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Admin/UpdateUserTitleDisplayName", request, "X-SecretKey", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabAdminSDK = PlayFab.AdminApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js
index c6efc814..4b190723 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabAuthenticationApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -265,6 +257,7 @@ PlayFab.AuthenticationApi = {
     ValidateEntityToken: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Authentication/ValidateEntityToken", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabAuthenticationSDK = PlayFab.AuthenticationApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js
index 3e4bfa7d..b5779375 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabClientApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -286,14 +278,7 @@ PlayFab.ClientApi = {
     },
 
     AttributeInstall: function (request, callback, customData, extraHeaders) {
-        var overloadCallback = function (result, error) {
-            // Modify advertisingIdType:  Prevents us from sending the id multiple times, and allows automated tests to determine id was sent successfully
-            PlayFab.settings.advertisingIdType += "_Successful";
-
-            if (callback != null && typeof (callback) === "function")
-                callback(result, error);
-        };
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/AttributeInstall", request, "X-Authorization", overloadCallback, customData, extraHeaders);
+        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/AttributeInstall", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
     CancelTrade: function (request, callback, customData, extraHeaders) {
@@ -544,13 +529,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/GetUserReadOnlyData", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    GetWindowsHelloChallenge: function (request, callback, customData, extraHeaders) {
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/GetWindowsHelloChallenge", request, null, callback, customData, extraHeaders);
-    },
-
     GrantCharacterToUser: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/GrantCharacterToUser", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -615,13 +593,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LinkTwitch", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    LinkWindowsHello: function (request, callback, customData, extraHeaders) {
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LinkWindowsHello", request, "X-Authorization", callback, customData, extraHeaders);
-    },
-
     LinkXboxAccount: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LinkXboxAccount", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -641,7 +612,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -666,7 +636,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -691,7 +660,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -716,7 +684,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -741,7 +708,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -766,7 +732,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -791,7 +756,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -816,7 +780,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -841,7 +804,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -866,7 +828,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -891,7 +852,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -916,7 +876,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -941,7 +900,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -966,7 +924,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -991,7 +948,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1016,7 +972,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1041,7 +996,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1051,34 +1005,6 @@ PlayFab.ClientApi = {
         return new Promise(function(resolve){resolve(authenticationContext);});
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    LoginWithWindowsHello: function (request, callback, customData, extraHeaders) {
-        request.TitleId = PlayFab.settings.titleId ? PlayFab.settings.titleId : request.TitleId; if (!request.TitleId) throw PlayFab._internalSettings.errorTitleId;
-        // PlayFab._internalSettings.authenticationContext can be modified by other asynchronous login attempts
-        // Deep-copy the authenticationContext here to safely update it
-        var authenticationContext = JSON.parse(JSON.stringify(PlayFab._internalSettings.authenticationContext));
-        var overloadCallback = function (result, error) {
-            if (result != null) {
-                if(result.data.SessionTicket != null) {
-                    PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
-                }
-                if (result.data.EntityToken != null) {
-                    PlayFab._internalSettings.entityToken = result.data.EntityToken.EntityToken;
-                }
-                // Apply the updates for the AuthenticationContext returned to the client
-                authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
-            }
-            if (callback != null && typeof (callback) === "function")
-                callback(result, error);
-        };
-        PlayFab._internalSettings.ExecuteRequestWrapper("/Client/LoginWithWindowsHello", request, null, overloadCallback, customData, extraHeaders);
-        // Return a Promise so that multiple asynchronous calls to this method can be handled simultaneously with Promise.all()
-        return new Promise(function(resolve){resolve(authenticationContext);});
-    },
-
     LoginWithXbox: function (request, callback, customData, extraHeaders) {
         request.TitleId = PlayFab.settings.titleId ? PlayFab.settings.titleId : request.TitleId; if (!request.TitleId) throw PlayFab._internalSettings.errorTitleId;
         // PlayFab._internalSettings.authenticationContext can be modified by other asynchronous login attempts
@@ -1094,7 +1020,6 @@ PlayFab.ClientApi = {
                 }
                 // Apply the updates for the AuthenticationContext returned to the client
                 authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1140,7 +1065,6 @@ PlayFab.ClientApi = {
         var overloadCallback = function (result, error) {
             if (result != null && result.data.SessionTicket != null) {
                 PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
             }
             if (callback != null && typeof (callback) === "function")
                 callback(result, error);
@@ -1148,34 +1072,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/RegisterPlayFabUser", request, null, overloadCallback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    RegisterWithWindowsHello: function (request, callback, customData, extraHeaders) {
-        request.TitleId = PlayFab.settings.titleId ? PlayFab.settings.titleId : request.TitleId; if (!request.TitleId) throw PlayFab._internalSettings.errorTitleId;
-        // PlayFab._internalSettings.authenticationContext can be modified by other asynchronous login attempts
-        // Deep-copy the authenticationContext here to safely update it
-        var authenticationContext = JSON.parse(JSON.stringify(PlayFab._internalSettings.authenticationContext));
-        var overloadCallback = function (result, error) {
-            if (result != null) {
-                if(result.data.SessionTicket != null) {
-                    PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
-                }
-                if (result.data.EntityToken != null) {
-                    PlayFab._internalSettings.entityToken = result.data.EntityToken.EntityToken;
-                }
-                // Apply the updates for the AuthenticationContext returned to the client
-                authenticationContext = PlayFab._internalSettings.UpdateAuthenticationContext(authenticationContext, result);
-                PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
-            }
-            if (callback != null && typeof (callback) === "function")
-                callback(result, error);
-        };
-        PlayFab._internalSettings.ExecuteRequestWrapper("/Client/RegisterWithWindowsHello", request, null, overloadCallback, customData, extraHeaders);
-        // Return a Promise so that multiple asynchronous calls to this method can be handled simultaneously with Promise.all()
-        return new Promise(function(resolve){resolve(authenticationContext);});
-    },
-
     RemoveContactEmail: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/RemoveContactEmail", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -1296,13 +1192,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/UnlinkTwitch", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    /**
-     * @deprecated Do not use
-     */
-    UnlinkWindowsHello: function (request, callback, customData, extraHeaders) {
-        return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/UnlinkWindowsHello", request, "X-Authorization", callback, customData, extraHeaders);
-    },
-
     UnlinkXboxAccount: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/UnlinkXboxAccount", request, "X-Authorization", callback, customData, extraHeaders);
     },
@@ -1375,19 +1264,6 @@ PlayFab.ClientApi = {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Client/WriteTitleEvent", request, "X-Authorization", callback, customData, extraHeaders);
     },
 
-    _MultiStepClientLogin: function (needsAttribution) {
-        if (needsAttribution && !PlayFab.settings.disableAdvertising && PlayFab.settings.advertisingIdType !== null && PlayFab.settings.advertisingIdValue !== null) {
-            var request = {};
-            if (PlayFab.settings.advertisingIdType === PlayFab.settings.AD_TYPE_IDFA) {
-                request.Idfa = PlayFab.settings.advertisingIdValue;
-            } else if (PlayFab.settings.advertisingIdType === PlayFab.settings.AD_TYPE_ANDROID_ID) {
-                request.Adid = PlayFab.settings.advertisingIdValue;
-            } else {
-                return;
-            }
-            PlayFab.ClientApi.AttributeInstall(request, null);
-        }
-    }
 };
 
 var PlayFabClientSDK = PlayFab.ClientApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js
index 5a315761..a0e36c85 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabCloudScriptApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -296,6 +288,7 @@ PlayFab.CloudScriptApi = {
     UnregisterFunction: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/CloudScript/UnregisterFunction", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabCloudScriptSDK = PlayFab.CloudScriptApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js
index 20c16985..e39115be 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabDataApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -276,6 +268,7 @@ PlayFab.DataApi = {
     SetObjects: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Object/SetObjects", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabDataSDK = PlayFab.DataApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js
index 31cb5e1e..113267c7 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabEventsApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -256,6 +248,7 @@ PlayFab.EventsApi = {
     WriteTelemetryEvents: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Event/WriteTelemetryEvents", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabEventsSDK = PlayFab.EventsApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js
index 36b6220f..bdd3ac11 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabExperimentationApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -300,6 +292,7 @@ PlayFab.ExperimentationApi = {
     UpdateExperiment: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Experimentation/UpdateExperiment", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabExperimentationSDK = PlayFab.ExperimentationApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js
index 64382364..91cb80f8 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabGroupsApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -348,6 +340,7 @@ PlayFab.GroupsApi = {
     UpdateRole: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Group/UpdateRole", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabGroupsSDK = PlayFab.GroupsApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js
index 3f4a70e3..29f702ef 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabInsightsApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -272,6 +264,7 @@ PlayFab.InsightsApi = {
     SetStorageRetention: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Insights/SetStorageRetention", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabInsightsSDK = PlayFab.InsightsApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js
index be36aca6..734e83f7 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabLocalizationApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -252,6 +244,7 @@ PlayFab.LocalizationApi = {
     GetLanguageList: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Locale/GetLanguageList", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabLocalizationSDK = PlayFab.LocalizationApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabMatchmakerApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabMatchmakerApi.js
index 7b16e38d..a1b0129a 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabMatchmakerApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabMatchmakerApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -268,6 +260,7 @@ PlayFab.MatchmakerApi = {
     UserInfo: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Matchmaker/UserInfo", request, "X-SecretKey", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabMatchmakerSDK = PlayFab.MatchmakerApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js
index f995af77..a8f4ac5c 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabMultiplayerApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -504,6 +496,7 @@ PlayFab.MultiplayerApi = {
     UploadCertificate: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/MultiplayerServer/UploadCertificate", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabMultiplayerSDK = PlayFab.MultiplayerApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js
index 36565fbe..01cfeefc 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabProfilesApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -276,6 +268,7 @@ PlayFab.ProfilesApi = {
     SetProfilePolicy: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Profile/SetProfilePolicy", request, "X-EntityToken", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabProfilesSDK = PlayFab.ProfilesApi;
diff --git a/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js b/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js
index 4c7412b5..7119dfab 100644
--- a/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js
+++ b/PlayFabTestingExample/src/PlayFab/PlayFabServerApi.js
@@ -6,15 +6,7 @@ if(!PlayFab.settings) {
     PlayFab.settings = {
         titleId: null, // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
         developerSecretKey: null, // For security reasons you must never expose this value to the client or players - You must set this value for Server-APIs to work properly (Found in the Game Manager for your title, at the PlayFab Website)
-        advertisingIdType: null,
-        advertisingIdValue: null,
         GlobalHeaderInjection: null,
-
-        // disableAdvertising is provided for completeness, but changing it is not suggested
-        // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly
-        disableAdvertising: false,
-        AD_TYPE_IDFA: "Idfa",
-        AD_TYPE_ANDROID_ID: "Adid",
         productionServerUrl: ".playfabapi.com"
     }
 }
@@ -22,9 +14,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.86.210511",
+        sdkVersion: "1.87.210521",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.86.210511"
+            sdk: "JavaScriptSDK-1.87.210521"
         },
         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
@@ -231,8 +223,8 @@ if(!PlayFab._internalSettings) {
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_0";
-PlayFab.sdkVersion = "1.86.210511";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk_sdk-generic-3_1";
+PlayFab.sdkVersion = "1.87.210521";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -780,6 +772,7 @@ PlayFab.ServerApi = {
     WriteTitleEvent: function (request, callback, customData, extraHeaders) {
         return PlayFab._internalSettings.ExecuteRequestWrapper("/Server/WriteTitleEvent", request, "X-SecretKey", callback, customData, extraHeaders);
     },
+
 };
 
 var PlayFabServerSDK = PlayFab.ServerApi;
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFab.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFab.d.ts
index 16df5f6f..885a0635 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFab.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFab.d.ts
@@ -18,11 +18,6 @@ declare module PlayFabModule {
         titleId: string;
         developerSecretKey: string;
         GlobalHeaderInjection?: { [key: string]: string };
-        advertisingIdType: string;
-        advertisingIdValue: string;
-        disableAdvertising: boolean;
-        AD_TYPE_IDFA: string;
-        AD_TYPE_ANDROID_ID: string;
         productionServerUrl: string;
     }
     export interface IPlayFabRequestCommon { }
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts
index 7d66dc50..371fcec8 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabAdminApi.d.ts
@@ -2505,6 +2505,8 @@ declare module PlayFabAdminModels {
         | "UpdateSegmentRateLimitExceeded"
         | "GetSegmentsRateLimitExceeded"
         | "AsyncExportNotInFlight"
+        | "AsyncExportNotFound"
+        | "AsyncExportRateLimitExceeded"
         | "SnapshotNotFound"
         | "InventoryApiNotImplemented";
 
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts
index a5f4b62d..6bbbfac3 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabClientApi.d.ts
@@ -404,11 +404,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/player-data-management/getuserreadonlydata
          */
         GetUserReadOnlyData(request: PlayFabClientModels.GetUserDataRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.GetUserDataResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate.
-         * https://docs.microsoft.com/rest/api/playfab/client/authentication/getwindowshellochallenge
-         */
-        GetWindowsHelloChallenge(request: PlayFabClientModels.GetWindowsHelloChallengeRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.GetWindowsHelloChallengeResponse>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Grants the specified character type to the user. CharacterIds are not globally unique; characterId must be evaluated
          * with the parent PlayFabId to guarantee uniqueness.
@@ -494,11 +489,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/linktwitch
          */
         LinkTwitch(request: PlayFabClientModels.LinkTwitchAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LinkTwitchAccountResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Link Windows Hello authentication to the current PlayFab Account
-         * https://docs.microsoft.com/rest/api/playfab/client/account-management/linkwindowshello
-         */
-        LinkWindowsHello(request: PlayFabClientModels.LinkWindowsHelloAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LinkWindowsHelloAccountResponse>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Links the Xbox Live account associated with the provided access code to the user's PlayFab account
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/linkxboxaccount
@@ -608,14 +598,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/authentication/loginwithtwitch
          */
         LoginWithTwitch(request: PlayFabClientModels.LoginWithTwitchRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LoginResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge.
-         * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge
-         * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the
-         * server.
-         * https://docs.microsoft.com/rest/api/playfab/client/authentication/loginwithwindowshello
-         */
-        LoginWithWindowsHello(request: PlayFabClientModels.LoginWithWindowsHelloRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LoginResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Signs the user in using a Xbox Live Token, returning a session identifier that can subsequently be used for API calls
          * which require an authenticated user
@@ -670,12 +652,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/authentication/registerplayfabuser
          */
         RegisterPlayFabUser(request: PlayFabClientModels.RegisterPlayFabUserRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.RegisterPlayFabUserResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can
-         * subsequently be used for API calls which require an authenticated user
-         * https://docs.microsoft.com/rest/api/playfab/client/authentication/registerwithwindowshello
-         */
-        RegisterWithWindowsHello(request: PlayFabClientModels.RegisterWithWindowsHelloRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.LoginResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Removes a contact email from the player's profile.
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/removecontactemail
@@ -837,11 +813,6 @@ declare module PlayFabClientModule {
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/unlinktwitch
          */
         UnlinkTwitch(request: PlayFabClientModels.UnlinkTwitchAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.UnlinkTwitchAccountResult>, customData?: any, extraHeaders?: { [key: string]: string }): void;
-        /**
-         * Unlink Windows Hello authentication from the current PlayFab Account
-         * https://docs.microsoft.com/rest/api/playfab/client/account-management/unlinkwindowshello
-         */
-        UnlinkWindowsHello(request: PlayFabClientModels.UnlinkWindowsHelloAccountRequest, callback: PlayFabModule.ApiCallback<PlayFabClientModels.UnlinkWindowsHelloAccountResponse>, customData?: any, extraHeaders?: { [key: string]: string }): void;
         /**
          * Unlinks the related Xbox Live account from the user's PlayFab account
          * https://docs.microsoft.com/rest/api/playfab/client/account-management/unlinkxboxaccount
@@ -2992,23 +2963,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface GetWindowsHelloChallengeRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** SHA256 hash of the PublicKey generated by Windows Hello. */
-        PublicKeyHint: string;
-        /**
-         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
-         * title has been selected.
-         */
-        TitleId: string;
-
-    }
-
-    export interface GetWindowsHelloChallengeResponse extends PlayFabModule.IPlayFabResultCommon  {
-        /** Server generated challenge to be signed by the user. */
-        Challenge?: string;
-
-    }
-
     export interface GooglePlayFabIdPair {
         /** Unique Google identifier for a user. */
         GoogleId?: string;
@@ -3354,24 +3308,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface LinkWindowsHelloAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** Device name. */
-        DeviceName?: string;
-        /** If another user is already linked to the account, unlink the other user and re-link. */
-        ForceLink?: boolean;
-        /** PublicKey generated by Windows Hello. */
-        PublicKey: string;
-        /** Player's user named used by Windows Hello. */
-        UserName: string;
-
-    }
-
-    export interface LinkWindowsHelloAccountResponse extends PlayFabModule.IPlayFabResultCommon  {
-
-    }
-
     export interface LinkXboxAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
@@ -3845,23 +3781,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface LoginWithWindowsHelloRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The signed response from the user for the Challenge. */
-        ChallengeSignature: string;
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** Flags for which pieces of info to return for the user. */
-        InfoRequestParameters?: GetPlayerCombinedInfoRequestParams;
-        /** SHA256 hash of the PublicKey generated by Windows Hello. */
-        PublicKeyHint: string;
-        /**
-         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
-         * title has been selected.
-         */
-        TitleId?: string;
-
-    }
-
     export interface LoginWithXboxRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** Automatically create a PlayFab account if one is not currently linked to this ID. */
         CreateAccount?: boolean;
@@ -4365,29 +4284,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface RegisterWithWindowsHelloRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** Device name. */
-        DeviceName?: string;
-        /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */
-        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). */
-        PlayerSecret?: string;
-        /** PublicKey generated by Windows Hello. */
-        PublicKey?: string;
-        /**
-         * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a
-         * title has been selected.
-         */
-        TitleId: string;
-        /** Player's user name used by Windows Hello. */
-        UserName?: string;
-
-    }
-
     export interface RemoveContactEmailRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
@@ -5020,18 +4916,6 @@ declare module PlayFabClientModels {
 
     }
 
-    export interface UnlinkWindowsHelloAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
-        /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
-        CustomTags?: { [key: string]: string | null };
-        /** SHA256 hash of the PublicKey generated by Windows Hello. */
-        PublicKeyHint: string;
-
-    }
-
-    export interface UnlinkWindowsHelloAccountResponse extends PlayFabModule.IPlayFabResultCommon  {
-
-    }
-
     export interface UnlinkXboxAccountRequest extends PlayFabModule.IPlayFabRequestCommon {
         /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */
         CustomTags?: { [key: string]: string | null };
diff --git a/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts b/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts
index 622b4338..58131d79 100644
--- a/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts
+++ b/PlayFabTestingExample/src/typings/PlayFab/PlayFabServerApi.d.ts
@@ -2382,6 +2382,8 @@ declare module PlayFabServerModels {
         | "UpdateSegmentRateLimitExceeded"
         | "GetSegmentsRateLimitExceeded"
         | "AsyncExportNotInFlight"
+        | "AsyncExportNotFound"
+        | "AsyncExportRateLimitExceeded"
         | "SnapshotNotFound"
         | "InventoryApiNotImplemented";