diff --git a/build.gradle b/build.gradle
index ed2613b3bc..b49987796d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,6 +124,10 @@ subprojects {
         }
     }
 
+    tasks.withType(JavaCompile) {
+        options.compilerArgs.add '-XDstringConcat=inline'
+    }
+
     // Enables UTF-8 support in Javadoc
     tasks.withType(Javadoc) {
         options.addStringOption("charset", "utf-8")