diff --git a/mavsdk_server/build.gradle.kts b/mavsdk_server/build.gradle.kts
index 1c25d86..5072ecd 100644
--- a/mavsdk_server/build.gradle.kts
+++ b/mavsdk_server/build.gradle.kts
@@ -26,7 +26,7 @@ allprojects {
     // version. Say we set this package to be 3.6.0-2-SNAPSHOT, it means that it
     // corresponds to mavsdk_server 3.6.0.
     val mavsdk_server_release = if (!project.hasProperty("VERSION")) {
-        "v3.6.0"
+        "v3.7.1"
     } else {
         val versionString = project.property("VERSION").toString()
         val regex = Regex("v?(\\d+\\.\\d+\\.\\d+)")
@@ -103,7 +103,7 @@ android {
         // MAVSDK-Java package and "SNAPSHOT" optionally sets it as a SNAPSHOT.
         version =
             if (project.hasProperty("VERSION")) project.property("VERSION").toString()
-            else "3.6.0-SNAPSHOT"
+            else "3.7.1-SNAPSHOT"
 
         ndk {
             abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
diff --git a/mavsdk_server/src/main/cpp/native-lib.cpp b/mavsdk_server/src/main/cpp/native-lib.cpp
index 2812582..de81273 100644
--- a/mavsdk_server/src/main/cpp/native-lib.cpp
+++ b/mavsdk_server/src/main/cpp/native-lib.cpp
@@ -6,6 +6,8 @@
 
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,"MAVSDK-Server",__VA_ARGS__)
 
+extern "C" char* mavsdk_temp_path;
+
 extern "C"
 {
     JNIEXPORT jlong JNICALL
@@ -77,4 +79,16 @@ extern "C"
         auto mavsdk_server = reinterpret_cast<MavsdkServer*>(mavsdkServerHandle);
         mavsdk_server_destroy(mavsdk_server);
     }
+
+    JNIEXPORT void JNICALL
+    Java_io_mavsdk_mavsdkserver_MavsdkServer_setTempDirectory(JNIEnv *env, jobject thiz, jstring temp_dir)
+    {
+        const char* temp_c_str = env->GetStringUTFChars(temp_dir, 0);
+
+        static char our_copy[256];
+        strncpy(our_copy, temp_c_str, sizeof(our_copy));
+        mavsdk_temp_path = our_copy;
+
+        env->ReleaseStringUTFChars(temp_dir, temp_c_str);
+    }
 };
diff --git a/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java b/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java
index 5ab6004..e6a6e0d 100644
--- a/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java
+++ b/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java
@@ -125,4 +125,6 @@ public void destroy() {
   }
 
   private native void destroy(long mavsdkServerHandle);
+
+  public native void setTempDirectory(String dir);
 }
diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
index 0a2dc3a..c66416e 100644
--- a/sdk/build.gradle.kts
+++ b/sdk/build.gradle.kts
@@ -30,7 +30,7 @@ group = "io.mavsdk"
 // version of the proto files as MAVSDK-C++ v3.6.0.
 version =
     if (project.hasProperty("VERSION")) project.property("VERSION").toString()
-    else "3.6.0-SNAPSHOT"
+    else "3.7.1-SNAPSHOT"
 
 val grpcVersion = "1.61.1"