diff --git a/implementations/tdlight b/implementations/tdlight
index 086e02c..9bab51a 160000
--- a/implementations/tdlight
+++ b/implementations/tdlight
@@ -1 +1 @@
-Subproject commit 086e02cd3f3f95710f985f26af0699adabd61eee
+Subproject commit 9bab51a6d2cec748d8627772fd750c34a99be420
diff --git a/scripts/core/setup-variables.sh b/scripts/core/setup-variables.sh
index 1020f50..ae7aa51 100755
--- a/scripts/core/setup-variables.sh
+++ b/scripts/core/setup-variables.sh
@@ -99,9 +99,12 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
     export CROSS_BUILD_DEPS_DIR
   fi
 
+  export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+
   # ====== Print variables
   echo "========= Variables ========="
   echo "Variables"
+  echo "JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}"
   echo "CPU_ARCH_JAVA=${CPU_ARCH_JAVA}"
   echo "CPU_ARCH_JAVA_INTERNAL=${CPU_ARCH_JAVA_INTERNAL}"
   echo "JAVA_INSTALLATION_TYPE=${JAVA_INSTALLATION_TYPE}"