diff --git a/.current_gitmodules b/.current_gitmodules
index 4203d70d..bf0a92b4 100644
--- a/.current_gitmodules
+++ b/.current_gitmodules
@@ -1 +1 @@
-160000 b37f762c0a973c04a755c24157c3894fc0158361 0	script-languages
+160000 c52fc446ce62195a474dc9b2742f95dfeba8314f 0	script-languages
diff --git a/doc/changes/changes_8.4.0.md b/doc/changes/changes_8.4.0.md
index 1f30419d..c767a300 100644
--- a/doc/changes/changes_8.4.0.md
+++ b/doc/changes/changes_8.4.0.md
@@ -24,6 +24,8 @@ This release uses version 1.0.0 of the container tool.
   - #950: Refactored existing script-options parser
   - #944: Removed exaudfclient_bin_py3
   - #967: Added ctpg script options parser
+  - #972: Refactor exception handling for Script Options parser
+  - #973: Support new lines and white spaces at the beginning in script options values
  
 ## Doc
 
diff --git a/exaudfclient/BUILD b/exaudfclient/BUILD
index b41731f5..587d1372 100644
--- a/exaudfclient/BUILD
+++ b/exaudfclient/BUILD
@@ -89,7 +89,7 @@ cc_binary(
     name = "exaudfclient_bin",
     srcs = ["exaudfclient.cc", "//base:load_dynamic"],
     linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace
-    deps = ["//base/exaudflib:header", "//base:debug_message_h"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
+    deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
             ["//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory"],
     defines = VM_ENABLED_DEFINES,
     data = ["//base:libexaudflib_complete.so"]
@@ -112,7 +112,7 @@ cc_binary(
     name = "exaudfclient_static_bin",
     srcs = ["exaudfclient.cc",  "//base:load_dynamic"],
     linkopts = ["-ldl"], # needed for dynamicly loading libexaudflib_complete.so into another linker namespace
-    deps = ["//base/exaudflib:header", "//base:debug_message_h"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
+    deps = ["//base/exaudflib:header", "//base/utils:utils"]+VM_ENABLED_DEPS+VM_PYTHON3_DEPS+VM_R_DEPS+
             ["//base/exaudflib:exaudflib-deps", "//base/swig_factory:swig_factory"] + [ "@zmq//:zmq", "@protobuf//:protobuf"],
     defines = VM_ENABLED_DEFINES,
     data = ["//base:libexaudflib_complete.so"],
diff --git a/exaudfclient/exaudfclient.cc b/exaudfclient/exaudfclient.cc
index b05a6e42..81eb1003 100644
--- a/exaudfclient/exaudfclient.cc
+++ b/exaudfclient/exaudfclient.cc
@@ -26,7 +26,7 @@
 #include "base/streaming_container/streamingcontainer.h"
 #endif
 #include <functional>
-#include "base/debug_message.h"
+#include "base/utils/debug_message.h"
 #include <stdio.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/script-languages b/script-languages
index b37f762c..c52fc446 160000
--- a/script-languages
+++ b/script-languages
@@ -1 +1 @@
-Subproject commit b37f762c0a973c04a755c24157c3894fc0158361
+Subproject commit c52fc446ce62195a474dc9b2742f95dfeba8314f