diff --git a/build/Android/settings.gradle b/build/Android/settings.gradle
index 7d3c7774..652dd7a5 100644
--- a/build/Android/settings.gradle
+++ b/build/Android/settings.gradle
@@ -1 +1 @@
-include ':TestClient', ':xplatcppsdk'
+include ':TestClient', ':xplatcppsdk', ':app'
diff --git a/code/source/playfab/PlayFabSettings.cpp b/code/source/playfab/PlayFabSettings.cpp
index 5f93e9e7..210e8af3 100644
--- a/code/source/playfab/PlayFabSettings.cpp
+++ b/code/source/playfab/PlayFabSettings.cpp
@@ -6,9 +6,9 @@ namespace PlayFab
 {
     // Control whether all callbacks are threaded or whether the user manually controls callback timing from their main-thread
     bool PlayFabSettings::threadedCallbacks = false;
-    const std::string PlayFabSettings::sdkVersion = "3.23.200121";
-    const std::string PlayFabSettings::buildIdentifier = "jbuild_xplatcppsdk__sdk-genericslave-1_0";
-    const std::string PlayFabSettings::versionString = "XPlatCppSdk-3.23.200121";
+    const std::string PlayFabSettings::sdkVersion = "3.23.200207";
+    const std::string PlayFabSettings::buildIdentifier = "jbuild_xplatcppsdk__sdk-genericslave-1_2";
+    const std::string PlayFabSettings::versionString = "XPlatCppSdk-3.23.200207";
     std::string PlayFabSettings::productionEnvironmentURL = ".playfabapi.com";
     ErrorCallback PlayFabSettings::globalErrorHandler = nullptr;
 
diff --git a/com.playfab.xplatcppsdk.v141.autopkg b/com.playfab.xplatcppsdk.v141.autopkg
index b71bd85e..9eb1a692 100644
--- a/com.playfab.xplatcppsdk.v141.autopkg
+++ b/com.playfab.xplatcppsdk.v141.autopkg
@@ -8,7 +8,7 @@ configurations {
 nuget {
     nuspec {
         id = "com.playfab.xplatcppsdk.v141";
-        version : 3.23.200121;
+        version : 3.23.200207;
         title: "PlayFab Cross Platform C++ Sdk for Visual Studio 2017";
         summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience.";
         authors: "PlayFab";
@@ -18,7 +18,7 @@ nuget {
         iconUrl: "https://playfab.com/assets/img/playfab-mark.png";
         requireLicenseAcceptance: false;
         description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services.";
-        releaseNotes: "https://api.playfab.com/releaseNotes/#200121";
+        releaseNotes: "https://api.playfab.com/releaseNotes/#200207";
         copyright: "Copyright 2020";
         language: "C++";
         tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native };
diff --git a/com.playfab.xplatxboxsdk.v141.autopkg b/com.playfab.xplatxboxsdk.v141.autopkg
index c3a9c618..55bf4624 100644
--- a/com.playfab.xplatxboxsdk.v141.autopkg
+++ b/com.playfab.xplatxboxsdk.v141.autopkg
@@ -18,7 +18,7 @@ configurations {
 nuget {
     nuspec {
         id = "com.playfab.xplatxboxsdk.v141";
-        version : 3.23.200121;
+        version : 3.23.200207;
         title: "PlayFab Xbox Platform C++ Sdk for Visual Studio 2017";
         summary: "PlayFab is the unified backend platform for games and everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience.";
         authors: "PlayFab";
@@ -28,7 +28,7 @@ nuget {
         iconUrl: "https://playfab.com/assets/img/playfab-mark.png";
         requireLicenseAcceptance: false;
         description: "Authentication, in-game commerce, player data, title data, inventory, characters, statistics, leaderboards, analytics and reporting, friends, multiplayer, matchmaking, tournaments, cloud script, trading, real-time event handling, player management, live ops, and server hosting for all major platforms/devices and games of any scale. This sdk gives your game the ability log into PlayFab and access cloud data and services.";
-        releaseNotes: "https://api.playfab.com/releaseNotes/#200121";
+        releaseNotes: "https://api.playfab.com/releaseNotes/#200207";
         copyright: "Copyright 2020";
         language: "C++";
         tags: { PlayFab, Baas, Paas, JSON, REST, HTTP, SSL, API, cloud, liveops, game, gamedev, native, xbox };
diff --git a/set-gitmodules.sh b/set-gitmodules.sh
new file mode 100644
index 00000000..4aab7e1a
--- /dev/null
+++ b/set-gitmodules.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#echo ========= Setting Git Submodules to specific commits (BEGIN) =========
+if [ ".git" ]
+then
+	git submodule update --init --recursive
+else
+	git init
+	git submodule add https://github.com/open-source-parsers/jsoncpp.git ./external/jsoncpp
+	if [ $? != 0 ]
+	then
+		exit $?
+	fi
+fi
+
+pushd "external/jsoncpp"
+git checkout 2baad4923e6d9a7e09982cfa4b1c5fd0b67ebd87
+git reset --hard 2baad4923e6d9a7e09982cfa4b1c5fd0b67ebd87
+if [ $? != 0 ]
+then
+	exit $?
+fi
+popd
+
+#echo ========= Setting Git Submodules to specific commits (END) =========
\ No newline at end of file